aboutsummaryrefslogtreecommitdiff
path: root/src/projections/goode.cpp
diff options
context:
space:
mode:
authorKristian Evers <kristianevers@gmail.com>2019-05-01 18:39:33 +0200
committerGitHub <noreply@github.com>2019-05-01 18:39:33 +0200
commite2b291c0c2a684313143eaf334fbf1161075b449 (patch)
treeae477566a19fae2cdd52485358639dec84e758ca /src/projections/goode.cpp
parenta26fe9d131a23f261af47de8a05eeea49256cf1f (diff)
parent00980bf63fae6d350f425c44a648f33d7c09a931 (diff)
downloadPROJ-e2b291c0c2a684313143eaf334fbf1161075b449.tar.gz
PROJ-e2b291c0c2a684313143eaf334fbf1161075b449.zip
Merge pull request #1444 from rouault/disambguish_forward_inverse_names
Prefix inverse and forward functions by their projection names
Diffstat (limited to 'src/projections/goode.cpp')
-rw-r--r--src/projections/goode.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/projections/goode.cpp b/src/projections/goode.cpp
index 802df90c..c716649d 100644
--- a/src/projections/goode.cpp
+++ b/src/projections/goode.cpp
@@ -21,7 +21,7 @@ struct pj_opaque {
} // anonymous namespace
-static PJ_XY s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward */
+static PJ_XY goode_s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward */
PJ_XY xy;
struct pj_opaque *Q = static_cast<struct pj_opaque*>(P->opaque);
@@ -35,7 +35,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 goode_s_inverse (PJ_XY xy, PJ *P) { /* Spheroidal, inverse */
PJ_LP lp;
struct pj_opaque *Q = static_cast<struct pj_opaque*>(P->opaque);
@@ -77,8 +77,8 @@ PJ *PROJECTION(goode) {
if (!(Q->sinu = pj_sinu(Q->sinu)) || !(Q->moll = pj_moll(Q->moll)))
return destructor (P, ENOMEM);
- P->fwd = s_forward;
- P->inv = s_inverse;
+ P->fwd = goode_s_forward;
+ P->inv = goode_s_inverse;
return P;
}