X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=parse-xml.c;h=ea568f74084c183ae645b11ab2227c115254d7c3;hb=99c111e34833bb7b8af2ad5a6494790191b18e2c;hp=9b0797ea03f3f0dffa995e45967ed7c8f844d093;hpb=1155ad3f0fb2471163335d1d7c6856a81f495e49;p=ext%2Fsubsurface.git

diff --git a/parse-xml.c b/parse-xml.c
index 9b0797e..ea568f7 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -197,7 +197,7 @@ static void pressure(char *buffer, void *_press)
 	case FLOAT:
 		/* Maybe it's in Bar? */
 		if (val.fp < 500.0) {
-			pressure->mbar = val.fp * 1000;
+			pressure->mbar = val.fp * 1000 + 0.5;
 			break;
 		}
 		printf("Unknown fractional pressure reading %s\n", buffer);
@@ -233,7 +233,7 @@ static void depth(char *buffer, void *_depth)
 		val.fp = val.i;
 		/* fallthrough */
 	case FLOAT:
-		depth->mm = val.fp * 1000;
+		depth->mm = val.fp * 1000 + 0.5;
 		break;
 	default:
 		printf("Strange depth reading %s\n", buffer);
@@ -257,7 +257,7 @@ static void temperature(char *buffer, void *_temperature)
 			break;
 		/* Celsius */
 		if (val.fp < 50.0) {
-			temperature->mkelvin = (val.fp + 273.16) * 1000;
+			temperature->mkelvin = (val.fp + 273.15) * 1000 + 0.5;
 			break;
 		}
 		/* Fahrenheit */
@@ -353,6 +353,8 @@ static void try_to_fill_sample(struct sample *sample, const char *name, char *bu
 		return;
 	if (MATCH(".sample.depth", depth, &sample->depth))
 		return;
+	if (MATCH(".sample.temp", temperature, &sample->temperature))
+		return;
 	if (MATCH(".sample.temperature", temperature, &sample->temperature))
 		return;
 	if (MATCH(".sample.sampletime", sampletime, &sample->time))