diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2017-11-07 14:06:05 +0100 |
|---|---|---|
| committer | Kristian Evers <kristianevers@gmail.com> | 2017-11-07 15:53:31 +0100 |
| commit | dcd95c505ef188f268671495f7a9950c446d0e72 (patch) | |
| tree | 1e2b8f51bdc68e1c887ff91149151e272ea169cd /src | |
| parent | 7d0f1db924210fc69ba0408cb562de47b243d831 (diff) | |
| download | PROJ-dcd95c505ef188f268671495f7a9950c446d0e72.tar.gz PROJ-dcd95c505ef188f268671495f7a9950c446d0e72.zip | |
Formally change the initialization type of the TRANSFORMATIONS and CONVERSIONS that are not PROJECTIONS
Diffstat (limited to 'src')
| -rw-r--r-- | src/PJ_axisswap.c | 2 | ||||
| -rw-r--r-- | src/PJ_cart.c | 4 | ||||
| -rw-r--r-- | src/PJ_deformation.c | 2 | ||||
| -rw-r--r-- | src/PJ_hgridshift.c | 2 | ||||
| -rw-r--r-- | src/PJ_molodensky.c | 2 | ||||
| -rw-r--r-- | src/PJ_unitconvert.c | 2 | ||||
| -rw-r--r-- | src/PJ_vgridshift.c | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/src/PJ_axisswap.c b/src/PJ_axisswap.c index 84b48afe..7215b9ce 100644 --- a/src/PJ_axisswap.c +++ b/src/PJ_axisswap.c @@ -156,7 +156,7 @@ static PJ_COORD reverse_4d(PJ_COORD coo, PJ *P) { /***********************************************************************/ -PJ *PROJECTION(axisswap) { +PJ *CONVERSION(axisswap,0) { /***********************************************************************/ struct pj_opaque *Q = pj_calloc (1, sizeof (struct pj_opaque)); char *order, *s; diff --git a/src/PJ_cart.c b/src/PJ_cart.c index f5d5a062..d8f4a9b9 100644 --- a/src/PJ_cart.c +++ b/src/PJ_cart.c @@ -42,7 +42,7 @@ #define PJ_LIB__ #include "proj_internal.h" -#include <projects.h> +#include "projects.h" #include <assert.h> #include <stddef.h> #include <math.h> @@ -208,7 +208,7 @@ static LP cart_reverse (XY xy, PJ *P) { /*********************************************************************/ -PJ *PROJECTION(cart) { +PJ *CONVERSION(cart,1) { /*********************************************************************/ P->fwd3d = cartesian; P->inv3d = geodetic; diff --git a/src/PJ_deformation.c b/src/PJ_deformation.c index 74862efc..62a24683 100644 --- a/src/PJ_deformation.c +++ b/src/PJ_deformation.c @@ -222,7 +222,7 @@ static void *destructor(PJ *P, int errlev) { } -PJ *PROJECTION(deformation) { +PJ *TRANSFORMATION(deformation,1) { struct pj_opaque *Q = pj_calloc (1, sizeof (struct pj_opaque)); if (0==Q) return pj_default_destructor(P, ENOMEM); diff --git a/src/PJ_hgridshift.c b/src/PJ_hgridshift.c index 83680a45..26a2f471 100644 --- a/src/PJ_hgridshift.c +++ b/src/PJ_hgridshift.c @@ -45,7 +45,7 @@ static PJ_COORD reverse_4d (PJ_COORD obs, PJ *P) { -PJ *PROJECTION(hgridshift) { +PJ *TRANSFORMATION(hgridshift,0) { P->fwd4d = forward_4d; P->inv4d = reverse_4d; diff --git a/src/PJ_molodensky.c b/src/PJ_molodensky.c index 10ba3fb7..a35cabe4 100644 --- a/src/PJ_molodensky.c +++ b/src/PJ_molodensky.c @@ -268,7 +268,7 @@ static PJ_COORD reverse_4d(PJ_COORD obs, PJ *P) { } -PJ *PROJECTION(molodensky) { +PJ *TRANSFORMATION(molodensky,1) { struct pj_opaque_molodensky *Q = pj_calloc(1, sizeof(struct pj_opaque_molodensky)); if (0==Q) return pj_default_destructor(P, ENOMEM); diff --git a/src/PJ_unitconvert.c b/src/PJ_unitconvert.c index d8901ee0..3a70903c 100644 --- a/src/PJ_unitconvert.c +++ b/src/PJ_unitconvert.c @@ -306,7 +306,7 @@ static PJ_COORD reverse_4d(PJ_COORD obs, PJ *P) { /***********************************************************************/ -PJ *PROJECTION(unitconvert) { +PJ *CONVERSION(unitconvert,0) { /***********************************************************************/ struct pj_opaque_unitconvert *Q = pj_calloc (1, sizeof (struct pj_opaque_unitconvert)); char *s, *name; diff --git a/src/PJ_vgridshift.c b/src/PJ_vgridshift.c index 9db0b332..e3f3cbd3 100644 --- a/src/PJ_vgridshift.c +++ b/src/PJ_vgridshift.c @@ -46,7 +46,7 @@ static PJ_COORD reverse_4d(PJ_COORD obs, PJ *P) { } -PJ *PROJECTION(vgridshift) { +PJ *TRANSFORMATION(vgridshift,0) { if (!pj_param(P->ctx, P->params, "tgrids").i) { proj_log_error(P, "vgridshift: +grids parameter missing."); |