Merge pull request #11 from LocutusOfBorg/fix-arm
authorVittorio Giovara <vittorio.giovara@gmail.com>
Fri, 17 Jan 2014 06:58:28 -0800
changeset 10002 29acde6f200c
parent 10001 ec523563826e (current diff)
parent 9949 2aa9cf5badfc (diff)
child 10003 4133ba836ee6
Merge pull request #11 from LocutusOfBorg/fix-arm Added cast to qreal, avoiding ftbfs due to issue #758
QTfrontend/drawmapscene.cpp
--- a/QTfrontend/drawmapscene.cpp	Fri Jan 17 15:32:50 2014 +0100
+++ b/QTfrontend/drawmapscene.cpp	Fri Jan 17 06:58:28 2014 -0800
@@ -459,7 +459,7 @@
         l.append(center);
     } else
     {
-        qreal angleDelta = qMax(0.1, qMin(0.7, 120 / r));
+        qreal angleDelta = qMax(static_cast<qreal> (0.1), qMin(static_cast<qreal> (0.7), 120 / r));
         for(qreal angle = 0.0; angle < 2*M_PI; angle += angleDelta)
             l.append(center + QPointF(rx * cos(angle), ry * sin(angle)));
         l.append(l.first());