diff --git a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj index fe5039efc3..e4236dd805 100644 --- a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj +++ b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj @@ -1873,7 +1873,7 @@ HEADER_SEARCH_PATHS = "../../JuceLibraryCode $(inherited)"; GCC_OPTIMIZATION_LEVEL = 0; INFOPLIST_FILE = Info.plist; - OTHER_CPLUSPLUSFLAGS = "-W -Wall -Wshadow -Wno-missing-field-initializers -Wno-strict-aliasing"; + OTHER_CPLUSPLUSFLAGS = "-W -Wall -Wshadow -Wno-missing-field-initializers -Wint-conversion -Wshadow -Wconstant-conversion -Wshorten-64-to-32 -Wstrict-aliasing"; INSTALL_PATH = "$(HOME)/Applications"; CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/build/$(CONFIGURATION)"; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; @@ -1894,7 +1894,7 @@ HEADER_SEARCH_PATHS = "../../JuceLibraryCode $(inherited)"; GCC_OPTIMIZATION_LEVEL = 3; INFOPLIST_FILE = Info.plist; - OTHER_CPLUSPLUSFLAGS = "-W -Wall -Wshadow -Wno-missing-field-initializers -Wno-strict-aliasing"; + OTHER_CPLUSPLUSFLAGS = "-W -Wall -Wshadow -Wno-missing-field-initializers -Wint-conversion -Wshadow -Wconstant-conversion -Wshorten-64-to-32 -Wstrict-aliasing"; INSTALL_PATH = "$(HOME)/Applications"; CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/build/$(CONFIGURATION)"; MACOSX_DEPLOYMENT_TARGET = 10.5; diff --git a/extras/Introjucer/Introjucer.jucer b/extras/Introjucer/Introjucer.jucer index 57869e0927..25445d3f0e 100644 --- a/extras/Introjucer/Introjucer.jucer +++ b/extras/Introjucer/Introjucer.jucer @@ -15,7 +15,7 @@ + bigIcon="rVgowdy" extraCompilerFlags="-W -Wall -Wshadow -Wno-missing-field-initializers -Wint-conversion -Wshadow -Wconstant-conversion -Wshorten-64-to-32 -Wstrict-aliasing"> diff --git a/extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj b/extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj index 3a9ebd11bf..64d04c95da 100644 --- a/extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj +++ b/extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj @@ -2071,7 +2071,7 @@ HEADER_SEARCH_PATHS = "../../JuceLibraryCode $(inherited)"; GCC_OPTIMIZATION_LEVEL = 0; INFOPLIST_FILE = Info.plist; - OTHER_CPLUSPLUSFLAGS = "-Wall -Wno-missing-field-initializers -Wno-strict-aliasing"; + OTHER_CPLUSPLUSFLAGS = "-Wall -Wno-missing-field-initializers -Wstrict-aliasing -Wint-conversion -Wshadow -Wconstant-conversion -Wshorten-64-to-32"; INSTALL_PATH = "$(HOME)/Applications"; CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/build/$(CONFIGURATION)"; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; @@ -2093,7 +2093,7 @@ HEADER_SEARCH_PATHS = "../../JuceLibraryCode $(inherited)"; GCC_OPTIMIZATION_LEVEL = s; INFOPLIST_FILE = Info.plist; - OTHER_CPLUSPLUSFLAGS = "-Wall -Wno-missing-field-initializers -Wno-strict-aliasing"; + OTHER_CPLUSPLUSFLAGS = "-Wall -Wno-missing-field-initializers -Wstrict-aliasing -Wint-conversion -Wshadow -Wconstant-conversion -Wshorten-64-to-32"; INSTALL_PATH = "$(HOME)/Applications"; CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/build/$(CONFIGURATION)"; MACOSX_DEPLOYMENT_TARGET = 10.5; diff --git a/extras/JuceDemo/Juce Demo.jucer b/extras/JuceDemo/Juce Demo.jucer index a15a54d675..979d06d7da 100644 --- a/extras/JuceDemo/Juce Demo.jucer +++ b/extras/JuceDemo/Juce Demo.jucer @@ -12,7 +12,7 @@ + extraCompilerFlags="-Wall -Wno-missing-field-initializers -Wstrict-aliasing -Wint-conversion -Wshadow -Wconstant-conversion -Wshorten-64-to-32"> (-100.0f, 0.0f), 6, 40.0f, 70.0f, 0.1f); p.addEllipse (-60.0f, -100.0f, 120.0f, 90.0f); - if (linearGradient || radialGradient) + if (useLinearGradient || useRadialGradient) { Colour c1 (bouncingNumber[0], bouncingNumber[1], bouncingNumber[2], 1.0f); Colour c2 (bouncingNumber[4], bouncingNumber[5], bouncingNumber[6], 1.0f); @@ -222,7 +222,7 @@ private: ColourGradient gradient (c1, x1, y1, c2, x2, y2, - radialGradient); + useRadialGradient); gradient.addColour (intermediatePos, c3); diff --git a/modules/juce_audio_processors/scanning/juce_KnownPluginList.cpp b/modules/juce_audio_processors/scanning/juce_KnownPluginList.cpp index 84f4633195..12c4c958d2 100644 --- a/modules/juce_audio_processors/scanning/juce_KnownPluginList.cpp +++ b/modules/juce_audio_processors/scanning/juce_KnownPluginList.cpp @@ -136,7 +136,8 @@ bool KnownPluginList::scanAndAddFile (const String& fileOrIdentifier, OwnedArray found; { - const ScopedUnlock sl (scanLock); + const ScopedUnlock sl2 (scanLock); + if (scanner != nullptr) { if (! scanner->findPluginTypesFor (format, found, fileOrIdentifier)) diff --git a/modules/juce_gui_basics/windows/juce_ComponentPeer.cpp b/modules/juce_gui_basics/windows/juce_ComponentPeer.cpp index 5b97735be0..3e9e53c851 100644 --- a/modules/juce_gui_basics/windows/juce_ComponentPeer.cpp +++ b/modules/juce_gui_basics/windows/juce_ComponentPeer.cpp @@ -401,8 +401,6 @@ Rectangle ComponentPeer::globalToLocal (const Rectangle& screenPositio Rectangle ComponentPeer::getAreaCoveredBy (Component& subComponent) const { - jassert (component.isParentOf (&subComponent)); // this can only be used for child components. - return Component::ComponentHelpers::scaledScreenPosToUnscaled (component.getLocalArea (&subComponent, subComponent.getLocalBounds())); } diff --git a/modules/juce_opengl/opengl/juce_OpenGLContext.cpp b/modules/juce_opengl/opengl/juce_OpenGLContext.cpp index f63e649644..4abb68c187 100644 --- a/modules/juce_opengl/opengl/juce_OpenGLContext.cpp +++ b/modules/juce_opengl/opengl/juce_OpenGLContext.cpp @@ -793,15 +793,15 @@ void OpenGLContext::copyTexture (const Rectangle& targetClipArea, vOffsetAndScale (prog, "vOffsetAndScale") {} - void set (const float targetWidth, const float targetHeight, const Rectangle& bounds, bool flippedVertically) const + void set (const float targetWidth, const float targetHeight, const Rectangle& bounds, bool flipVertically) const { const GLfloat m[] = { bounds.getX(), bounds.getY(), bounds.getWidth(), bounds.getHeight() }; textureBounds.set (m, 4); imageTexture.set (0); screenSize.set (targetWidth, targetHeight); - vOffsetAndScale.set (flippedVertically ? 0.0f : 1.0f, - flippedVertically ? 1.0f : -1.0f); + vOffsetAndScale.set (flipVertically ? 0.0f : 1.0f, + flipVertically ? 1.0f : -1.0f); } OpenGLShaderProgram::Attribute positionAttribute; diff --git a/modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.cpp b/modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.cpp index 76b418a438..af78f7dd3c 100644 --- a/modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.cpp +++ b/modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.cpp @@ -1311,7 +1311,7 @@ private: class ClipRegionBase : public SingleThreadedReferenceCountedObject { public: - ClipRegionBase (GLState& state_) noexcept : state (state_) {} + ClipRegionBase (GLState& s) noexcept : state (s) {} virtual ~ClipRegionBase() {} typedef ReferenceCountedObjectPtr Ptr; @@ -1369,8 +1369,8 @@ public: state.shaderQuadQueue.flush(); } - ClipRegion_Mask (GLState& state_, const RectangleList& r) - : ClipRegionBase (state_), + ClipRegion_Mask (GLState& s, const RectangleList& r) + : ClipRegionBase (s), clip (r.getBounds()), maskArea (clip) { @@ -1636,12 +1636,12 @@ private: class ClipRegion_RectangleList : public ClipRegionBase { public: - ClipRegion_RectangleList (GLState& state_, const Rectangle& r) noexcept - : ClipRegionBase (state_), clip (r) + ClipRegion_RectangleList (GLState& s, const Rectangle& r) noexcept + : ClipRegionBase (s), clip (r) {} - ClipRegion_RectangleList (GLState& state_, const RectangleList& r) noexcept - : ClipRegionBase (state_), clip (r) + ClipRegion_RectangleList (GLState& s, const RectangleList& r) noexcept + : ClipRegionBase (s), clip (r) {} Ptr clone() const { return new ClipRegion_RectangleList (state, clip); } @@ -1758,10 +1758,10 @@ private: class SavedState { public: - SavedState (GLState* const state_) - : clip (new ClipRegion_RectangleList (*state_, state_->target.bounds)), + SavedState (GLState* const s) + : clip (new ClipRegion_RectangleList (*s, s->target.bounds)), transform (0, 0), interpolationQuality (Graphics::mediumResamplingQuality), - state (state_), transparencyLayerAlpha (1.0f) + state (s), transparencyLayerAlpha (1.0f) {} SavedState (const SavedState& other)