aboutsummaryrefslogtreecommitdiffstats
path: root/dive.c
diff options
context:
space:
mode:
authorGravatar Linus Torvalds <torvalds@linux-foundation.org>2012-12-05 09:59:52 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2012-12-05 10:34:02 -0800
commit5e5e3460acf9d29b03aff71228aff01e31a3bf45 (patch)
tree07629133d0d9ea1948692690929582ae9029e12e /dive.c
parent708df33539ef3b6d3cfde435df93fd4475cdde75 (diff)
downloadsubsurface-5e5e3460acf9d29b03aff71228aff01e31a3bf45.tar.gz
Turn latitude and longitude into integer micro-degree values
This actually makes us internally use 'micro-degrees' for latitude and longitude, and we never turn them into floating point either at parse time or save time. That said, the Uemis downloader internally does still use atof() when converting things, which is likely a bug (locale issues and all that), but I'll ask Dirk to check it out. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'dive.c')
-rw-r--r--dive.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/dive.c b/dive.c
index d18a3d458..f527fae37 100644
--- a/dive.c
+++ b/dive.c
@@ -1366,8 +1366,8 @@ struct dive *merge_dives(struct dive *a, struct dive *b, int offset, gboolean pr
res->when = dl ? dl->when : a->when;
res->selected = a->selected || b->selected;
merge_trip(res, a, b);
- MERGE_NONZERO(res, a, b, latitude);
- MERGE_NONZERO(res, a, b, longitude);
+ MERGE_NONZERO(res, a, b, latitude.udeg);
+ MERGE_NONZERO(res, a, b, longitude.udeg);
MERGE_TXT(res, a, b, location);
MERGE_TXT(res, a, b, notes);
MERGE_TXT(res, a, b, buddy);