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/oea.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/oea.cpp')
| -rw-r--r-- | src/projections/oea.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/projections/oea.cpp b/src/projections/oea.cpp index f2fc1053..ac0f643f 100644 --- a/src/projections/oea.cpp +++ b/src/projections/oea.cpp @@ -16,7 +16,7 @@ struct pj_opaque { } // anonymous namespace -static PJ_XY s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward */ +static PJ_XY oea_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 Az, M, N, cp, sp, cl, shz; @@ -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 oea_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 N, M, xp, yp, z, Az, cz, sz, cAz; @@ -77,8 +77,8 @@ PJ *PROJECTION(oea) { Q->two_r_m = 2. * Q->rm; Q->hm = 0.5 * Q->m; Q->hn = 0.5 * Q->n; - P->fwd = s_forward; - P->inv = s_inverse; + P->fwd = oea_s_forward; + P->inv = oea_s_inverse; P->es = 0.; } |