aboutsummaryrefslogtreecommitdiff
path: root/src/projections/stere.cpp
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2018-12-26 14:22:34 +0100
committerEven Rouault <even.rouault@spatialys.com>2018-12-30 21:48:56 +0100
commit1b1d60e83a20412aeca3e440705df820979af03b (patch)
treea96858922bc09392b5cea01750b05115f4f3afff /src/projections/stere.cpp
parentc9b32000d5fc12705bea92e6509fbedb37193012 (diff)
downloadPROJ-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/stere.cpp')
-rw-r--r--src/projections/stere.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/projections/stere.cpp b/src/projections/stere.cpp
index 1502b2a6..a26c27c2 100644
--- a/src/projections/stere.cpp
+++ b/src/projections/stere.cpp
@@ -41,8 +41,8 @@ static double ssfn_ (double phit, double sinphi, double eccen) {
}
-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<struct pj_opaque*>(P->opaque);
double coslam, sinlam, sinX = 0.0, cosX = 0.0, X, A = 0.0, sinphi;
@@ -89,8 +89,8 @@ xmul:
}
-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);
double sinphi, cosphi, coslam, sinlam;
@@ -131,8 +131,8 @@ oblcon:
}
-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 cosphi, sinphi, tp=0.0, phi_l=0.0, rho, halfe=0.0, halfpi=0.0;
int i;
@@ -181,8 +181,8 @@ static LP e_inverse (XY xy, PJ *P) { /* Ellipsoidal, inverse */
}
-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);
double c, rh, sinc, cosc;