diff --git a/src/Camera.cpp b/src/Camera.cpp index 2bd6781e3..486e29fe6 100644 --- a/src/Camera.cpp +++ b/src/Camera.cpp @@ -85,15 +85,15 @@ void Camera::fixAspectRatio() { /* Extend on larger side = scale larger side down */ if(_aspectRatioPolicy == Extend) { _projectionMatrix = ((_viewport.x() > _viewport.y()) ? - Matrix4::scaling({static_cast(_viewport.y())/_viewport.x(), 1, 1}) : - Matrix4::scaling({1, static_cast(_viewport.x())/_viewport.y(), 1}) + Matrix4::scaling({GLfloat(_viewport.y())/_viewport.x(), 1, 1}) : + Matrix4::scaling({1, GLfloat(_viewport.x())/_viewport.y(), 1}) )*rawProjectionMatrix; /* Clip on smaller side = scale smaller side up */ } else if(_aspectRatioPolicy == Clip) { _projectionMatrix = ((_viewport.x() > _viewport.y()) ? - Matrix4::scaling({1, static_cast(_viewport.x())/_viewport.y(), 1}) : - Matrix4::scaling({static_cast(_viewport.y())/_viewport.x(), 1, 1}) + Matrix4::scaling({1, GLfloat(_viewport.x())/_viewport.y(), 1}) : + Matrix4::scaling({GLfloat(_viewport.y())/_viewport.x(), 1, 1}) )*rawProjectionMatrix; /* Don't preserve anything */ diff --git a/src/Math/Test/MathTest.cpp b/src/Math/Test/MathTest.cpp index c57e650eb..27af23668 100644 --- a/src/Math/Test/MathTest.cpp +++ b/src/Math/Test/MathTest.cpp @@ -25,7 +25,7 @@ namespace Magnum { namespace Math { namespace Test { void MathTest::degrad() { QCOMPARE(deg(90.0), PI/2); - QCOMPARE(deg(90.0f), static_cast(PI/2)); + QCOMPARE(deg(90.0f), float(PI/2)); QCOMPARE(rad(PI/2), PI/2); QEXPECT_FAIL(0, "Integral parameter is not converted to floating point", Continue);