summaryrefslogtreecommitdiffstats
path: root/core/gpslocation.cpp
diff options
context:
space:
mode:
authorGravatar Lubomir I. Ivanov <neolit123@gmail.com>2017-10-07 21:39:20 +0300
committerGravatar Lubomir I. Ivanov <neolit123@gmail.com>2017-10-09 13:38:58 +0300
commit56e755b7119b494d2d875c617500d0299ae06a35 (patch)
tree72a87c14e54d66465067eab60ec1a07016c39da5 /core/gpslocation.cpp
parentf5f2754b81a6396a681d8aec7eb7bcde3c7ed879 (diff)
downloadsubsurface-56e755b7119b494d2d875c617500d0299ae06a35.tar.gz
Use lrint() for all degrees_t related rounding
In certain places the '(int)' cast is used, while in other the llrint() or lrint() functions. Make the conversation from degrees in the 'double' form to the 'int' degrees_t consistent using lrint(). lrint() is the function which should give the best results, because it accepts a 'double' and results in a 'long' even if degrees_t is 'int'. If the truncation from 'long' to 'int' is discarding some of the precision then the next step would be to turn degrees_t into a 64bit signed integer type. Possible fix for #625. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Diffstat (limited to 'core/gpslocation.cpp')
-rw-r--r--core/gpslocation.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/gpslocation.cpp b/core/gpslocation.cpp
index 22525ca3d..753b4a72f 100644
--- a/core/gpslocation.cpp
+++ b/core/gpslocation.cpp
@@ -171,8 +171,8 @@ void GpsLocation::newPosition(QGeoPositionInfo pos)
gpsTracker gt;
gt.when = pos.timestamp().toTime_t();
gt.when += gettimezoneoffset(gt.when);
- gt.latitude.udeg = (int)(pos.coordinate().latitude() * 1000000);
- gt.longitude.udeg = (int)(pos.coordinate().longitude() * 1000000);
+ gt.latitude.udeg = lrint(pos.coordinate().latitude() * 1000000);
+ gt.longitude.udeg = lrint(pos.coordinate().longitude() * 1000000);
addFixToStorage(gt);
}
}
@@ -626,8 +626,8 @@ void GpsLocation::downloadFromServer()
struct gpsTracker gt;
gt.when = timestamp.toMSecsSinceEpoch() / 1000;
- gt.latitude.udeg = (int)(latitude.toDouble() * 1000000);
- gt.longitude.udeg = (int)(longitude.toDouble() * 1000000);
+ gt.latitude.udeg = lrint(latitude.toDouble() * 1000000);
+ gt.longitude.udeg = lrint(longitude.toDouble() * 1000000);
gt.name = name;
// add this GPS fix to the QMap and the settings (remove existing fix at the same timestamp first)
if (m_trackers.keys().contains(gt.when)) {