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/gauss.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/gauss.cpp') diff --git a/src/gauss.cpp b/src/gauss.cpp index 2db713ad..d7354bdc 100644 --- a/src/gauss.cpp +++ b/src/gauss.cpp @@ -28,6 +28,7 @@ #include #include +#include "proj.h" #include "projects.h" #define MAX_ITER 20 @@ -70,9 +71,9 @@ void *pj_gauss_ini(double e, double phi0, double *chi, double *rc) { return ((void *)en); } -LP pj_gauss(projCtx ctx, LP elp, const void *data) { +PJ_LP pj_gauss(projCtx ctx, PJ_LP elp, const void *data) { const struct GAUSS *en = (const struct GAUSS *)data; - LP slp; + PJ_LP slp; (void) ctx; slp.phi = 2. * atan( en->K * @@ -82,9 +83,9 @@ LP pj_gauss(projCtx ctx, LP elp, const void *data) { return(slp); } -LP pj_inv_gauss(projCtx ctx, LP slp, const void *data) { +PJ_LP pj_inv_gauss(projCtx ctx, PJ_LP slp, const void *data) { const struct GAUSS *en = (const struct GAUSS *)data; - LP elp; + PJ_LP elp; double num; int 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/gauss.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gauss.cpp') diff --git a/src/gauss.cpp b/src/gauss.cpp index d7354bdc..b7a27191 100644 --- a/src/gauss.cpp +++ b/src/gauss.cpp @@ -29,7 +29,7 @@ #include #include "proj.h" -#include "projects.h" +#include "proj_internal.h" #define MAX_ITER 20 -- cgit v1.2.3