projects.h: remove deprecated XY, XYZ, LP, LPZ, UV, UVW, projUV and projUVW structures

7 files changed, 20 insertions, 16 deletions

diff --git a/src/apps/cs2cs.cpp b/src/apps/cs2cs.cpp
index 937d3d58..9000454a 100644
--- a/src/apps/cs2cs.cpp
+++ b/src/apps/cs2cs.cpp
@@ -83,7 +83,7 @@ static void process(FILE *fid)
 
 {
     char line[MAX_LINE + 3], *s, pline[40];
-    projUV data;
+    PJ_UV data;
 
     for (;;) {
         double z;
diff --git a/src/apps/gen_cheb.cpp b/src/apps/gen_cheb.cpp
index 4ba514d4..167ee79d 100644
--- a/src/apps/gen_cheb.cpp
+++ b/src/apps/gen_cheb.cpp
@@ -1,5 +1,6 @@
 /* generates 'T' option output */
 #define PJ_LIB__
+#include "proj.h"
 #include "projects.h"
 #include <stdio.h>
 #include <string.h>
@@ -38,17 +39,17 @@ static long strtol_type_safe(const char *s, const char ** endptr, int base)
 
 
 /* FIXME: put the declaration in a header. Also used in proj.c */
-void gen_cheb(int inverse, projUV (*proj)(projUV), const char *s, PJ *P,
+void gen_cheb(int inverse, PJ_UV (*proj)(PJ_UV), const char *s, PJ *P,
               int iargc, char **iargv);
 extern void p_series(Tseries *, FILE *, char *);
 
-void gen_cheb(int inverse, projUV (*proj)(projUV), const char *s, PJ *P,
+void gen_cheb(int inverse, PJ_UV (*proj)(PJ_UV), const char *s, PJ *P,
               int iargc, char **iargv) {
 	long NU = 15, NV = 15;
 	int errin = 0, pwr;
 	long res = -1;
 	char *arg, fmt[32];
-	projUV low, upp, resid;
+	PJ_UV low, upp, resid;
 	Tseries *F;
 	double (*input)(const char *, const char **);
 
diff --git a/src/apps/geod_interface.cpp b/src/apps/geod_interface.cpp
index a30377ac..1a085b38 100644
--- a/src/apps/geod_interface.cpp
+++ b/src/apps/geod_interface.cpp
@@ -1,3 +1,4 @@
+#include "proj.h"
 #include "projects.h"
 #include "geod_interface.h"
 
diff --git a/src/apps/nad2bin.cpp b/src/apps/nad2bin.cpp
index ff8f2ebd..62a7b320 100644
--- a/src/apps/nad2bin.cpp
+++ b/src/apps/nad2bin.cpp
@@ -274,7 +274,7 @@ int main(int argc, char **argv) {
             unsigned char achHeader[11*16];
             double dfValue;
             pj_int32 nGSCount = ct.lim.lam * ct.lim.phi;
-            LP ur;
+            PJ_LP ur;
 
             ur.lam = ct.ll.lam + (ct.lim.lam-1) * ct.del.lam;
             ur.phi = ct.ll.phi + (ct.lim.phi-1) * ct.del.phi;
diff --git a/src/apps/p_series.cpp b/src/apps/p_series.cpp
index cddea888..3815824b 100644
--- a/src/apps/p_series.cpp
+++ b/src/apps/p_series.cpp
@@ -1,4 +1,5 @@
 /* print row coefficients of Tseries structure */
+#include "proj.h"
 #include "projects.h"
 #include <stdio.h>
 #include <string.h>
diff --git a/src/apps/proj.cpp b/src/apps/proj.cpp
index b93fb04d..9958a777 100644
--- a/src/apps/proj.cpp
+++ b/src/apps/proj.cpp
@@ -20,13 +20,13 @@
 #define MAX_PARGS 100
 #define PJ_INVERS(P) (P->inv ? 1 : 0)
 
-extern void gen_cheb(int, projUV(*)(projUV), const char *, PJ *, int, char **);
+extern void gen_cheb(int, PJ_UV(*)(PJ_UV), const char *, PJ *, int, char **);
 
 static PJ *Proj;
 static union {
-    projUV (*generic)(projUV, PJ *);
-    projXY (*fwd)(projLP, PJ *);
-    projLP (*inv)(projXY, PJ *);
+    PJ_UV (*generic)(PJ_UV, PJ *);
+    PJ_XY (*fwd)(PJ_LP, PJ *);
+    PJ_LP (*inv)(PJ_XY, PJ *);
 } proj;
 
 static int
@@ -56,7 +56,7 @@ static PJ_FACTORS facs;
 static double (*informat)(const char *, char **), /* input data deformatter function */
               fscale = 0.;                        /* cartesian scale factor */
 
-static projUV int_proj(projUV data) {
+static PJ_UV int_proj(PJ_UV data) {
     if (prescale) {
         data.u *= fscale;
         data.v *= fscale;
@@ -82,7 +82,7 @@ static void process(FILE *fid) {
         ++emess_dat.File_line;
 
         if (bin_in) {   /* binary input */
-            if (fread(&data, sizeof(projUV), 1, fid) != 1)
+            if (fread(&data, sizeof(PJ_UV), 1, fid) != 1)
                 break;
         } else {    /* ascii input */
             if (!(s = fgets(line, MAX_LINE, fid)))
@@ -144,7 +144,7 @@ static void process(FILE *fid) {
         }
 
         if (bin_out) { /* binary output */
-            (void)fwrite(&data, sizeof(projUV), 1, stdout);
+            (void)fwrite(&data, sizeof(PJ_UV), 1, stdout);
             continue;
         } else if (data.uv.u == HUGE_VAL) /* error output */
             (void)fputs(oterr, stdout);
@@ -196,8 +196,8 @@ static void process(FILE *fid) {
 /* file processing function --- verbosely */
 static void vprocess(FILE *fid) {
     char line[MAX_LINE+3], *s, pline[40];
-    LP dat_ll;
-    projXY dat_xy;
+    PJ_LP dat_ll;
+    PJ_XY dat_xy;
     int linvers;
     PJ_COORD coord;
 
@@ -247,7 +247,7 @@ static void vprocess(FILE *fid) {
             }
             if (prescale) { dat_xy.x *= fscale; dat_xy.y *= fscale; }
             if (reversein) {
-                projXY temp = dat_xy;
+                PJ_XY temp = dat_xy;
                 dat_xy.x = temp.y;
                 dat_xy.y = temp.x;
             }
@@ -260,7 +260,7 @@ static void vprocess(FILE *fid) {
                 continue;
             }
             if (reversein) {
-                LP temp = dat_ll;
+                PJ_LP temp = dat_ll;
                 dat_ll.lam = temp.phi;
                 dat_ll.phi = temp.lam;
             }
diff --git a/src/apps/projinfo.cpp b/src/apps/projinfo.cpp
index d604365a..589ca832 100644
--- a/src/apps/projinfo.cpp
+++ b/src/apps/projinfo.cpp
@@ -35,6 +35,7 @@
 #include <iostream>
 #include <utility>
 
+#include "proj.h"
 #include "projects.h"
 
 #include <proj/common.hpp>