From: Linus Torvalds Date: Sat, 10 Sep 2011 22:15:40 +0000 (-0700) Subject: Don't guess input cylinder size as cubic feet X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=ed4b739f5f618fa9fb316dcec4c67224bb4f2bb8;hp=e48cebc2d8e3acdfaf64512259fa582245265799;p=ext%2Fsubsurface.git Don't guess input cylinder size as cubic feet That just screws up the good xml files that have everything in well-defined units and chose the sane metric units. So do the cuft -> liter conversion only if the input units are explicitly CUFT, or known ambiguous input (SUUNTO). Signed-off-by: Linus Torvalds --- diff --git a/parse-xml.c b/parse-xml.c index 92da468..4fd4dcf 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -1053,11 +1053,12 @@ static void sanitize_cylinder_type(cylinder_type_t *type) /* Ok, we have both size and pressure: try to match a description */ match_standard_cylinder(type); - /* .. and let's assume that the 'size' was cu ft of air */ - volume_of_air = type->size.mliter * 28.317; /* milli-cu ft to milliliter */ - atm = type->workingpressure.mbar / 1013.25; /* working pressure in atm */ - volume = volume_of_air / atm; /* milliliters at 1 atm: "true size" */ - type->size.mliter = volume + 0.5; + if (input_units.volume == CUFT || import_source == SUUNTO) { + volume_of_air = type->size.mliter * 28.317; /* milli-cu ft to milliliter */ + atm = type->workingpressure.mbar / 1013.25; /* working pressure in atm */ + volume = volume_of_air / atm; /* milliliters at 1 atm: "true size" */ + type->size.mliter = volume + 0.5; + } } static void sanitize_cylinder_info(struct dive *dive)