From 7b9d2d3d5405ce3368b59d996fffecf82eaac4f3 Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 17 Jan 2019 00:12:28 +0100 Subject: [PATCH] Fix warnings on Windows build Signed-off-by: falkTX --- source/modules/juce_graphics/image_formats/jpglib/jdphuff.c | 2 +- .../modules/juce_graphics/image_formats/juce_JPEGLoader.cpp | 5 +++++ .../modules/juce_graphics/image_formats/juce_PNGLoader.cpp | 6 ++++++ .../modules/juce_gui_basics/native/juce_win32_Windowing.cpp | 2 ++ source/modules/juce_gui_basics/windows/juce_ComponentPeer.h | 2 +- 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/source/modules/juce_graphics/image_formats/jpglib/jdphuff.c b/source/modules/juce_graphics/image_formats/jpglib/jdphuff.c index 10e0a4636..adbad53c0 100644 --- a/source/modules/juce_graphics/image_formats/jpglib/jdphuff.c +++ b/source/modules/juce_graphics/image_formats/jpglib/jdphuff.c @@ -467,7 +467,7 @@ decode_mcu_AC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) phuff_entropy_ptr2 entropy = (phuff_entropy_ptr2) cinfo->entropy; int Se = cinfo->Se; int p1 = 1 << cinfo->Al; /* 1 in the bit position being coded */ - int m1 = (-1) << cinfo->Al; /* -1 in the bit position being coded */ + int m1 = (unsigned int)(-1) << cinfo->Al; /* -1 in the bit position being coded */ int s, k, r; unsigned int EOBRUN; JBLOCKROW block; diff --git a/source/modules/juce_graphics/image_formats/juce_JPEGLoader.cpp b/source/modules/juce_graphics/image_formats/juce_JPEGLoader.cpp index 793d10ba6..c97cebd66 100644 --- a/source/modules/juce_graphics/image_formats/juce_JPEGLoader.cpp +++ b/source/modules/juce_graphics/image_formats/juce_JPEGLoader.cpp @@ -46,6 +46,9 @@ namespace jpeglibNamespace #if __has_warning("-Wcomma") #pragma clang diagnostic ignored "-Wcomma" #endif + #elif defined(__GNUC__) && (__GNUC__ >= 7) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wimplicit-fallthrough" #endif #define JPEG_INTERNALS @@ -123,6 +126,8 @@ namespace jpeglibNamespace #if JUCE_CLANG #pragma clang diagnostic pop + #elif defined(__GNUC__) && (__GNUC__ >= 7) + #pragma GCC diagnostic pop #endif #else #define JPEG_INTERNALS diff --git a/source/modules/juce_graphics/image_formats/juce_PNGLoader.cpp b/source/modules/juce_graphics/image_formats/juce_PNGLoader.cpp index ee0627317..3ce426c6e 100644 --- a/source/modules/juce_graphics/image_formats/juce_PNGLoader.cpp +++ b/source/modules/juce_graphics/image_formats/juce_PNGLoader.cpp @@ -69,6 +69,9 @@ namespace pnglibNamespace #if __has_warning("-Wcomma") #pragma clang diagnostic ignored "-Wcomma" #endif + #elif defined(__GNUC__) && (__GNUC__ >= 7) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wimplicit-fallthrough" #endif #undef check @@ -290,7 +293,10 @@ namespace pnglibNamespace #if JUCE_CLANG #pragma clang diagnostic pop + #elif defined(__GNUC__) && (__GNUC__ >= 7) + #pragma GCC diagnostic pop #endif + #else extern "C" { diff --git a/source/modules/juce_gui_basics/native/juce_win32_Windowing.cpp b/source/modules/juce_gui_basics/native/juce_win32_Windowing.cpp index 4fcfbe374..844a95647 100644 --- a/source/modules/juce_gui_basics/native/juce_win32_Windowing.cpp +++ b/source/modules/juce_gui_basics/native/juce_win32_Windowing.cpp @@ -2282,6 +2282,8 @@ private: return MouseInputSource::InputSourceType::pen; } } +#else + ignoreUnused(wParam); #endif return MouseInputSource::InputSourceType::mouse; diff --git a/source/modules/juce_gui_basics/windows/juce_ComponentPeer.h b/source/modules/juce_gui_basics/windows/juce_ComponentPeer.h index 819cc8d93..fcd5a27bd 100644 --- a/source/modules/juce_gui_basics/windows/juce_ComponentPeer.h +++ b/source/modules/juce_gui_basics/windows/juce_ComponentPeer.h @@ -313,7 +313,7 @@ public: //============================================================================== void handleMouseEvent (MouseInputSource::InputSourceType type, Point positionWithinPeer, ModifierKeys newMods, float pressure, - float orientation, int64 time, PenDetails pen = {}, int touchIndex = 0); + float orientation, int64 time, PenDetails pen = { 0.0f, 0.0f, 0.0f }, int touchIndex = 0); void handleMouseWheel (MouseInputSource::InputSourceType type, Point positionWithinPeer, int64 time, const MouseWheelDetails&, int touchIndex = 0);