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/mk_cheby.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/mk_cheby.cpp')

diff --git a/src/mk_cheby.cpp b/src/mk_cheby.cpp
index 5e6bfef0..62528a41 100644
--- a/src/mk_cheby.cpp
+++ b/src/mk_cheby.cpp
@@ -1,9 +1,10 @@
+#include "proj.h"
 #include "projects.h"
 static void /* sum coefficients less than res */
-eval(projUV **w, int nu, int nv, double res, projUV *resid) {
+eval(PJ_UV **w, int nu, int nv, double res, PJ_UV *resid) {
     int i, j;
     double ab;
-    projUV *s;
+    PJ_UV *s;
 
     resid->u = resid->v = 0.;
     for (i = 0; i < nu; ++i) {
@@ -41,14 +42,14 @@ makeT(int nru, int nrv) {
     return T;
 }
 Tseries *
-mk_cheby(projUV a, projUV b, double res, projUV *resid, projUV (*func)(projUV), 
+mk_cheby(PJ_UV a, PJ_UV b, double res, PJ_UV *resid, PJ_UV (*func)(PJ_UV), 
          int nu, int nv, int power) {
     int j, i, nru, nrv, *ncu, *ncv;
     Tseries *T = nullptr;
-    projUV **w;
+    PJ_UV **w;
     double cutres;
 
-    if (!(w = (projUV **)vector2(nu, nv, sizeof(projUV))))
+    if (!(w = (PJ_UV **)vector2(nu, nv, sizeof(PJ_UV))))
         return nullptr;
     if (!(ncu = (int *)vector1(nu + nv, sizeof(int)))) {
         freev2((void **)w, nu);
@@ -56,7 +57,7 @@ mk_cheby(projUV a, projUV b, double res, projUV *resid, projUV (*func)(projUV),
     }
     ncv = ncu + nu;
     if (!bchgen(a, b, nu, nv, w, func)) {
-        projUV *s;
+        PJ_UV *s;
         double ab, *p;
 
         /* analyse coefficients and adjust until residual OK */
-- 
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/mk_cheby.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mk_cheby.cpp')

diff --git a/src/mk_cheby.cpp b/src/mk_cheby.cpp
index 62528a41..0f3b97ed 100644
--- a/src/mk_cheby.cpp
+++ b/src/mk_cheby.cpp
@@ -1,5 +1,5 @@
 #include "proj.h"
-#include "projects.h"
+#include "proj_internal.h"
 static void /* sum coefficients less than res */
 eval(PJ_UV **w, int nu, int nv, double res, PJ_UV *resid) {
     int i, j;
-- 
cgit v1.2.3