diff options
Diffstat (limited to 'src/projections/putp5.cpp')
| -rw-r--r-- | src/projections/putp5.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/projections/putp5.cpp b/src/projections/putp5.cpp index 79e2ad15..62cb2ea9 100644 --- a/src/projections/putp5.cpp +++ b/src/projections/putp5.cpp @@ -3,7 +3,8 @@ #include <errno.h> #include <math.h> -#include "projects.h" +#include "proj.h" +#include "proj_internal.h" namespace { // anonymous namespace struct pj_opaque { @@ -18,8 +19,8 @@ PROJ_HEAD(putp5p, "Putnins P5'") "\n\tPCyl, Sph"; #define D 1.2158542 -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}; struct pj_opaque *Q = static_cast<struct pj_opaque*>(P->opaque); xy.x = C * lp.lam * (Q->A - Q->B * sqrt(1. + D * lp.phi * lp.phi)); @@ -29,8 +30,8 @@ static XY s_forward (LP lp, PJ *P) { /* Spheroidal, forward */ } -static LP s_inverse (XY xy, PJ *P) { /* Spheroidal, inverse */ - LP lp = {0.0,0.0}; +static PJ_LP s_inverse (PJ_XY xy, PJ *P) { /* Spheroidal, inverse */ + PJ_LP lp = {0.0,0.0}; struct pj_opaque *Q = static_cast<struct pj_opaque*>(P->opaque); lp.phi = xy.y / C; |