FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix failing BucketBox test

Browse Source 
- improve behaviour of floorWithEpsilon helper in bucket code, and
use in more places so that near-integral values are rounded correctly.
This commit is contained in:
James Turner 2014-02-24 18:03:17 +00:00
parent 3429e00721
commit ba38688a83
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
simgear/bucket/newbucket.cxx
View File

@ -102,12 +102,7 @@ SGBucket::SGBucket(const long int bindex) {
*/
static int floorWithEpsilon(double x)
{
double diff = x - static_cast<int>(x);
if ( (x >= 0.0) || (fabs(diff) < SG_EPSILON) ) {
return static_cast<int>(x);
} else {
return static_cast<int>(x) - 1;
}
return static_cast<int>(floor(x + SG_EPSILON));
}
#ifndef NO_DEPRECATED_API
@ -152,7 +147,7 @@ void SGBucket::innerSet( double dlon, double dlat )
/* We have more than one tile per degree of
* longitude, so we need an x offset.
*/
x = (int)((dlon - lon) / span);
x = floorWithEpsilon((dlon - lon) / span);
} else {
/* We have one or more degrees per tile,
* so we need to find the base longitude
@ -185,7 +180,7 @@ void SGBucket::innerSet( double dlon, double dlat )
/* Latitude base and offset are easier, as
* tiles always are 1/8 degree of latitude wide.
*/
y = (int)((dlat - lat) * 8);
y = floorWithEpsilon((dlat - lat) * 8);
}
}