mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix depth parsing

Browse source 
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>
This commit is contained in:
Linus Torvalds 2011-08-31 08:45:43 -07:00
parent 5625b31873
commit 446e51ccf0
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
parse.c
View file

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