diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-05-01 18:39:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-01 18:39:33 +0200 |
| commit | e2b291c0c2a684313143eaf334fbf1161075b449 (patch) | |
| tree | ae477566a19fae2cdd52485358639dec84e758ca /src/projections/eqearth.cpp | |
| parent | a26fe9d131a23f261af47de8a05eeea49256cf1f (diff) | |
| parent | 00980bf63fae6d350f425c44a648f33d7c09a931 (diff) | |
| download | PROJ-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/eqearth.cpp')
| -rw-r--r-- | src/projections/eqearth.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/projections/eqearth.cpp b/src/projections/eqearth.cpp index 73499262..832c9444 100644 --- a/src/projections/eqearth.cpp +++ b/src/projections/eqearth.cpp @@ -40,7 +40,7 @@ struct pj_opaque { }; } // anonymous namespace -static PJ_XY e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal/spheroidal, forward */ +static PJ_XY eqearth_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal/spheroidal, forward */ PJ_XY xy = {0.0,0.0}; struct pj_opaque *Q = static_cast<struct pj_opaque*>(P->opaque); double sbeta; @@ -74,7 +74,7 @@ static PJ_XY e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal/spheroidal, } -static PJ_LP e_inverse (PJ_XY xy, PJ *P) { /* Ellipsoidal/spheroidal, inverse */ +static PJ_LP eqearth_e_inverse (PJ_XY xy, PJ *P) { /* Ellipsoidal/spheroidal, inverse */ PJ_LP lp = {0.0,0.0}; struct pj_opaque *Q = static_cast<struct pj_opaque*>(P->opaque); double yc, y2, y6; @@ -148,8 +148,8 @@ PJ *PROJECTION(eqearth) { return pj_default_destructor (P, ENOMEM); P->opaque = Q; P->destructor = destructor; - P->fwd = e_forward; - P->inv = e_inverse; + P->fwd = eqearth_e_forward; + P->inv = eqearth_e_inverse; Q->rqda = 1.0; /* Ellipsoidal case */ |