aboutsummaryrefslogtreecommitdiff
path: root/src/projections/igh.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/igh.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/igh.cpp')
-rw-r--r--src/projections/igh.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/projections/igh.cpp b/src/projections/igh.cpp
index e3576861..1e1cdb01 100644
--- a/src/projections/igh.cpp
+++ b/src/projections/igh.cpp
@@ -3,6 +3,7 @@
#include <errno.h>
#include <math.h>
+#include "proj.h"
#include "projects.h"
PROJ_HEAD(igh, "Interrupted Goode Homolosine") "\n\tPCyl, Sph";
@@ -40,8 +41,8 @@ struct pj_opaque {
} // anonymous namespace
-static XY s_forward (LP lp, PJ *P) { /* Spheroidal, forward */
- XY xy;
+static PJ_XY s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward */
+ PJ_XY xy;
struct pj_opaque *Q = static_cast<struct pj_opaque*>(P->opaque);
int z;
@@ -73,8 +74,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);
const double y90 = Q->dy0 + sqrt(2); /* lt=90 corresponds to y=y0+sqrt(2) */
@@ -184,8 +185,8 @@ static PJ *destructor (PJ *P, int errlev) {
PJ *PROJECTION(igh) {
- XY xy1, xy3;
- LP lp = { 0, d4044118 };
+ PJ_XY xy1, xy3;
+ PJ_LP lp = { 0, d4044118 };
struct pj_opaque *Q = static_cast<struct pj_opaque*>(pj_calloc (1, sizeof (struct pj_opaque)));
if (nullptr==Q)
return pj_default_destructor (P, ENOMEM);