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/sch.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/projections/sch.cpp') diff --git a/src/projections/sch.cpp b/src/projections/sch.cpp index 5a2f944b..418ebb5e 100644 --- a/src/projections/sch.cpp +++ b/src/projections/sch.cpp @@ -55,8 +55,8 @@ struct pj_opaque { PROJ_HEAD(sch, "Spherical Cross-track Height") "\n\tMisc\n\tplat_0= plon_0= phdg_0= [h_0=]"; -static LPZ inverse3d(XYZ xyz, PJ *P) { - LPZ lpz = {0.0, 0.0, 0.0}; +static PJ_LPZ inverse3d(PJ_XYZ xyz, PJ *P) { + PJ_LPZ lpz = {0.0, 0.0, 0.0}; struct pj_opaque *Q = static_cast(P->opaque); double temp[3]; double pxyz[3]; @@ -93,8 +93,8 @@ static LPZ inverse3d(XYZ xyz, PJ *P) { return lpz; } -static XYZ forward3d(LPZ lpz, PJ *P) { - XYZ xyz = {0.0, 0.0, 0.0}; +static PJ_XYZ forward3d(PJ_LPZ lpz, PJ *P) { + PJ_XYZ xyz = {0.0, 0.0, 0.0}; struct pj_opaque *Q = static_cast(P->opaque); double temp[3]; double pxyz[3]; -- 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/sch.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/projections/sch.cpp') diff --git a/src/projections/sch.cpp b/src/projections/sch.cpp index 418ebb5e..f4c66688 100644 --- a/src/projections/sch.cpp +++ b/src/projections/sch.cpp @@ -36,7 +36,7 @@ #include #include "proj.h" -#include "projects.h" +#include "proj_internal.h" #include "geocent.h" namespace { // anonymous namespace -- cgit v1.2.3