mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-13 00:04:19 +00:00
Code Activity

Increased the warning level for the Xcode builds of the demo + introjucer, and avoided a few warnings.

Browse source
This commit is contained in:
jules 2013-07-29 13:15:21 +01:00
parent ac3151ad1f
commit aafa12fd81
9 changed files with 24 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj
View file

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

2
extras/Introjucer/Introjucer.jucer
View file

@ -15,7 +15,7 @@
<EXPORTFORMATS>
<XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK"
juceFolder="../.." documentExtensions=".jucer" objCExtraSuffix="zNNCr"
bigIcon="rVgowdy" extraCompilerFlags="-W -Wall -Wshadow -Wno-missing-field-initializers -Wno-strict-aliasing">
bigIcon="rVgowdy" extraCompilerFlags="-W -Wall -Wshadow -Wno-missing-field-initializers -Wint-conversion -Wshadow -Wconstant-conversion -Wshorten-64-to-32 -Wstrict-aliasing">
<CONFIGURATIONS>
<CONFIGURATION name="Debug" isDebug="1" optimisation="1" targetName="Introjucer"
osxSDK="default" osxCompatibility="default" osxArchitecture="default"/>

4
extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj
View file

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

2
extras/JuceDemo/Juce Demo.jucer
View file

@ -12,7 +12,7 @@
<EXPORTFORMATS>
<XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK"
juceFolder="../../../juce" objCExtraSuffix="JSLvvV6j" bigIcon="f4hwldS"
extraCompilerFlags="-Wall -Wno-missing-field-initializers -Wno-strict-aliasing">
extraCompilerFlags="-Wall -Wno-missing-field-initializers -Wstrict-aliasing -Wint-conversion -Wshadow -Wconstant-conversion -Wshorten-64-to-32">
<CONFIGURATIONS>
<CONFIGURATION name="Debug" isDebug="1" optimisation="1" targetName="JuceDemo"
osxSDK="default" osxCompatibility="default" defines="JUCE_UNIT_TESTS=1"

6
extras/JuceDemo/Source/demos/RenderingTestComponent.cpp
View file

@ -191,7 +191,7 @@ private:
g.reduceClipRegion (argbImage, transform);
}
void drawPaths (Graphics& g, bool /*solid*/, bool linearGradient, bool radialGradient)
void drawPaths (Graphics& g, bool /*solid*/, bool useLinearGradient, bool useRadialGradient)
{
Path p;
p.addRectangle (-50, 0, 100, 100);
@ -199,7 +199,7 @@ private:
p.addStar (Point<float> (-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);

3
modules/juce_audio_processors/scanning/juce_KnownPluginList.cpp
View file

@ -136,7 +136,8 @@ bool KnownPluginList::scanAndAddFile (const String& fileOrIdentifier,
OwnedArray <PluginDescription> found;
{
const ScopedUnlock sl (scanLock);
const ScopedUnlock sl2 (scanLock);
if (scanner != nullptr)
{
if (! scanner->findPluginTypesFor (format, found, fileOrIdentifier))

2
modules/juce_gui_basics/windows/juce_ComponentPeer.cpp
View file

@ -401,8 +401,6 @@ Rectangle<int> ComponentPeer::globalToLocal (const Rectangle<int>& screenPositio
Rectangle<int> 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()));
}

6
modules/juce_opengl/opengl/juce_OpenGLContext.cpp
View file

@ -793,15 +793,15 @@ void OpenGLContext::copyTexture (const Rectangle<int>& targetClipArea,
vOffsetAndScale (prog, "vOffsetAndScale")
{}
void set (const float targetWidth, const float targetHeight, const Rectangle<float>& bounds, bool flippedVertically) const
void set (const float targetWidth, const float targetHeight, const Rectangle<float>& 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;

20
modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.cpp
View file

@ -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<ClipRegionBase> Ptr;
@ -1369,8 +1369,8 @@ public:
state.shaderQuadQueue.flush();
}
ClipRegion_Mask (GLState& state_, const RectangleList<int>& r)
: ClipRegionBase (state_),
ClipRegion_Mask (GLState& s, const RectangleList<int>& 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<int>& r) noexcept
: ClipRegionBase (state_), clip (r)
ClipRegion_RectangleList (GLState& s, const Rectangle<int>& r) noexcept
: ClipRegionBase (s), clip (r)
{}
ClipRegion_RectangleList (GLState& state_, const RectangleList<int>& r) noexcept
: ClipRegionBase (state_), clip (r)
ClipRegion_RectangleList (GLState& s, const RectangleList<int>& 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)