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/misrsom.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/misrsom.cpp')
| -rw-r--r-- | src/projections/misrsom.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/projections/misrsom.cpp b/src/projections/misrsom.cpp index d16dd62d..09e2d8f3 100644 --- a/src/projections/misrsom.cpp +++ b/src/projections/misrsom.cpp @@ -62,7 +62,7 @@ static void seraz0(double lam, double mult, PJ *P) { } -static PJ_XY e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward */ +static PJ_XY misrsom_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward */ PJ_XY xy = {0.0,0.0}; struct pj_opaque *Q = static_cast<struct pj_opaque*>(P->opaque); int l, nn; @@ -123,7 +123,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 misrsom_e_inverse (PJ_XY xy, PJ *P) { /* Ellipsoidal, inverse */ PJ_LP lp = {0.0,0.0}; struct pj_opaque *Q = static_cast<struct pj_opaque*>(P->opaque); int nn; @@ -216,8 +216,8 @@ PJ *PROJECTION(misrsom) { Q->c1 /= 15.; Q->c3 /= 45.; - P->inv = e_inverse; - P->fwd = e_forward; + P->inv = misrsom_e_inverse; + P->fwd = misrsom_e_forward; return P; } |