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/projections/larr.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/projections/larr.cpp') diff --git a/src/projections/larr.cpp b/src/projections/larr.cpp index e4d5d240..4ece694d 100644 --- a/src/projections/larr.cpp +++ b/src/projections/larr.cpp @@ -2,6 +2,7 @@ #include +#include "proj.h" #include "projects.h" PROJ_HEAD(larr, "Larrivee") "\n\tMisc Sph, no inv"; @@ -9,8 +10,8 @@ PROJ_HEAD(larr, "Larrivee") "\n\tMisc Sph, no inv"; #define SIXTH .16666666666666666 -static XY s_forward (LP lp, PJ *P) { /* Spheroidal, forward */ - XY xy = {0.0,0.0}; +static PJ_XY s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward */ + PJ_XY xy = {0.0,0.0}; (void) P; xy.x = 0.5 * lp.lam * (1. + sqrt(cos(lp.phi))); -- 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/projections/larr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/projections/larr.cpp') diff --git a/src/projections/larr.cpp b/src/projections/larr.cpp index 4ece694d..bab1dbf4 100644 --- a/src/projections/larr.cpp +++ b/src/projections/larr.cpp @@ -3,7 +3,7 @@ #include #include "proj.h" -#include "projects.h" +#include "proj_internal.h" PROJ_HEAD(larr, "Larrivee") "\n\tMisc Sph, no inv"; -- cgit v1.2.3