From 2c9c35d3c3a390ada5dc8cafcc047633757693c5 Mon Sep 17 00:00:00 2001 From: jules Date: Fri, 1 Nov 2013 10:43:30 +0000 Subject: [PATCH] Fixed a few compiler warnings. --- extras/Introjucer/Source/Project/jucer_Project.cpp | 1 - modules/juce_box2d/box2d/Collision/b2CollideEdge.cpp | 8 ++++---- modules/juce_box2d/box2d/Collision/b2Collision.cpp | 2 +- modules/juce_box2d/utils/juce_Box2DRenderer.cpp | 4 ++-- modules/juce_core/threads/juce_ThreadPool.h | 2 +- modules/juce_graphics/native/juce_mac_Fonts.mm | 2 +- .../juce_gui_basics/lookandfeel/juce_LookAndFeel_V3.cpp | 2 +- 7 files changed, 10 insertions(+), 11 deletions(-) diff --git a/extras/Introjucer/Source/Project/jucer_Project.cpp b/extras/Introjucer/Source/Project/jucer_Project.cpp index 680afe5969..8740c75c5c 100644 --- a/extras/Introjucer/Source/Project/jucer_Project.cpp +++ b/extras/Introjucer/Source/Project/jucer_Project.cpp @@ -603,7 +603,6 @@ void Project::Item::setFile (const File& file) void Project::Item::setFile (const RelativePath& file) { - jassert (file.getRoot() == RelativePath::projectFolder); jassert (isFile()); state.setProperty (Ids::file, file.toUnixStyle(), getUndoManager()); state.setProperty (Ids::name, file.getFileName(), getUndoManager()); diff --git a/modules/juce_box2d/box2d/Collision/b2CollideEdge.cpp b/modules/juce_box2d/box2d/Collision/b2CollideEdge.cpp index 32dd719694..12a1a733ae 100644 --- a/modules/juce_box2d/box2d/Collision/b2CollideEdge.cpp +++ b/modules/juce_box2d/box2d/Collision/b2CollideEdge.cpp @@ -497,13 +497,13 @@ void b2EPCollider::Collide(b2Manifold* manifold, const b2EdgeShape* edgeA, const ie[0].v = m_polygonB.vertices[i1]; ie[0].id.cf.indexA = 0; - ie[0].id.cf.indexB = i1; + ie[0].id.cf.indexB = (uint8) i1; ie[0].id.cf.typeA = b2ContactFeature::e_face; ie[0].id.cf.typeB = b2ContactFeature::e_vertex; ie[1].v = m_polygonB.vertices[i2]; ie[1].id.cf.indexA = 0; - ie[1].id.cf.indexB = i2; + ie[1].id.cf.indexB = (uint8) i2; ie[1].id.cf.typeA = b2ContactFeature::e_face; ie[1].id.cf.typeB = b2ContactFeature::e_vertex; @@ -530,13 +530,13 @@ void b2EPCollider::Collide(b2Manifold* manifold, const b2EdgeShape* edgeA, const ie[0].v = m_v1; ie[0].id.cf.indexA = 0; - ie[0].id.cf.indexB = primaryAxis.index; + ie[0].id.cf.indexB = (uint8) primaryAxis.index; ie[0].id.cf.typeA = b2ContactFeature::e_vertex; ie[0].id.cf.typeB = b2ContactFeature::e_face; ie[1].v = m_v2; ie[1].id.cf.indexA = 0; - ie[1].id.cf.indexB = primaryAxis.index; + ie[1].id.cf.indexB = (uint8) primaryAxis.index; ie[1].id.cf.typeA = b2ContactFeature::e_vertex; ie[1].id.cf.typeB = b2ContactFeature::e_face; diff --git a/modules/juce_box2d/box2d/Collision/b2Collision.cpp b/modules/juce_box2d/box2d/Collision/b2Collision.cpp index 98fc381f85..529498f89d 100644 --- a/modules/juce_box2d/box2d/Collision/b2Collision.cpp +++ b/modules/juce_box2d/box2d/Collision/b2Collision.cpp @@ -217,7 +217,7 @@ int32 b2ClipSegmentToLine(b2ClipVertex vOut[2], const b2ClipVertex vIn[2], vOut[numOut].v = vIn[0].v + interp * (vIn[1].v - vIn[0].v); // VertexA is hitting edgeB. - vOut[numOut].id.cf.indexA = vertexIndexA; + vOut[numOut].id.cf.indexA = (uint8) vertexIndexA; vOut[numOut].id.cf.indexB = vIn[0].id.cf.indexB; vOut[numOut].id.cf.typeA = b2ContactFeature::e_vertex; vOut[numOut].id.cf.typeB = b2ContactFeature::e_face; diff --git a/modules/juce_box2d/utils/juce_Box2DRenderer.cpp b/modules/juce_box2d/utils/juce_Box2DRenderer.cpp index b3bdd359ac..676c4f037f 100644 --- a/modules/juce_box2d/utils/juce_Box2DRenderer.cpp +++ b/modules/juce_box2d/utils/juce_Box2DRenderer.cpp @@ -87,9 +87,9 @@ void Box2DRenderer::DrawCircle (const b2Vec2& center, float32 radius, const b2Co getLineThickness()); } -void Box2DRenderer::DrawSolidCircle (const b2Vec2& center, float32 radius, const b2Vec2& axis, const b2Color& color) +void Box2DRenderer::DrawSolidCircle (const b2Vec2& center, float32 radius, const b2Vec2& /*axis*/, const b2Color& colour) { - graphics->setColour (getColour (color)); + graphics->setColour (getColour (colour)); graphics->fillEllipse (center.x - radius, center.y - radius, radius * 2.0f, radius * 2.0f); } diff --git a/modules/juce_core/threads/juce_ThreadPool.h b/modules/juce_core/threads/juce_ThreadPool.h index 566d19ea26..c93d4363f4 100644 --- a/modules/juce_core/threads/juce_ThreadPool.h +++ b/modules/juce_core/threads/juce_ThreadPool.h @@ -210,7 +210,7 @@ public: will wait for it to finish. If the timeout period expires before the job finishes running, then the job will be - left in the pool and this will return false. It returns true if the job is sucessfully + left in the pool and this will return false. It returns true if the job is successfully stopped and removed. @param job the job to remove diff --git a/modules/juce_graphics/native/juce_mac_Fonts.mm b/modules/juce_graphics/native/juce_mac_Fonts.mm index 2c38bddb24..91c102c16c 100644 --- a/modules/juce_graphics/native/juce_mac_Fonts.mm +++ b/modules/juce_graphics/native/juce_mac_Fonts.mm @@ -349,7 +349,7 @@ namespace CoreTextTypeLayout Range range (getLineVerticalRange (frame, lines, 0)); if (numLines > 1) - range = range.getUnionWith (getLineVerticalRange (frame, lines, numLines - 1)); + range = range.getUnionWith (getLineVerticalRange (frame, lines, (int) numLines - 1)); return range.getLength(); } diff --git a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V3.cpp b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V3.cpp index 98ee004469..365b667ff4 100644 --- a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V3.cpp +++ b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V3.cpp @@ -383,7 +383,7 @@ void LookAndFeel_V3::drawLinearSlider (Graphics& g, int x, int y, int width, int drawButtonShape (g, p, slider.findColour (Slider::thumbColourId) .withMultipliedSaturation (slider.isEnabled() ? 1.0f : 0.5f) .withMultipliedAlpha (0.8f), - height); + (float) height); } else {