aboutsummaryrefslogtreecommitdiff
path: root/src/projections/geos.cpp
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2019-09-18 16:57:19 +0200
committerGitHub <noreply@github.com>2019-09-18 16:57:19 +0200
commit72203ca68e123a237c8c748d39131b702ea4b646 (patch)
tree38d1214e399eaaf4e173ad5d13a3820364065c1d /src/projections/geos.cpp
parentd2f661fc99615a33d72bb0120a14bca2aaced221 (diff)
parentbc53524cfbde95ecf6bb134984e68eb715d11c2b (diff)
downloadPROJ-72203ca68e123a237c8c748d39131b702ea4b646.tar.gz
PROJ-72203ca68e123a237c8c748d39131b702ea4b646.zip
Merge pull request #1620 from rouault/ossfuzz_17190_and_others
Assorted set of fixes for boring oss-fuzz related errors (mostly divisions by zero in odd situations)
Diffstat (limited to 'src/projections/geos.cpp')
-rw-r--r--src/projections/geos.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/projections/geos.cpp b/src/projections/geos.cpp
index 15f51e6f..7999b21f 100644
--- a/src/projections/geos.cpp
+++ b/src/projections/geos.cpp
@@ -126,11 +126,11 @@ static PJ_LP geos_s_inverse (PJ_XY xy, PJ *P) { /* Spheroidal, inverse
/* Setting three components of vector from satellite to position.*/
Vx = -1.0;
if(Q->flip_axis) {
- Vz = tan (xy.y / (Q->radius_g - 1.0));
- Vy = tan (xy.x / (Q->radius_g - 1.0)) * sqrt (1.0 + Vz * Vz);
+ Vz = tan (xy.y / Q->radius_g_1);
+ Vy = tan (xy.x / Q->radius_g_1) * sqrt (1.0 + Vz * Vz);
} else {
- Vy = tan (xy.x / (Q->radius_g - 1.0));
- Vz = tan (xy.y / (Q->radius_g - 1.0)) * sqrt (1.0 + Vy * Vy);
+ Vy = tan (xy.x / Q->radius_g_1);
+ Vz = tan (xy.y / Q->radius_g_1) * sqrt (1.0 + Vy * Vy);
}
/* Calculation of terms in cubic equation and determinant.*/