From 1b1d60e83a20412aeca3e440705df820979af03b Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 26 Dec 2018 14:22:34 +0100
Subject: projects.h: remove deprecated XY, XYZ, LP, LPZ, UV, UVW, projUV and
 projUVW structures

---
 src/transform.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/transform.cpp')

diff --git a/src/transform.cpp b/src/transform.cpp
index 433fc017..2c8dc467 100644
--- a/src/transform.cpp
+++ b/src/transform.cpp
@@ -193,8 +193,8 @@ static int geographic_to_projected (PJ *P, long n, int dist, double *x, double *
 
         for( i = 0; i < n; i++ )
         {
-            XYZ projected_loc;
-            LPZ geodetic_loc;
+            PJ_XYZ projected_loc;
+            PJ_LPZ geodetic_loc;
 
             geodetic_loc.lam = x[dist*i];
             geodetic_loc.phi = y[dist*i];
@@ -232,8 +232,8 @@ static int geographic_to_projected (PJ *P, long n, int dist, double *x, double *
 
     for( i = 0; i <n; i++ )
     {
-        XY         projected_loc;
-        LP	       geodetic_loc;
+        PJ_XY         projected_loc;
+        PJ_LP	       geodetic_loc;
 
         geodetic_loc.lam = x[dist*i];
         geodetic_loc.phi = y[dist*i];
@@ -303,8 +303,8 @@ static int projected_to_geographic (PJ *P, long n, int dist, double *x, double *
 
         for (i=0; i < n; i++)
         {
-            XYZ projected_loc;
-            LPZ geodetic_loc;
+            PJ_XYZ projected_loc;
+            PJ_LPZ geodetic_loc;
 
             projected_loc.x = x[dist*i];
             projected_loc.y = y[dist*i];
@@ -343,8 +343,8 @@ static int projected_to_geographic (PJ *P, long n, int dist, double *x, double *
 
     /* Fallback to the original PROJ.4 API 2d inversion - inv */
     for( i = 0; i < n; i++ ) {
-        XY         projected_loc;
-        LP	       geodetic_loc;
+        PJ_XY         projected_loc;
+        PJ_LP	       geodetic_loc;
 
         projected_loc.x = x[dist*i];
         projected_loc.y = y[dist*i];
-- 
cgit v1.2.3


From 8ab6f683cd316acf57bb89ed83932a267c5aa3c2 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 26 Dec 2018 14:58:26 +0100
Subject: Merge projects.h into proj_internal.h

---
 src/transform.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/transform.cpp')

diff --git a/src/transform.cpp b/src/transform.cpp
index 2c8dc467..486178d0 100644
--- a/src/transform.cpp
+++ b/src/transform.cpp
@@ -32,7 +32,7 @@
 #include <string.h>
 
 #include "proj.h"
-#include "projects.h"
+#include "proj_internal.h"
 #include "geocent.h"
 
 static int adjust_axis( projCtx ctx, const char *axis, int denormalize_flag,
-- 
cgit v1.2.3