]> git.tdb.fi Git - ext/subsurface.git/commitdiff
Fix depth parsing
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 31 Aug 2011 15:45:43 +0000 (08:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 31 Aug 2011 15:45:43 +0000 (08:45 -0700)
The "decimal: it's meters, integer: it's feet" logic doesn't work.  It's
just always meters, because the xml ends up sometimes having whole meters.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
parse.c

diff --git a/parse.c b/parse.c
index f90c16ce12fbf05fde39ce39e9840ffd8536c211..03cede25daa0ee3d82c718e27506998bc285b387 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -222,11 +222,10 @@ static void depth(char *buffer, void *_depth)
        union int_or_float val;
 
        switch (integer_or_float(buffer, &val)) {
-       /* Integer values are probably in feet */
+       /* All values are probably in meters */
        case INTEGER:
-               depth->mm = 304.8 * val.i;
-               break;
-       /* Float? Probably meters.. */
+               val.fp = val.i;
+               /* fallthrough */
        case FLOAT:
                depth->mm = val.fp * 1000;
                break;