Fix rounding of GPS coordinates

The whole "+ 0.5" to round to integers only works for positive values,
and GPS coordinates are signed.

So use the proper "round to int" function (rint()), which does this correctly.

Also, remove the redundant check against the master gps values: we
already checked that if we do have a master dive, the gps values must
match the currently edited dive, so comparing against the master is
entirely redundant.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 2 insertions, 5 deletions

diff --git a/info.c b/info.c
index b411ed56d..6a568120f 100644
--- a/info.c
+++ b/info.c
@@ -506,12 +506,9 @@ static gboolean gps_changed(struct dive *dive, struct dive *master, const char *
 	if (!parse_gps_text(gps_text, &latitude, &longitude))
 		return FALSE;
 
-	latudeg = 1000000 * latitude + 0.5;
-	longudeg = 1000000 * longitude + 0.5;
+	latudeg = rint(1000000 * latitude);
+	longudeg = rint(1000000 * longitude);
 
-	/* if master gps didn't change, don't change dive */
-	if (master && master->latitude.udeg == latudeg && master->longitude.udeg == longudeg)
-		return FALSE;
 	/* if dive gps didn't change, nothing changed */
 	if (dive->latitude.udeg == latudeg && dive->longitude.udeg == longudeg)
 		return FALSE;