From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 31 Aug 2011 15:45:43 +0000 (-0700)
Subject: Fix depth parsing
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=446e51ccf032c6449c8d38dbac0b2110b4246bc5;p=ext%2Fsubsurface.git

Fix depth parsing

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>
---

diff --git a/parse.c b/parse.c
index f90c16c..03cede2 100644
--- 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;