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

Merge branch 'master' of https://github.com/dje29/subsurface

Browse source
This commit is contained in:
Dirk Hohndel 2017-03-11 08:41:41 -08:00
commit 08284275e7
31 changed files with 210 additions and 201 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/save-html.c
View file

@ -127,7 +127,7 @@ static void put_cylinder_HTML(struct membuffer *b, struct dive *dive)
if (cylinder->type.size.mliter) {
int volume = cylinder->type.size.mliter;
if (prefs.units.volume == CUFT && cylinder->type.workingpressure.mbar)
volume *= bar_to_atm(cylinder->type.workingpressure.mbar / 1000.0);
volume = lrint(volume * bar_to_atm(cylinder->type.workingpressure.mbar / 1000.0));
put_HTML_volume_units(b, volume, "\"Size\":\"", " \", ");
} else {
write_attribute(b, "Size", "--", ", ");