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

Fix potential double/float to int rounding errors

Browse source 
Not using lrint(f) when converting double/float to int
creates rounding errors.
This error was detected by TestParse::testParseDM4 failure
on Windows. It was creating rounding inconsistencies
on Linux too, see change in TestDiveDM4.xml.

Enable -Wfloat-conversion for gcc version greater than 4.9.0

Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
This commit is contained in:
Jeremie Guichard 2017-03-09 23:07:30 +07:00
parent 406e4287eb
commit 2b06a0b223
20 changed files with 109 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

16
core/file.c
View file

@ -293,31 +293,31 @@ static void add_sample_data(struct sample *sample, enum csv_format type, double
sample->cylinderpressure.mbar = psi_to_mbar(val * 4);
break;
case POSEIDON_DEPTH:
sample->depth.mm = val * 0.5 *1000;
sample->depth.mm = lrint(val * 0.5 * 1000);
break;
case POSEIDON_TEMP:
sample->temperature.mkelvin = C_to_mkelvin(val * 0.2);
break;
case POSEIDON_SETPOINT:
sample->setpoint.mbar = val * 10;
sample->setpoint.mbar = lrint(val * 10);
break;
case POSEIDON_SENSOR1:
sample->o2sensor[0].mbar = val * 10;
sample->o2sensor[0].mbar = lrint(val * 10);
break;
case POSEIDON_SENSOR2:
sample->o2sensor[1].mbar = val * 10;
sample->o2sensor[1].mbar = lrint(val * 10);
break;
case POSEIDON_PRESSURE:
sample->cylinderpressure.mbar = val * 1000;
sample->cylinderpressure.mbar = lrint(val * 1000);
break;
case POSEIDON_O2CYLINDER:
sample->o2cylinderpressure.mbar = val * 1000;
sample->o2cylinderpressure.mbar = lrint(val * 1000);
break;
case POSEIDON_NDL:
sample->ndl.seconds = val * 60;
sample->ndl.seconds = lrint(val * 60);
break;
case POSEIDON_CEILING:
sample->stopdepth.mm = val * 1000;
sample->stopdepth.mm = lrint(val * 1000);
break;
}
}