diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-12-06 14:07:27 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2019-12-06 21:35:15 +0100 |
| commit | 916a92062ffa2f2b59007047fae2176bbb463ca3 (patch) | |
| tree | 0c9af22bd14db3cc0c56d1f5450a6f544c5d4f91 /src/malloc.cpp | |
| parent | 6875ef7116b9dab4021afeb06e2b79cd5679743b (diff) | |
| download | PROJ-916a92062ffa2f2b59007047fae2176bbb463ca3.tar.gz PROJ-916a92062ffa2f2b59007047fae2176bbb463ca3.zip | |
Remove hgrids and vgrids member from PJ structure, and store them in hgridshift/vgridshift/deformation structures
Diffstat (limited to 'src/malloc.cpp')
| -rw-r--r-- | src/malloc.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/malloc.cpp b/src/malloc.cpp index b5fe76fc..3fd3699f 100644 --- a/src/malloc.cpp +++ b/src/malloc.cpp @@ -48,6 +48,9 @@ #include "proj.h" #include "proj_internal.h" +#include "grids.hpp" + +using namespace NS_PROJ; /**********************************************************************/ void *pj_malloc(size_t size) { @@ -225,6 +228,9 @@ PJ *pj_default_destructor (PJ *P, int errlev) { /* Destructor */ pj_dealloc(P->def_spherification); pj_dealloc(P->def_ellps); + delete static_cast<ListOfHGrids*>(P->hgrids_legacy); + delete static_cast<ListOfVGrids*>(P->vgrids_legacy); + /* We used to call pj_dalloc( P->catalog ), but this will leak */ /* memory. The safe way to clear catalog and grid is to call */ /* pj_gc_unloadall(pj_get_default_ctx()); and pj_deallocate_grids(); */ |