diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-12-04 18:56:15 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2019-12-06 21:35:14 +0100 |
| commit | 126384854bf8e1b7461aebcc28966a6559971de1 (patch) | |
| tree | 261e7125c6d9baa2b83d95b2b4547edf095b6850 /src/proj_internal.h | |
| parent | 41ff94791abfebaf8cf2c346b4aefb4895248bf3 (diff) | |
| download | PROJ-126384854bf8e1b7461aebcc28966a6559971de1.tar.gz PROJ-126384854bf8e1b7461aebcc28966a6559971de1.zip | |
vertical grid shift: rework to no longer load whole grid into memory
Diffstat (limited to 'src/proj_internal.h')
| -rw-r--r-- | src/proj_internal.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/proj_internal.h b/src/proj_internal.h index ffa533e7..1e43e066 100644 --- a/src/proj_internal.h +++ b/src/proj_internal.h @@ -65,6 +65,7 @@ #include <vector> #include "proj.h" +#include "grids.hpp" #ifdef PROJ_API_H #error proj_internal.h must be included before proj_api.h @@ -482,8 +483,7 @@ struct PJconsts { int gridlist_count = 0; int has_geoid_vgrids = 0; /* TODO: Description needed */ - struct _pj_gi **vgridlist_geoid = nullptr; /* TODO: Description needed */ - int vgridlist_geoid_count = 0; + std::vector<std::unique_ptr<NS_PROJ::VerticalShiftGridSet>> vgrids{}; double from_greenwich = 0.0; /* prime meridian offset (in radians) */ double long_wrap_center = 0.0; /* 0.0 for -180 to 180, actually in radians*/ @@ -839,12 +839,6 @@ void nad_free(struct CTABLE *); /* higher level handling of datum grid shift files */ -int pj_apply_vgridshift( PJ *defn, const char *listname, - PJ_GRIDINFO ***gridlist_p, - int *gridlist_count_p, - int inverse, - long point_count, int point_offset, - double *x, double *y, double *z ); int pj_apply_gridshift_2( PJ *defn, int inverse, long point_count, int point_offset, double *x, double *y, double *z ); |