diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-27 10:46:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-27 10:46:42 -0700 |
| commit | 2a8f7ab78f8d00b699b683b122ad2cf0ddc094b6 (patch) | |
| tree | 7927f2494f5ac0018e7feca7c6fa4fe739c67345 /parse-xml.c | |
| parent | 7bbe44f46a96a405b3a67b452f18a95044b9b25d (diff) | |
| parent | dc2a0c1909727a1557b8f03e6b6ac3e427ebe4b7 (diff) | |
| download | subsurface-2a8f7ab78f8d00b699b683b122ad2cf0ddc094b6.tar.gz | |
Merge branch 'otu-tracking-v2' of git://github.com/dirkhh/subsurface
* 'otu-tracking-v2' of git://github.com/dirkhh/subsurface:
Make OTU column invisible by default
Add OTU to divelist
Calculate OTUs for every dive
Fix up trivial conflicts in dive.h (due to dive event handling also
adding a field to the dive structure)
Diffstat (limited to 'parse-xml.c')
| -rw-r--r-- | parse-xml.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/parse-xml.c b/parse-xml.c index 50f83f68b..6eafb0d3a 100644 --- 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; } |