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/fwd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/fwd.cpp') diff --git a/src/fwd.cpp b/src/fwd.cpp index e8f73999..2824a039 100644 --- a/src/fwd.cpp +++ b/src/fwd.cpp @@ -164,7 +164,7 @@ static PJ_COORD error_or_coord(PJ *P, PJ_COORD coord, int last_errno) { } -XY pj_fwd(LP lp, PJ *P) { +PJ_XY pj_fwd(PJ_LP lp, PJ *P) { int last_errno; PJ_COORD coo = {{0,0,0,0}}; coo.lp = lp; @@ -198,7 +198,7 @@ XY pj_fwd(LP lp, PJ *P) { -XYZ pj_fwd3d(LPZ lpz, PJ *P) { +PJ_XYZ pj_fwd3d(PJ_LPZ lpz, PJ *P) { int last_errno; PJ_COORD coo = {{0,0,0,0}}; coo.lpz = lpz; -- 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/fwd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/fwd.cpp') diff --git a/src/fwd.cpp b/src/fwd.cpp index 2824a039..02f31f87 100644 --- a/src/fwd.cpp +++ b/src/fwd.cpp @@ -33,7 +33,7 @@ #include "proj_internal.h" #include "proj_math.h" -#include "projects.h" +#include "proj_internal.h" #define INPUT_UNITS P->left #define OUTPUT_UNITS P->right -- cgit v1.2.3