build/win32/platform_specific_code/juce_win32_Midi.cpp

@@ -44,6 +44,8 @@ BEGIN_JUCE_NAMESPACE
   #pragma warning (disable: 4312)
 #endif
 
+using ::free;
+
 //==============================================================================
 static const int midiBufferSize = 1024 * 10;
 static const int numInHeaders = 32;

build/win32/platform_specific_code/juce_win32_Windowing.cpp

@@ -48,7 +48,6 @@
   #pragma warning (disable: 4312 4244)
 #endif
 
-
 #undef GetSystemMetrics // multimon overrides this for some reason and causes a mess..
 
 // these are in the windows SDK, but need to be repeated here for GCC..
@@ -113,6 +112,8 @@ static bool screenSaverAllowed = true;
 static HICON createHICONFromImage (const Image& image, const BOOL isIcon, int hotspotX, int hotspotY) throw();
 #define WM_TRAYNOTIFY WM_USER + 100
 
+using ::abs;
+
 //==============================================================================
 typedef BOOL (WINAPI* UpdateLayeredWinFunc) (HWND, HDC, POINT*, SIZE*, HDC, POINT*, COLORREF, BLENDFUNCTION*, DWORD);
 static UpdateLayeredWinFunc updateLayeredWindow = 0;

build/win32/vc6/JUCE.dsp

@@ -162,178 +162,6 @@ SOURCE=..\..\..\src\juce_appframework\application\juce_SystemClipboard.h
 # Begin Group "audio_file_formats"
 
 # PROP Default_Filter ""
-# Begin Group "flac"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\bitmath.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\bitreader.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\bitwriter.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\cpu.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\crc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\fixed.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\float.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\format.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\juce_FlacHeader.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\lpc_flac.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\md5.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\memory.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\stream_decoder.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\stream_encoder.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\stream_encoder_framing.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\window_flac.c
-# End Source File
-# End Group
-# Begin Group "ogg"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\bitwise.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\framing.c
-# End Source File
-# End Group
-# Begin Group "vorbis"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\analysis.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\bitrate.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\block.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\codebook.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\envelope.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\floor0.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\floor1.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\info.c"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\juce_OggVorbisHeader.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\lpc.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\lsp.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\mapping0.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\mdct.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\psy.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\registry.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\res0.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\sharedbook.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\smallft.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\synthesis.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\vorbisenc.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\vorbisfile.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\window.c"
-# End Source File
-# End Group
 # Begin Source File
 
 SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\juce_AiffAudioFormat.cpp
@@ -1152,318 +980,6 @@ SOURCE=..\..\..\src\juce_appframework\gui\graphics\geometry\juce_RectangleList.h
 # Begin Group "image_file_formats"
 
 # PROP Default_Filter ""
-# Begin Group "jpglib"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\cderror.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcapimin.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcapistd.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jccoefct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jccolor.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcdctmgr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jchuff.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jchuff.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcinit.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcmainct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcmarker.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcmaster.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcomapi.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jconfig.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcparam.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcphuff.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcprepct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcsample.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jctrans.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdapimin.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdapistd.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdatasrc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdcoefct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdcolor.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdct.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jddctmgr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdhuff.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdhuff.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdinput.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdmainct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdmarker.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdmaster.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdmerge.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdphuff.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdpostct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdsample.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdtrans.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jerror.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jerror.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jfdctflt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jfdctfst.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jfdctint.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jidctflt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jidctfst.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jidctint.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jidctred.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jinclude.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jmemmgr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jmemnobs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jmemsys.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jmorecfg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jpegint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jpeglib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jquant1.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jquant2.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jutils.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jversion.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\transupp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\transupp.h
-# End Source File
-# End Group
-# Begin Group "pnglib"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\png.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\png.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngconf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngerror.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngget.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngmem.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngpread.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngread.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngrio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngrtran.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngrutil.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngset.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngtrans.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngwio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngwrite.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngwtran.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngwutil.c
-# End Source File
-# End Group
 # Begin Source File
 
 SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\juce_GIFLoader.cpp
@@ -2701,54 +2217,6 @@ SOURCE=..\..\..\src\juce_core\io\network\juce_URL.h
 # Begin Group "streams"
 
 # PROP Default_Filter ""
-# Begin Group "zlib"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_core\io\streams\zlib\adler32.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_core\io\streams\zlib\compress.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_core\io\streams\zlib\crc32.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_core\io\streams\zlib\deflate.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_core\io\streams\zlib\infback.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_core\io\streams\zlib\inffast.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_core\io\streams\zlib\inflate.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_core\io\streams\zlib\inftrees.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_core\io\streams\zlib\trees.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_core\io\streams\zlib\uncompr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_core\io\streams\zlib\zutil.c
-# End Source File
-# End Group
 # Begin Source File
 
 SOURCE=..\..\..\src\juce_core\io\streams\juce_BufferedInputStream.cpp
@@ -3093,6 +2561,10 @@ SOURCE=..\platform_specific_code\juce_win32_Threads.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\platform_specific_code\juce_win32_WebBrowserComponent.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\platform_specific_code\juce_win32_Windowing.cpp
 # End Source File
 # Begin Source File

