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/transformations/affine.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/transformations/affine.cpp')

diff --git a/src/transformations/affine.cpp b/src/transformations/affine.cpp
index e2b668d3..002bb2dd 100644
--- a/src/transformations/affine.cpp
+++ b/src/transformations/affine.cpp
@@ -70,14 +70,14 @@ static PJ_COORD forward_4d(PJ_COORD obs, PJ *P) {
     return newObs;
 }
 
-static XYZ forward_3d(LPZ lpz, PJ *P) {
+static PJ_XYZ forward_3d(PJ_LPZ lpz, PJ *P) {
     PJ_COORD point = {{0,0,0,0}};
     point.lpz = lpz;
     return forward_4d(point, P).xyz;
 }
 
 
-static XY forward_2d(LP lp, PJ *P) {
+static PJ_XY forward_2d(PJ_LP lp, PJ *P) {
     PJ_COORD point = {{0,0,0,0}};
     point.lp = lp;
     return forward_4d(point, P).xy;
@@ -98,13 +98,13 @@ static PJ_COORD reverse_4d(PJ_COORD obs, PJ *P) {
     return newObs;
 }
 
-static LPZ reverse_3d(XYZ xyz, PJ *P) {
+static PJ_LPZ reverse_3d(PJ_XYZ xyz, PJ *P) {
     PJ_COORD point = {{0,0,0,0}};
     point.xyz = xyz;
     return reverse_4d(point, P).lpz;
 }
 
-static LP reverse_2d(XY xy, PJ *P) {
+static PJ_LP reverse_2d(PJ_XY xy, PJ *P) {
     PJ_COORD point = {{0,0,0,0}};
     point.xy = xy;
     return reverse_4d(point, P).lp;
-- 
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/transformations/affine.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/transformations/affine.cpp')

diff --git a/src/transformations/affine.cpp b/src/transformations/affine.cpp
index 002bb2dd..21529a20 100644
--- a/src/transformations/affine.cpp
+++ b/src/transformations/affine.cpp
@@ -27,7 +27,7 @@
 
 #include "proj_internal.h"
 #include "proj.h"
-#include "projects.h"
+#include "proj_internal.h"
 
 PROJ_HEAD(affine, "Affine transformation");
 PROJ_HEAD(geogoffset, "Geographic Offset");
-- 
cgit v1.2.3