X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=divelist.c;h=2d04eb5b09e4469f13ad5029b6838294497a6d2a;hb=d906c82f31c5406b6debe0df88cb49b916cd6ced;hp=acaf08d38a8e5ce29e26d95c932b7d9b43bd182d;hpb=b26ca781b87371e77b851298093b0a7136be64fa;p=ext%2Fsubsurface.git

diff --git a/divelist.c b/divelist.c
index acaf08d..2d04eb5 100644
--- a/divelist.c
+++ b/divelist.c
@@ -223,7 +223,6 @@ static void sac_data_func(GtkTreeViewColumn *col,
 			  gpointer data)
 {
 	int value;
-	const double liters_per_cuft = 28.317;
 	const char *fmt;
 	char buffer[16];
 	double sac;
@@ -242,7 +241,7 @@ static void sac_data_func(GtkTreeViewColumn *col,
 		break;
 	case CUFT:
 		fmt = "%4.2f";
-		sac /= liters_per_cuft;
+		sac = ml_to_cuft(sac * 1000);
 		break;
 	}
 	snprintf(buffer, sizeof(buffer), fmt, sac);
@@ -307,7 +306,7 @@ static double calculate_airuse(struct dive *dive)
 		if (!size)
 			continue;
 
-		kilo_atm = (cyl->start.mbar - cyl->end.mbar) / 1013250.0;
+		kilo_atm = (to_ATM(cyl->start) - to_ATM(cyl->end)) / 1000.0;
 
 		/* Liters of air at 1 atm == milliliters at 1k atm*/
 		airuse += kilo_atm * size;