diff options
| author | Even Rouault <even.rouault@mines-paris.org> | 2018-12-31 11:37:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-31 11:37:51 +0100 |
| commit | 32f3ef47e55c38b0eabb6d781fee3944d3239414 (patch) | |
| tree | ba2850500ee732559bada055dbab281ceff49a22 /src/transform.cpp | |
| parent | 5c41d3a1078895ed096b416db15c91108bccad87 (diff) | |
| parent | 0e0e0e475414ddeb75e0e140d8a3381a431036d9 (diff) | |
| download | PROJ-32f3ef47e55c38b0eabb6d781fee3944d3239414.tar.gz PROJ-32f3ef47e55c38b0eabb6d781fee3944d3239414.zip | |
Merge pull request #1208 from rouault/merge_PJ_and_PJ_OBJ
Unify PJ_OBJ and PJ structures
Diffstat (limited to 'src/transform.cpp')
| -rw-r--r-- | src/transform.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/transform.cpp b/src/transform.cpp index 433fc017..486178d0 100644 --- a/src/transform.cpp +++ b/src/transform.cpp @@ -32,7 +32,7 @@ #include <string.h> #include "proj.h" -#include "projects.h" +#include "proj_internal.h" #include "geocent.h" static int adjust_axis( projCtx ctx, const char *axis, int denormalize_flag, @@ -193,8 +193,8 @@ static int geographic_to_projected (PJ *P, long n, int dist, double *x, double * for( i = 0; i < n; i++ ) { - XYZ projected_loc; - LPZ geodetic_loc; + PJ_XYZ projected_loc; + PJ_LPZ geodetic_loc; geodetic_loc.lam = x[dist*i]; geodetic_loc.phi = y[dist*i]; @@ -232,8 +232,8 @@ static int geographic_to_projected (PJ *P, long n, int dist, double *x, double * for( i = 0; i <n; i++ ) { - XY projected_loc; - LP geodetic_loc; + PJ_XY projected_loc; + PJ_LP geodetic_loc; geodetic_loc.lam = x[dist*i]; geodetic_loc.phi = y[dist*i]; @@ -303,8 +303,8 @@ static int projected_to_geographic (PJ *P, long n, int dist, double *x, double * for (i=0; i < n; i++) { - XYZ projected_loc; - LPZ geodetic_loc; + PJ_XYZ projected_loc; + PJ_LPZ geodetic_loc; projected_loc.x = x[dist*i]; projected_loc.y = y[dist*i]; @@ -343,8 +343,8 @@ static int projected_to_geographic (PJ *P, long n, int dist, double *x, double * /* Fallback to the original PROJ.4 API 2d inversion - inv */ for( i = 0; i < n; i++ ) { - XY projected_loc; - LP geodetic_loc; + PJ_XY projected_loc; + PJ_LP geodetic_loc; projected_loc.x = x[dist*i]; projected_loc.y = y[dist*i]; |