extras/the jucer/src/model/components/jucer_ImageButtonHandler.h

@@ -465,7 +465,7 @@ public:
 
     static const Colour getImageColour (ImageButton* button, const ImageRole role)
     {
-        return Colour::fromString (button->getComponentProperty ("imageColour" + String ((int) role), "0"));
+        return Colour::fromString (button->getComponentProperty ("imageColour" + String ((int) role), false, "0"));
     }
 
     static void setImageColour (ComponentLayout& layout, ImageButton* button, const ImageRole role, const Colour& colour, const bool undoable)

src/juce_appframework/audio/audio_file_formats/flac/libFLAC/bitreader.c

@@ -762,7 +762,7 @@ FLAC__bool FLAC__bitreader_read_rice_signed(FLAC__BitReader *br, int *val, unsig
 	FLAC__ASSERT(parameter <= 31);
 
 	/* read the unary MSBs and end bit */
-	if(!FLAC__bitreader_read_unary_unsigned(br, &msbs))
+	if(!FLAC__bitreader_read_unary_unsigned(br, (unsigned int*) &msbs))
 		return false;
 
 	/* read the binary LSBs */

src/juce_appframework/audio/audio_file_formats/flac/libFLAC/stream_decoder.c

@@ -170,7 +170,7 @@ typedef struct FLAC__StreamDecoderPrivate {
 	void (*local_lpc_restore_signal_16bit)(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);
 	/* for use when the signal is <= 16 bits-per-sample, or <= 15 bits-per-sample on a side channel (which requires 1 extra bit), AND order <= 8: */
 	void (*local_lpc_restore_signal_16bit_order8)(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);
-	FLAC__bool (*local_bitreader_read_rice_signed_block)(FLAC__BitReader *br, int vals[], unsigned nvals, unsigned parameter);
+	FLAC__bool (*local_bitreader_read_rice_signed_block)(FLAC__BitReader *br, int* vals, unsigned nvals, unsigned parameter);
 	void *client_data;
 	FILE *file; /* only used if FLAC__stream_decoder_init_file()/FLAC__stream_decoder_init_file() called, else NULL */
 	FLAC__BitReader *input;
@@ -2753,7 +2753,7 @@ FLAC__bool read_residual_partitioned_rice_(FLAC__StreamDecoder *decoder, unsigne
 		if(rice_parameter < pesc) {
 			partitioned_rice_contents->raw_bits[partition] = 0;
 			u = (partition_order == 0 || partition > 0)? partition_samples : partition_samples - predictor_order;
-			if(!decoder->private_->local_bitreader_read_rice_signed_block(decoder->private_->input, residual + sample, u, rice_parameter))
+			if(!decoder->private_->local_bitreader_read_rice_signed_block(decoder->private_->input, (int*) residual + sample, u, rice_parameter))
 				return false; /* read_callback_ sets the state for us */
 			sample += u;
 		}
@@ -2762,7 +2762,7 @@ FLAC__bool read_residual_partitioned_rice_(FLAC__StreamDecoder *decoder, unsigne
 				return false; /* read_callback_ sets the state for us */
 			partitioned_rice_contents->raw_bits[partition] = rice_parameter;
 			for(u = (partition_order == 0 || partition > 0)? 0 : predictor_order; u < partition_samples; u++, sample++) {
-				if(!FLAC__bitreader_read_raw_int32(decoder->private_->input, &i, rice_parameter))
+				if(!FLAC__bitreader_read_raw_int32(decoder->private_->input, (FLAC__int32*) &i, rice_parameter))
 					return false; /* read_callback_ sets the state for us */
 				residual[sample] = i;
 			}

src/juce_appframework/gui/graphics/imaging/image_file_formats/juce_PNGLoader.cpp

@@ -47,6 +47,8 @@ namespace zlibNamespace
 namespace pnglibNamespace
 {
   using namespace zlibNamespace;
+  using ::malloc;
+  using ::free;
 
   extern "C"
   {
@@ -89,6 +91,8 @@ BEGIN_JUCE_NAMESPACE
 #include "../../colour/juce_PixelFormats.h"
 
 using namespace pnglibNamespace;
+using ::malloc;
+using ::free;
 
 //==============================================================================
 static void pngReadCallback (png_structp pngReadStruct, png_bytep data, png_size_t length) throw()

src/juce_core/io/streams/juce_GZIPDecompressorInputStream.cpp

@@ -31,6 +31,11 @@
 
 #include "../../basics/juce_StandardHeader.h"
 
+#if JUCE_MSVC
+  #pragma warning (push)
+  #pragma warning (disable: 4309 4305)
+#endif
+
 namespace zlibNamespace
 {
   extern "C"
@@ -63,6 +68,10 @@ namespace zlibNamespace
     #include "zlib/zutil.c"
   }
 }
+
+#if JUCE_MSVC
+  #pragma warning (pop)
+#endif
 
 BEGIN_JUCE_NAMESPACE