diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2015-10-27 10:32:46 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2015-10-27 10:32:46 +0100 |
| commit | caf4c9b1f2fd5be5b8924e4335f77c47f976348f (patch) | |
| tree | e620136f69e8432d06bccfaddbdfcc066d0aa7c5 /src/proj_api.h | |
| parent | f7ae30a3a9a9fa5ed36a4f937a8960a66b6b8141 (diff) | |
| parent | 757a2c8f946faccf9d094d76cb79e6ebe0006564 (diff) | |
| download | PROJ-caf4c9b1f2fd5be5b8924e4335f77c47f976348f.tar.gz PROJ-caf4c9b1f2fd5be5b8924e4335f77c47f976348f.zip | |
Merge branch 'master' of https://github.com/piyushrpt/proj.4
Conflicts:
nad/tv_out.dist
Diffstat (limited to 'src/proj_api.h')
| -rw-r--r-- | src/proj_api.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/proj_api.h b/src/proj_api.h index 9e1e49a8..e381815c 100644 --- a/src/proj_api.h +++ b/src/proj_api.h @@ -54,15 +54,20 @@ extern int pj_errno; /* global error return code */ #if !defined(PROJECTS_H) typedef struct { double u, v; } projUV; + typedef struct { double u, v, w; } projUVW; typedef void *projPJ; #define projXY projUV #define projLP projUV + #define projXYZ projUVW + #define projLPZ projUVW typedef void *projCtx; #else typedef PJ *projPJ; typedef projCtx_t *projCtx; # define projXY XY # define projLP LP +# define projXYZ XYZ +# define projLPZ LPZ #endif /* file reading api, like stdio */ @@ -80,6 +85,9 @@ typedef struct projFileAPI_t { projXY pj_fwd(projLP, projPJ); projLP pj_inv(projXY, projPJ); +projXYZ pj_fwd3d(projLPZ, projPJ); +projLPZ pj_inv3d(projXYZ, projPJ); + int pj_transform( projPJ src, projPJ dst, long point_count, int point_offset, double *x, double *y, double *z ); int pj_datum_transform( projPJ src, projPJ dst, long point_count, int point_offset, |