mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-02-03 03:30:06 +00:00
Increased the warning level for the Xcode builds of the demo + introjucer, and avoided a few warnings.
This commit is contained in:
parent
ac3151ad1f
commit
aafa12fd81
9 changed files with 24 additions and 25 deletions
|
|
@ -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))
|
||||
|
|
|
|||
|
|
@ -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()));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue