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/mod_ster.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/projections/mod_ster.cpp') diff --git a/src/projections/mod_ster.cpp b/src/projections/mod_ster.cpp index 7c4f363b..6603ec60 100644 --- a/src/projections/mod_ster.cpp +++ b/src/projections/mod_ster.cpp @@ -1,6 +1,7 @@ /* based upon Snyder and Linck, USGS-NMD */ #define PJ_LIB__ #include +#include "proj.h" #include "projects.h" #include "proj_math.h" @@ -21,8 +22,8 @@ struct pj_opaque { } // anonymous namespace -static XY e_forward (LP lp, PJ *P) { /* Ellipsoidal, forward */ - XY xy = {0.0,0.0}; +static PJ_XY e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forward */ + PJ_XY xy = {0.0,0.0}; struct pj_opaque *Q = static_cast(P->opaque); double sinlon, coslon, esphi, chi, schi, cchi, s; COMPLEX p; @@ -45,8 +46,8 @@ static XY e_forward (LP lp, PJ *P) { /* Ellipsoidal, forward */ } -static LP e_inverse (XY xy, PJ *P) { /* Ellipsoidal, inverse */ - LP lp = {0.0,0.0}; +static PJ_LP e_inverse (PJ_XY xy, PJ *P) { /* Ellipsoidal, inverse */ + PJ_LP lp = {0.0,0.0}; struct pj_opaque *Q = static_cast(P->opaque); int nn; COMPLEX p, fxy, fpxy, dp; -- cgit v1.2.3