Browse Source

Fix warnings on Windows build

Signed-off-by: falkTX <falktx@gmail.com>
tags/v2.1-alpha1-winvst
parent
commit
7b9d2d3d54
5 changed files with 15 additions and 2 deletions
  1. +1
    -1
      source/modules/juce_graphics/image_formats/jpglib/jdphuff.c
  2. +5
    -0
      source/modules/juce_graphics/image_formats/juce_JPEGLoader.cpp
  3. +6
    -0
      source/modules/juce_graphics/image_formats/juce_PNGLoader.cpp
  4. +2
    -0
      source/modules/juce_gui_basics/native/juce_win32_Windowing.cpp
  5. +1
    -1
      source/modules/juce_gui_basics/windows/juce_ComponentPeer.h

+ 1
- 1
source/modules/juce_graphics/image_formats/jpglib/jdphuff.c View File

@@ -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;


+ 5
- 0
source/modules/juce_graphics/image_formats/juce_JPEGLoader.cpp View File

@@ -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


+ 6
- 0
source/modules/juce_graphics/image_formats/juce_PNGLoader.cpp View File

@@ -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"
{


+ 2
- 0
source/modules/juce_gui_basics/native/juce_win32_Windowing.cpp View File

@@ -2282,6 +2282,8 @@ private:
return MouseInputSource::InputSourceType::pen;
}
}
#else
ignoreUnused(wParam);
#endif
return MouseInputSource::InputSourceType::mouse;


+ 1
- 1
source/modules/juce_gui_basics/windows/juce_ComponentPeer.h View File

@@ -313,7 +313,7 @@ public:
//==============================================================================
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,
int64 time, const MouseWheelDetails&, int touchIndex = 0);


Loading…
Cancel
Save