diff options
| author | Andrew Bell <andrew.bell.ia@gmail.com> | 2019-05-15 10:47:03 -0400 |
|---|---|---|
| committer | Andrew Bell <andrew.bell.ia@gmail.com> | 2019-05-15 10:47:03 -0400 |
| commit | 8f268409d37cea329d263e177b83e42f8384d3c7 (patch) | |
| tree | c4d0f3dd19456600f718a6e0c8573577f433549b /src/projections/nzmg.cpp | |
| parent | 886ced02f0aaab5d66d16459435f7447cf976650 (diff) | |
| parent | d67203a6f76a74f5ac029ff052dbcc72e3b59624 (diff) | |
| download | PROJ-8f268409d37cea329d263e177b83e42f8384d3c7.tar.gz PROJ-8f268409d37cea329d263e177b83e42f8384d3c7.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/projections/nzmg.cpp')
| -rw-r--r-- | src/projections/nzmg.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/projections/nzmg.cpp b/src/projections/nzmg.cpp index 1c2d9fb7..2f1a897e 100644 --- a/src/projections/nzmg.cpp +++ b/src/projections/nzmg.cpp @@ -58,7 +58,7 @@ static const double tpsi[] = { .6399175073, -.1358797613, .063294409, -.02526853 #define Ntphi 8 -static PJ_XY e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward */ +static PJ_XY nzmg_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward */ PJ_XY xy = {0.0,0.0}; COMPLEX p; const double *C; @@ -77,7 +77,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 nzmg_e_inverse (PJ_XY xy, PJ *P) { /* Ellipsoidal, inverse */ PJ_LP lp = {0.0,0.0}; int nn, i; COMPLEX p, f, fp, dp; @@ -116,8 +116,8 @@ PJ *PROJECTION(nzmg) { P->x0 = 2510000.; P->y0 = 6023150.; - P->inv = e_inverse; - P->fwd = e_forward; + P->inv = nzmg_e_inverse; + P->fwd = nzmg_e_forward; return P; |