From 916a92062ffa2f2b59007047fae2176bbb463ca3 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Fri, 6 Dec 2019 14:07:27 +0100 Subject: Remove hgrids and vgrids member from PJ structure, and store them in hgridshift/vgridshift/deformation structures --- src/malloc.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/malloc.cpp') 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(P->hgrids_legacy); + delete static_cast(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(); */ -- cgit v1.2.3