aboutsummaryrefslogtreecommitdiff
path: root/src/projections/vandg.cpp
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2020-02-07 01:39:45 +0100
committerEven Rouault <even.rouault@spatialys.com>2020-02-07 11:08:43 +0100
commit7001c21828420f027f5984132d551af99794f1e4 (patch)
treec5904bb273af1e1020966db45a6afd691add76fa /src/projections/vandg.cpp
parent19bfb4987a8085d3ec1c8f29423866f884fdbd1f (diff)
downloadPROJ-7001c21828420f027f5984132d551af99794f1e4.tar.gz
PROJ-7001c21828420f027f5984132d551af99794f1e4.zip
Fix numerical precision issues in vandg and robin
Refs #1906 Fix remaining issues of https://github.com/OSGeo/PROJ/issues/1906#issuecomment-583168348 as found with gcc 8.2.0 -m32 -O2
Diffstat (limited to 'src/projections/vandg.cpp')
-rw-r--r--src/projections/vandg.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/projections/vandg.cpp b/src/projections/vandg.cpp
index 7d485aff..e7cbbdb6 100644
--- a/src/projections/vandg.cpp
+++ b/src/projections/vandg.cpp
@@ -39,6 +39,14 @@ static PJ_XY vandg_s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forwar
g2 = g * g;
p2 = g * (2. / p2 - 1.);
p2 = p2 * p2;
+ {
+ // Force floating-point computations done on 80 bit on
+ // i386 to go back to 64 bit. This is to avoid the test failures
+ // of https://github.com/OSGeo/PROJ/issues/1906#issuecomment-583168348
+ // The choice of p2 is completely arbitrary.
+ volatile double p2_tmp = p2;
+ p2 = p2_tmp;
+ }
xy.x = g - p2; g = p2 + al2;
xy.x = M_PI * (al * xy.x + sqrt(al2 * xy.x * xy.x - g * (g2 - p2))) / g;
if (lp.lam < 0.) xy.x = -xy.x;
@@ -81,7 +89,7 @@ static PJ_LP vandg_s_inverse (PJ_XY xy, PJ *P) { /* Spheroidal, invers
m = 2. * sqrt(-THIRD * al);
d = C2_27 * c2 * c2 * c2 + (c0 * c0 - THIRD * c2 * c1) / c3;
const double al_mul_m = al * m;
- if( al_mul_m == 0 ) {
+ if( fabs(al_mul_m) < 1e-16 ) {
proj_errno_set(P, PJD_ERR_TOLERANCE_CONDITION);
return proj_coord_error().lp;
}