aboutsummaryrefslogtreecommitdiff
path: root/src/projections/nzmg.cpp
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2018-12-26 14:22:34 +0100
committerEven Rouault <even.rouault@spatialys.com>2018-12-30 21:48:56 +0100
commit1b1d60e83a20412aeca3e440705df820979af03b (patch)
treea96858922bc09392b5cea01750b05115f4f3afff /src/projections/nzmg.cpp
parentc9b32000d5fc12705bea92e6509fbedb37193012 (diff)
downloadPROJ-1b1d60e83a20412aeca3e440705df820979af03b.tar.gz
PROJ-1b1d60e83a20412aeca3e440705df820979af03b.zip
projects.h: remove deprecated XY, XYZ, LP, LPZ, UV, UVW, projUV and projUVW structures
Diffstat (limited to 'src/projections/nzmg.cpp')
-rw-r--r--src/projections/nzmg.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/projections/nzmg.cpp b/src/projections/nzmg.cpp
index bf0862fb..a5eb07e2 100644
--- a/src/projections/nzmg.cpp
+++ b/src/projections/nzmg.cpp
@@ -29,6 +29,7 @@
#include <math.h>
+#include "proj.h"
#include "projects.h"
PROJ_HEAD(nzmg, "New Zealand Map Grid") "\n\tfixed Earth";
@@ -57,8 +58,8 @@ static const double tpsi[] = { .6399175073, -.1358797613, .063294409, -.02526853
#define Ntphi 8
-static XY e_forward (LP lp, PJ *P) { /* Ellipsoidal, forward */
- XY xy = {0.0,0.0};
+static PJ_XY e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward */
+ PJ_XY xy = {0.0,0.0};
COMPLEX p;
const double *C;
int i;
@@ -76,8 +77,8 @@ static XY e_forward (LP lp, PJ *P) { /* Ellipsoidal, forward */
}
-static LP e_inverse (XY xy, PJ *P) { /* Ellipsoidal, inverse */
- LP lp = {0.0,0.0};
+static PJ_LP e_inverse (PJ_XY xy, PJ *P) { /* Ellipsoidal, inverse */
+ PJ_LP lp = {0.0,0.0};
int nn, i;
COMPLEX p, f, fp, dp;
double den;