mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Fixed a few compiler warnings.

Browse source
This commit is contained in:
jules 2013-11-01 10:43:30 +00:00
parent aeb8826889
commit 2c9c35d3c3
7 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
extras/Introjucer/Source/Project/jucer_Project.cpp
View file

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

8
modules/juce_box2d/box2d/Collision/b2CollideEdge.cpp
View file

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

2
modules/juce_box2d/box2d/Collision/b2Collision.cpp
View file

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

4
modules/juce_box2d/utils/juce_Box2DRenderer.cpp
View file

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

2
modules/juce_core/threads/juce_ThreadPool.h
View file

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

2
modules/juce_graphics/native/juce_mac_Fonts.mm
View file

@ -349,7 +349,7 @@ namespace CoreTextTypeLayout
Range<float> 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();
}

2
modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V3.cpp
View file

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