diff --git a/modules/juce_audio_formats/codecs/oggvorbis/Ogg Vorbis Licence.txt b/modules/juce_audio_formats/codecs/oggvorbis/Ogg Vorbis Licence.txt index e61298e09d..0fab923d50 100644 --- a/modules/juce_audio_formats/codecs/oggvorbis/Ogg Vorbis Licence.txt +++ b/modules/juce_audio_formats/codecs/oggvorbis/Ogg Vorbis Licence.txt @@ -7,7 +7,7 @@ the appropriate libraries on every different platform. There are minimal changes to the Ogg-Vorbis code - a few include paths have been changed to make it build smoothly, and some headers have been added to allow you to exclude it from the build. Any significant code modifications -are marked clearly by "JUCE CHANGE STARTS HERE" and "JUCE_CHANGE_ENDS_HERE" +are marked clearly by "JUCE CHANGE STARTS HERE" and "JUCE CHANGE ENDS HERE" comments. ===================================================================== diff --git a/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.7/lib/floor1.c b/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.7/lib/floor1.c index cd3fb53936..a8c2ef9692 100644 --- a/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.7/lib/floor1.c +++ b/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.7/lib/floor1.c @@ -489,6 +489,10 @@ static int fit_line(lsfit_acc *a,int fits,int *y0,int *y1, y2b+= *y1 * *y1; xyb+= *y1 * x1; bn++; + + // JUCE CHANGE STARTS HERE + (void) y2b; + // JUCE CHANGE ENDS HERE } { diff --git a/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.7/lib/smallft.c b/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.7/lib/smallft.c index 3a981963ad..bf68c8316c 100644 --- a/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.7/lib/smallft.c +++ b/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.7/lib/smallft.c @@ -834,6 +834,10 @@ static void dradb4(int ido,int l1,float *cc,float *ch,float *wa1, t1+=t2; t4+=t2; } + + // JUCE CHANGE STARTS HERE + (void) t5; + // JUCE CHANGE ENDS HERE } static void dradbg(int ido,int ip,int l1,int idl1,float *cc,float *c1, diff --git a/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.7/lib/vorbisfile.c b/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.7/lib/vorbisfile.c index 4f058ec06d..15bb071319 100644 --- a/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.7/lib/vorbisfile.c +++ b/modules/juce_audio_formats/codecs/oggvorbis/libvorbis-1.3.7/lib/vorbisfile.c @@ -334,6 +334,9 @@ static int _fetch_headers(OggVorbis_File *vf,vorbis_info *vi,vorbis_comment *vc, /* vorbis header; continue setup */ vf->ready_state=STREAMSET; if((ret=vorbis_synthesis_headerin(vi,vc,&op))){ + // JUCE CHANGE STARTS HERE + (void) ret; + // JUCE CHANGE ENDS HERE ret=OV_EBADHEADER; goto bail_header; } @@ -784,6 +787,9 @@ static int _fetch_and_process_packet(OggVorbis_File *vf, if(!readp)return(0); if((ret=_get_next_page(vf,&og,-1))<0){ + // JUCE CHANGE STARTS HERE + (void) ret; + // JUCE CHANGE ENDS HERE return(OV_EOF); /* eof. leave unitialized */ } @@ -865,6 +871,9 @@ static int _fetch_and_process_packet(OggVorbis_File *vf, vf->current_serialno=vf->os.serialno; vf->current_link++; link=0; + // JUCE CHANGE STARTS HERE + (void) link; + // JUCE CHANGE ENDS HERE } } } @@ -1667,6 +1676,9 @@ int ov_pcm_seek_page(OggVorbis_File *vf,ogg_int64_t pos){ break; }else result=ogg_stream_packetout(&vf->os,NULL); + // JUCE CHANGE STARTS HERE + (void) result; + // JUCE CHANGE ENDS HERE } } } @@ -2267,6 +2279,9 @@ static void _ov_getlap(OggVorbis_File *vf,vorbis_info *vi,vorbis_dsp_state *vd, memcpy(lappcm[i]+lapcount,pcm[i],sizeof(**pcm)*samples); lapcount+=samples; } + // JUCE CHANGE STARTS HERE + (void) lapcount; + // JUCE CHANGE ENDS HERE } } diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.cpp b/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.cpp index b84b672902..f9999c8028 100644 --- a/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.cpp +++ b/modules/juce_audio_processors/processors/juce_AudioProcessorGraph.cpp @@ -196,18 +196,19 @@ private: OwnedArray renderOps; //============================================================================== - template + template ::value, int> = 0> void createOp (LambdaType&& fn) { struct LambdaOp : public RenderingOp { - LambdaOp (LambdaType&& f) : function (std::move (f)) {} + LambdaOp (LambdaType&& f) : function (std::forward (f)) {} void perform (const Context& c) override { function (c); } LambdaType function; }; - renderOps.add (new LambdaOp (std::move (fn))); + renderOps.add (new LambdaOp (std::forward (fn))); } //============================================================================== diff --git a/modules/juce_graphics/image_formats/pnglib/png.h b/modules/juce_graphics/image_formats/pnglib/png.h index 9fe598be30..4d2fdbc416 100644 --- a/modules/juce_graphics/image_formats/pnglib/png.h +++ b/modules/juce_graphics/image_formats/pnglib/png.h @@ -363,11 +363,12 @@ #ifndef PNG_VERSION_INFO_ONLY -// JUCE modification +//JUCE CHANGE STARTS HERE ///* Inhibit C++ name-mangling for libpng functions but not for system calls. */ //#ifdef __cplusplus //extern "C" { //#endif /* __cplusplus */ +//JUCE CHANGE ENDS HERE /* Version information for C files, stored in png.c. This had better match * the version above. @@ -3239,10 +3240,11 @@ PNG_EXPORT(244, int, png_set_option, (png_structrp png_ptr, int option, PNG_EXPORT_LAST_ORDINAL(249); #endif -// JUCE modification +// JUCE CHANGE STARTS HERE //#ifdef __cplusplus //} //#endif +// JUCE CHANGE ENDS HERE #endif /* PNG_VERSION_INFO_ONLY */ /* Do not put anything past this line */ diff --git a/modules/juce_graphics/image_formats/pnglib/pngpriv.h b/modules/juce_graphics/image_formats/pnglib/pngpriv.h index 7d6605515c..5865b20d44 100644 --- a/modules/juce_graphics/image_formats/pnglib/pngpriv.h +++ b/modules/juce_graphics/image_formats/pnglib/pngpriv.h @@ -958,11 +958,12 @@ PNG_INTERNAL_DATA(const png_byte, png_sRGB_delta, [512]); #endif /* SIMPLIFIED_READ/WRITE */ -// JUCE modification +// JUCE CHANGE STARTS HERE ///* Inhibit C++ name-mangling for libpng functions but not for system calls. */ //#ifdef __cplusplus //extern "C" { //#endif /* __cplusplus */ +// JUCE CHANGE ENDS HERE /* Internal functions; these are not exported from a DLL however because they * are used within several of the C source files they have to be C extern. @@ -2145,10 +2146,11 @@ PNG_INTERNAL_FUNCTION(int, #include "pngdebug.h" -// JUCE modification +// JUCE CHANGE STARTS HERE //#ifdef __cplusplus //} //#endif +// JUCE CHANGE ENDS HERE #endif /* PNG_VERSION_INFO_ONLY */ #endif /* PNGPRIV_H */ diff --git a/modules/juce_graphics/image_formats/pnglib/pngwtran.c b/modules/juce_graphics/image_formats/pnglib/pngwtran.c index 49a13c1e98..c5883e3925 100644 --- a/modules/juce_graphics/image_formats/pnglib/pngwtran.c +++ b/modules/juce_graphics/image_formats/pnglib/pngwtran.c @@ -425,6 +425,10 @@ png_do_write_invert_alpha(png_row_infop row_info, png_bytep row) sp+=3; dp = sp; *dp = (png_byte)(255 - *(sp++)); } + + // JUCE CHANGE STARTS HERE + (void) dp; + // JUCE CHANGE ENDS HERE } #ifdef PNG_WRITE_16BIT_SUPPORTED @@ -449,6 +453,10 @@ png_do_write_invert_alpha(png_row_infop row_info, png_bytep row) *(dp++) = (png_byte)(255 - *(sp++)); *dp = (png_byte)(255 - *(sp++)); } + + // JUCE CHANGE STARTS HERE + (void) dp; + // JUCE CHANGE ENDS HERE } #endif /* WRITE_16BIT */ } @@ -487,6 +495,10 @@ png_do_write_invert_alpha(png_row_infop row_info, png_bytep row) *(dp++) = (png_byte)(255 - *(sp++)); *dp = (png_byte)(255 - *(sp++)); } + + // JUCE CHANGE STARTS HERE + (void) dp; + // JUCE CHANGE ENDS HERE } #endif /* WRITE_16BIT */ } diff --git a/modules/juce_gui_extra/documents/juce_FileBasedDocument.cpp b/modules/juce_gui_extra/documents/juce_FileBasedDocument.cpp index 56194f626d..693e2a35fd 100644 --- a/modules/juce_gui_extra/documents/juce_FileBasedDocument.cpp +++ b/modules/juce_gui_extra/documents/juce_FileBasedDocument.cpp @@ -402,7 +402,7 @@ private: return; } - auto afterAsking = [doSave = std::move (doSave), + auto afterAsking = [doSave = std::forward (doSave), completed = std::move (completed)] (SafeParentPointer ptr, int alertResult) { @@ -562,7 +562,7 @@ private: newFile, showMessageOnFailure, showWaitCursor, - doSaveDocument = std::move (doSaveDocument)] + doSaveDocument = std::forward (doSaveDocument)] { if (! parent.shouldExitAsyncCallback()) parent->saveInternal (parent, @@ -723,8 +723,8 @@ private: { doSelectFilename (parent, warnAboutOverwritingExistingFiles, - [doSaveAs = std::move (doSaveAs), - doAskToOverwriteFile = std::move (doAskToOverwriteFile), + [doSaveAs = std::forward (doSaveAs), + doAskToOverwriteFile = std::forward (doAskToOverwriteFile), callback = std::move (callback)] (SafeParentPointer ptr, File chosen) { if (ptr.shouldExitAsyncCallback())