summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <[email protected]>2016-06-18 00:04:37 +0200
committerFriedrich W. H. Kossebau <[email protected]>2016-06-18 00:04:37 +0200
commit9871be9e707567b18807390646babf92602da1b0 (patch)
tree1c5557877043569809b47b89f8a7c744744bcf7f
parentcaf7932466924050ec93a937dfc7ed4cae858920 (diff)
Fix: qMin/qMax want both arguments to be qreal (or rather float on ARM)
-rw-r--r--src/lib/marble/geodata/data/GeoDataLatLonBox.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/marble/geodata/data/GeoDataLatLonBox.cpp b/src/lib/marble/geodata/data/GeoDataLatLonBox.cpp
index 40540cb..5743b39 100644
--- a/src/lib/marble/geodata/data/GeoDataLatLonBox.cpp
+++ b/src/lib/marble/geodata/data/GeoDataLatLonBox.cpp
@@ -240,8 +240,8 @@ void GeoDataLatLonBox::scale(qreal verticalFactor, qreal horizontalFactor) const
GeoDataCoordinates const middle = center();
qreal const deltaY = 0.5 * height() * verticalFactor;
qreal const deltaX = 0.5 * width() * horizontalFactor;
- d->m_north = qMin((middle.latitude() + deltaY), M_PI/2);
- d->m_south = qMax((middle.latitude() - deltaY), -M_PI/2);
+ d->m_north = qMin((middle.latitude() + deltaY), static_cast<qreal>(M_PI/2));
+ d->m_south = qMax((middle.latitude() - deltaY), static_cast<qreal>(-M_PI/2));
if (deltaX > 180 * DEG2RAD) {
d->m_east = M_PI;
d->m_west = -M_PI;