aboutsummaryrefslogtreecommitdiff
path: root/src/projections/lcc.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/lcc.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/lcc.cpp')
-rw-r--r--src/projections/lcc.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/projections/lcc.cpp b/src/projections/lcc.cpp
index a101009d..beb2efd1 100644
--- a/src/projections/lcc.cpp
+++ b/src/projections/lcc.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 lcc_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward */
PJ_XY xy = {0., 0.};
struct pj_opaque *Q = static_cast<struct pj_opaque*>(P->opaque);
double rho;
@@ -43,7 +43,7 @@ static PJ_XY e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward */
}
-static PJ_LP e_inverse (PJ_XY xy, PJ *P) { /* Ellipsoidal, inverse */
+static PJ_LP lcc_e_inverse (PJ_XY xy, PJ *P) { /* Ellipsoidal, inverse */
PJ_LP lp = {0., 0.};
struct pj_opaque *Q = static_cast<struct pj_opaque*>(P->opaque);
double rho;
@@ -144,8 +144,8 @@ PJ *PROJECTION(lcc) {
Q->c * pow(tan(M_FORTPI + .5 * P->phi0), -Q->n);
}
- P->inv = e_inverse;
- P->fwd = e_forward;
+ P->inv = lcc_e_inverse;
+ P->fwd = lcc_e_forward;
return P;
}