diff options
Diffstat (limited to 'src/projections/putp3.cpp')
| -rw-r--r-- | src/projections/putp3.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/projections/putp3.cpp b/src/projections/putp3.cpp index 98bb2ff0..ca356bd0 100644 --- a/src/projections/putp3.cpp +++ b/src/projections/putp3.cpp @@ -1,5 +1,7 @@ #define PJ_LIB__ #include <errno.h> + +#include "proj.h" #include "projects.h" namespace { // anonymous namespace @@ -15,8 +17,8 @@ PROJ_HEAD(putp3p, "Putnins P3'") "\n\tPCyl, Sph"; #define RPISQ 0.1013211836 -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}; xy.x = C * lp.lam * (1. - static_cast<struct pj_opaque*>(P->opaque)->A * lp.phi * lp.phi); xy.y = C * lp.phi; @@ -25,8 +27,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}; lp.phi = xy.y / C; lp.lam = xy.x / (C * (1. - static_cast<struct pj_opaque*>(P->opaque)->A * lp.phi * lp.phi)); |