aboutsummaryrefslogtreecommitdiff
path: root/src/projections/bonne.cpp
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2019-04-26 18:18:30 +0200
committerEven Rouault <even.rouault@spatialys.com>2019-04-26 18:18:30 +0200
commit00980bf63fae6d350f425c44a648f33d7c09a931 (patch)
tree4a8aa7085f3bb01cfaa713e5ac6450dffec77ff2 /src/projections/bonne.cpp
parent210df01d861f4d75b3e4c698b9394d6d48989169 (diff)
downloadPROJ-00980bf63fae6d350f425c44a648f33d7c09a931.tar.gz
PROJ-00980bf63fae6d350f425c44a648f33d7c09a931.zip
Prefix inverse and forward functions by their projection names
This is mostly to have better OSSFuzz report. Currently a lot of bug summaries are like `proj4/standard_fuzzer: Divide-by-zero in s_inverse` By prefixing the projection name, we will get better reports, like `Divide-by-zero in airy_s_inverse` This also makes it slightly easier to set a breakpoint by function name.
Diffstat (limited to 'src/projections/bonne.cpp')
-rw-r--r--src/projections/bonne.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/projections/bonne.cpp b/src/projections/bonne.cpp
index 289eb23d..31f90907 100644
--- a/src/projections/bonne.cpp
+++ b/src/projections/bonne.cpp
@@ -20,7 +20,7 @@ struct pj_opaque {
} // anonymous namespace
-static PJ_XY e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward */
+static PJ_XY bonne_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward */
PJ_XY xy = {0.0,0.0};
struct pj_opaque *Q = static_cast<struct pj_opaque*>(P->opaque);
double rh, E, c;
@@ -38,7 +38,7 @@ static PJ_XY e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward */
}
-static PJ_XY s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward */
+static PJ_XY bonne_s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward */
PJ_XY xy = {0.0,0.0};
struct pj_opaque *Q = static_cast<struct pj_opaque*>(P->opaque);
double E, rh;
@@ -53,7 +53,7 @@ static PJ_XY s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward */
}
-static PJ_LP s_inverse (PJ_XY xy, PJ *P) { /* Spheroidal, inverse */
+static PJ_LP bonne_s_inverse (PJ_XY xy, PJ *P) { /* Spheroidal, inverse */
PJ_LP lp = {0.0,0.0};
struct pj_opaque *Q = static_cast<struct pj_opaque*>(P->opaque);
double rh;
@@ -72,7 +72,7 @@ static PJ_LP s_inverse (PJ_XY xy, PJ *P) { /* Spheroidal, inverse */
}
-static PJ_LP e_inverse (PJ_XY xy, PJ *P) { /* Ellipsoidal, inverse */
+static PJ_LP bonne_e_inverse (PJ_XY xy, PJ *P) { /* Ellipsoidal, inverse */
PJ_LP lp = {0.0,0.0};
struct pj_opaque *Q = static_cast<struct pj_opaque*>(P->opaque);
double s, rh;
@@ -125,15 +125,15 @@ PJ *PROJECTION(bonne) {
Q->m1 = pj_mlfn(Q->phi1, Q->am1 = sin(Q->phi1),
c = cos(Q->phi1), Q->en);
Q->am1 = c / (sqrt(1. - P->es * Q->am1 * Q->am1) * Q->am1);
- P->inv = e_inverse;
- P->fwd = e_forward;
+ P->inv = bonne_e_inverse;
+ P->fwd = bonne_e_forward;
} else {
if (fabs(Q->phi1) + EPS10 >= M_HALFPI)
Q->cphi1 = 0.;
else
Q->cphi1 = 1. / tan(Q->phi1);
- P->inv = s_inverse;
- P->fwd = s_forward;
+ P->inv = bonne_s_inverse;
+ P->fwd = bonne_s_forward;
}
return P;
}