Signed-off-by: falkTX <falktx@gmail.com>tags/v2.1-alpha1-winvst
| @@ -467,7 +467,7 @@ decode_mcu_AC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) | |||||
| phuff_entropy_ptr2 entropy = (phuff_entropy_ptr2) cinfo->entropy; | phuff_entropy_ptr2 entropy = (phuff_entropy_ptr2) cinfo->entropy; | ||||
| int Se = cinfo->Se; | int Se = cinfo->Se; | ||||
| int p1 = 1 << cinfo->Al; /* 1 in the bit position being coded */ | 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; | int s, k, r; | ||||
| unsigned int EOBRUN; | unsigned int EOBRUN; | ||||
| JBLOCKROW block; | JBLOCKROW block; | ||||
| @@ -46,6 +46,9 @@ namespace jpeglibNamespace | |||||
| #if __has_warning("-Wcomma") | #if __has_warning("-Wcomma") | ||||
| #pragma clang diagnostic ignored "-Wcomma" | #pragma clang diagnostic ignored "-Wcomma" | ||||
| #endif | #endif | ||||
| #elif defined(__GNUC__) && (__GNUC__ >= 7) | |||||
| #pragma GCC diagnostic push | |||||
| #pragma GCC diagnostic ignored "-Wimplicit-fallthrough" | |||||
| #endif | #endif | ||||
| #define JPEG_INTERNALS | #define JPEG_INTERNALS | ||||
| @@ -123,6 +126,8 @@ namespace jpeglibNamespace | |||||
| #if JUCE_CLANG | #if JUCE_CLANG | ||||
| #pragma clang diagnostic pop | #pragma clang diagnostic pop | ||||
| #elif defined(__GNUC__) && (__GNUC__ >= 7) | |||||
| #pragma GCC diagnostic pop | |||||
| #endif | #endif | ||||
| #else | #else | ||||
| #define JPEG_INTERNALS | #define JPEG_INTERNALS | ||||
| @@ -69,6 +69,9 @@ namespace pnglibNamespace | |||||
| #if __has_warning("-Wcomma") | #if __has_warning("-Wcomma") | ||||
| #pragma clang diagnostic ignored "-Wcomma" | #pragma clang diagnostic ignored "-Wcomma" | ||||
| #endif | #endif | ||||
| #elif defined(__GNUC__) && (__GNUC__ >= 7) | |||||
| #pragma GCC diagnostic push | |||||
| #pragma GCC diagnostic ignored "-Wimplicit-fallthrough" | |||||
| #endif | #endif | ||||
| #undef check | #undef check | ||||
| @@ -290,7 +293,10 @@ namespace pnglibNamespace | |||||
| #if JUCE_CLANG | #if JUCE_CLANG | ||||
| #pragma clang diagnostic pop | #pragma clang diagnostic pop | ||||
| #elif defined(__GNUC__) && (__GNUC__ >= 7) | |||||
| #pragma GCC diagnostic pop | |||||
| #endif | #endif | ||||
| #else | #else | ||||
| extern "C" | extern "C" | ||||
| { | { | ||||
| @@ -2282,6 +2282,8 @@ private: | |||||
| return MouseInputSource::InputSourceType::pen; | return MouseInputSource::InputSourceType::pen; | ||||
| } | } | ||||
| } | } | ||||
| #else | |||||
| ignoreUnused(wParam); | |||||
| #endif | #endif | ||||
| return MouseInputSource::InputSourceType::mouse; | return MouseInputSource::InputSourceType::mouse; | ||||
| @@ -313,7 +313,7 @@ public: | |||||
| //============================================================================== | //============================================================================== | ||||
| void handleMouseEvent (MouseInputSource::InputSourceType type, Point<float> positionWithinPeer, ModifierKeys newMods, float pressure, | void handleMouseEvent (MouseInputSource::InputSourceType type, Point<float> 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<float> positionWithinPeer, | void handleMouseWheel (MouseInputSource::InputSourceType type, Point<float> positionWithinPeer, | ||||
| int64 time, const MouseWheelDetails&, int touchIndex = 0); | int64 time, const MouseWheelDetails&, int touchIndex = 0); | ||||