From 9bb2d68766c5cc064352cc89045447949e090508 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 26 Dec 2018 12:51:24 +0100 Subject: projects.h: remove #ifdef __cpluplus test since it must now be included from C++ file due to C++ objects in struct PJconsts --- src/nad_cvt.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/nad_cvt.cpp') diff --git a/src/nad_cvt.cpp b/src/nad_cvt.cpp index ec4a2b47..c0e67943 100644 --- a/src/nad_cvt.cpp +++ b/src/nad_cvt.cpp @@ -3,6 +3,7 @@ #include #include +#include "proj.h" #include "projects.h" #include "proj_math.h" -- cgit v1.2.3 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/nad_cvt.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/nad_cvt.cpp') diff --git a/src/nad_cvt.cpp b/src/nad_cvt.cpp index c0e67943..91615bfa 100644 --- a/src/nad_cvt.cpp +++ b/src/nad_cvt.cpp @@ -10,8 +10,8 @@ #define MAX_ITERATIONS 10 #define TOL 1e-12 -LP nad_cvt(LP in, int inverse, struct CTABLE *ct) { - LP t, tb,del, dif; +PJ_LP nad_cvt(PJ_LP in, int inverse, struct CTABLE *ct) { + PJ_LP t, tb,del, dif; int i = MAX_ITERATIONS; const double toltol = TOL*TOL; -- 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/nad_cvt.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nad_cvt.cpp') diff --git a/src/nad_cvt.cpp b/src/nad_cvt.cpp index 91615bfa..76d2ccd0 100644 --- a/src/nad_cvt.cpp +++ b/src/nad_cvt.cpp @@ -4,7 +4,7 @@ #include #include "proj.h" -#include "projects.h" +#include "proj_internal.h" #include "proj_math.h" #define MAX_ITERATIONS 10 -- cgit v1.2.3