From 1b1d60e83a20412aeca3e440705df820979af03b Mon Sep 17 00:00:00 2001 From: Even Rouault 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/bchgen.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/bchgen.cpp') diff --git a/src/bchgen.cpp b/src/bchgen.cpp index c129f0c1..324ac8f6 100644 --- a/src/bchgen.cpp +++ b/src/bchgen.cpp @@ -1,9 +1,10 @@ /* generate double bivariate Chebychev polynomial */ +#include "proj.h" #include "projects.h" int -bchgen(projUV a, projUV b, int nu, int nv, projUV **f, projUV(*func)(projUV)) { +bchgen(PJ_UV a, PJ_UV b, int nu, int nv, PJ_UV **f, PJ_UV(*func)(PJ_UV)) { int i, j, k; - projUV arg, *t, bma, bpa, *c; + PJ_UV arg, *t, bma, bpa, *c; double d, fac; bma.u = 0.5 * (b.u - a.u); bma.v = 0.5 * (b.v - a.v); @@ -17,7 +18,7 @@ bchgen(projUV a, projUV b, int nu, int nv, projUV **f, projUV(*func)(projUV)) { return(1); } } - if (!(c = (projUV *) vector1(nu, sizeof(projUV)))) return 1; + if (!(c = (PJ_UV *) vector1(nu, sizeof(PJ_UV)))) return 1; fac = 2. / nu; for ( j = 0; j < nv ; ++j) { for ( i = 0; i < nu; ++i) { @@ -35,7 +36,7 @@ bchgen(projUV a, projUV b, int nu, int nv, projUV **f, projUV(*func)(projUV)) { f[i][j] = c[i]; } pj_dalloc(c); - if (!(c = (projUV*) vector1(nv, sizeof(projUV)))) return 1; + if (!(c = (PJ_UV*) vector1(nv, sizeof(PJ_UV)))) return 1; fac = 2. / nv; for ( i = 0; i < nu; ++i) { t = f[i]; -- cgit v1.2.3 From 8ab6f683cd316acf57bb89ed83932a267c5aa3c2 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 26 Dec 2018 14:58:26 +0100 Subject: Merge projects.h into proj_internal.h --- src/bchgen.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/bchgen.cpp') diff --git a/src/bchgen.cpp b/src/bchgen.cpp index 324ac8f6..9677b6f2 100644 --- a/src/bchgen.cpp +++ b/src/bchgen.cpp @@ -1,6 +1,6 @@ /* generate double bivariate Chebychev polynomial */ #include "proj.h" -#include "projects.h" +#include "proj_internal.h" int bchgen(PJ_UV a, PJ_UV b, int nu, int nv, PJ_UV **f, PJ_UV(*func)(PJ_UV)) { int i, j, k; -- cgit v1.2.3