aboutsummaryrefslogtreecommitdiff
path: root/src/projections/krovak.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/krovak.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/krovak.cpp')
-rw-r--r--src/projections/krovak.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/projections/krovak.cpp b/src/projections/krovak.cpp
index c3f61f3d..98f09199 100644
--- a/src/projections/krovak.cpp
+++ b/src/projections/krovak.cpp
@@ -103,7 +103,7 @@ struct pj_opaque {
} // anonymous namespace
-static PJ_XY e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward */
+static PJ_XY krovak_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward */
struct pj_opaque *Q = static_cast<struct pj_opaque*>(P->opaque);
PJ_XY xy = {0.0,0.0};
@@ -137,7 +137,7 @@ static PJ_XY e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forwar
}
-static PJ_LP e_inverse (PJ_XY xy, PJ *P) { /* Ellipsoidal, inverse */
+static PJ_LP krovak_e_inverse (PJ_XY xy, PJ *P) { /* Ellipsoidal, inverse */
struct pj_opaque *Q = static_cast<struct pj_opaque*>(P->opaque);
PJ_LP lp = {0.0,0.0};
@@ -232,8 +232,8 @@ PJ *PROJECTION(krovak) {
Q->rho0 = P->k0 * n0 / tan(S0);
Q->ad = M_PI_2 - UQ;
- P->inv = e_inverse;
- P->fwd = e_forward;
+ P->inv = krovak_e_inverse;
+ P->fwd = krovak_e_forward;
return P;
}