| @@ -603,7 +603,6 @@ void Project::Item::setFile (const File& file) | |||||
| void Project::Item::setFile (const RelativePath& file) | void Project::Item::setFile (const RelativePath& file) | ||||
| { | { | ||||
| jassert (file.getRoot() == RelativePath::projectFolder); | |||||
| jassert (isFile()); | jassert (isFile()); | ||||
| state.setProperty (Ids::file, file.toUnixStyle(), getUndoManager()); | state.setProperty (Ids::file, file.toUnixStyle(), getUndoManager()); | ||||
| state.setProperty (Ids::name, file.getFileName(), getUndoManager()); | state.setProperty (Ids::name, file.getFileName(), getUndoManager()); | ||||
| @@ -497,13 +497,13 @@ void b2EPCollider::Collide(b2Manifold* manifold, const b2EdgeShape* edgeA, const | |||||
| ie[0].v = m_polygonB.vertices[i1]; | ie[0].v = m_polygonB.vertices[i1]; | ||||
| ie[0].id.cf.indexA = 0; | 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.typeA = b2ContactFeature::e_face; | ||||
| ie[0].id.cf.typeB = b2ContactFeature::e_vertex; | ie[0].id.cf.typeB = b2ContactFeature::e_vertex; | ||||
| ie[1].v = m_polygonB.vertices[i2]; | ie[1].v = m_polygonB.vertices[i2]; | ||||
| ie[1].id.cf.indexA = 0; | 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.typeA = b2ContactFeature::e_face; | ||||
| ie[1].id.cf.typeB = b2ContactFeature::e_vertex; | 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].v = m_v1; | ||||
| ie[0].id.cf.indexA = 0; | 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.typeA = b2ContactFeature::e_vertex; | ||||
| ie[0].id.cf.typeB = b2ContactFeature::e_face; | ie[0].id.cf.typeB = b2ContactFeature::e_face; | ||||
| ie[1].v = m_v2; | ie[1].v = m_v2; | ||||
| ie[1].id.cf.indexA = 0; | 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.typeA = b2ContactFeature::e_vertex; | ||||
| ie[1].id.cf.typeB = b2ContactFeature::e_face; | ie[1].id.cf.typeB = b2ContactFeature::e_face; | ||||
| @@ -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); | vOut[numOut].v = vIn[0].v + interp * (vIn[1].v - vIn[0].v); | ||||
| // VertexA is hitting edgeB. | // 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.indexB = vIn[0].id.cf.indexB; | ||||
| vOut[numOut].id.cf.typeA = b2ContactFeature::e_vertex; | vOut[numOut].id.cf.typeA = b2ContactFeature::e_vertex; | ||||
| vOut[numOut].id.cf.typeB = b2ContactFeature::e_face; | vOut[numOut].id.cf.typeB = b2ContactFeature::e_face; | ||||
| @@ -87,9 +87,9 @@ void Box2DRenderer::DrawCircle (const b2Vec2& center, float32 radius, const b2Co | |||||
| getLineThickness()); | 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, | graphics->fillEllipse (center.x - radius, center.y - radius, | ||||
| radius * 2.0f, radius * 2.0f); | radius * 2.0f, radius * 2.0f); | ||||
| } | } | ||||
| @@ -210,7 +210,7 @@ public: | |||||
| will wait for it to finish. | will wait for it to finish. | ||||
| If the timeout period expires before the job finishes running, then the job will be | 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. | stopped and removed. | ||||
| @param job the job to remove | @param job the job to remove | ||||
| @@ -349,7 +349,7 @@ namespace CoreTextTypeLayout | |||||
| Range<float> range (getLineVerticalRange (frame, lines, 0)); | Range<float> range (getLineVerticalRange (frame, lines, 0)); | ||||
| if (numLines > 1) | if (numLines > 1) | ||||
| range = range.getUnionWith (getLineVerticalRange (frame, lines, numLines - 1)); | |||||
| range = range.getUnionWith (getLineVerticalRange (frame, lines, (int) numLines - 1)); | |||||
| return range.getLength(); | return range.getLength(); | ||||
| } | } | ||||
| @@ -383,7 +383,7 @@ void LookAndFeel_V3::drawLinearSlider (Graphics& g, int x, int y, int width, int | |||||
| drawButtonShape (g, p, slider.findColour (Slider::thumbColourId) | drawButtonShape (g, p, slider.findColour (Slider::thumbColourId) | ||||
| .withMultipliedSaturation (slider.isEnabled() ? 1.0f : 0.5f) | .withMultipliedSaturation (slider.isEnabled() ? 1.0f : 0.5f) | ||||
| .withMultipliedAlpha (0.8f), | .withMultipliedAlpha (0.8f), | ||||
| height); | |||||
| (float) height); | |||||
| } | } | ||||
| else | else | ||||
| { | { | ||||