Merge branch 'otu-tracking-v2' of git://github.com/dirkhh/subsurface

[ext/subsurface.git] / parse-xml.c

diff --git a/parse-xml.c b/parse-xml.c
index 50f83f68bf8845977739e0d2db821f58d1c2bd1f..6eafb0d3aaf993bf8efc78b5d6916387ac0f3c0a 100644 (file)
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -1083,7 +1083,7 @@ static void match_standard_cylinder(cylinder_type_t *type)
                return;
 
        cuft = type->size.mliter / 28317.0;
-       cuft *= type->workingpressure.mbar / 1013.25;
+       cuft *= to_ATM(type->workingpressure);
        psi = type->workingpressure.mbar / 68.95;
 
        switch (psi) {
@@ -1138,7 +1138,7 @@ static void sanitize_cylinder_type(cylinder_type_t *type)
 
        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 */
+               atm = to_ATM(type->workingpressure);            /* working pressure in atm */
                volume = volume_of_air / atm;                   /* milliliters at 1 atm: "true size" */
                type->size.mliter = volume + 0.5;
        }