diff options
Diffstat (limited to 'src/projections/somerc.cpp')
| -rw-r--r-- | src/projections/somerc.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/projections/somerc.cpp b/src/projections/somerc.cpp index 15d2e765..ead9090f 100644 --- a/src/projections/somerc.cpp +++ b/src/projections/somerc.cpp @@ -4,7 +4,7 @@ #include <math.h> #include "proj.h" -#include "projects.h" +#include "proj_internal.h" PROJ_HEAD(somerc, "Swiss. Obl. Mercator") "\n\tCyl, Ell\n\tFor CH1903"; @@ -18,8 +18,8 @@ struct pj_opaque { #define NITER 6 -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}; double phip, lamp, phipp, lampp, sp, cp; struct pj_opaque *Q = static_cast<struct pj_opaque*>(P->opaque); @@ -37,8 +37,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<struct pj_opaque*>(P->opaque); double phip, lamp, phipp, lampp, cp, esp, con, delp; int i; |