diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2018-12-26 14:22:34 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2018-12-30 21:48:56 +0100 |
| commit | 1b1d60e83a20412aeca3e440705df820979af03b (patch) | |
| tree | a96858922bc09392b5cea01750b05115f4f3afff /src/projections/urmfps.cpp | |
| parent | c9b32000d5fc12705bea92e6509fbedb37193012 (diff) | |
| download | PROJ-1b1d60e83a20412aeca3e440705df820979af03b.tar.gz PROJ-1b1d60e83a20412aeca3e440705df820979af03b.zip | |
projects.h: remove deprecated XY, XYZ, LP, LPZ, UV, UVW, projUV and projUVW structures
Diffstat (limited to 'src/projections/urmfps.cpp')
| -rw-r--r-- | src/projections/urmfps.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/projections/urmfps.cpp b/src/projections/urmfps.cpp index 7103222a..2aa6432c 100644 --- a/src/projections/urmfps.cpp +++ b/src/projections/urmfps.cpp @@ -19,8 +19,8 @@ struct pj_opaque { #define Cy 1.139753528477 -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}; lp.phi = aasin (P->ctx,static_cast<struct pj_opaque*>(P->opaque)->n * sin (lp.phi)); xy.x = C_x * lp.lam * cos (lp.phi); xy.y = static_cast<struct pj_opaque*>(P->opaque)->C_y * lp.phi; @@ -28,8 +28,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}; xy.y /= static_cast<struct pj_opaque*>(P->opaque)->C_y; lp.phi = aasin(P->ctx, sin (xy.y) / static_cast<struct pj_opaque*>(P->opaque)->n); lp.lam = xy.x / (C_x * cos (xy.y)); |