aboutsummaryrefslogtreecommitdiff
path: root/src/pj_malloc.c
diff options
context:
space:
mode:
authorThomas Knudsen <busstoptaktik@users.noreply.github.com>2017-11-20 13:20:02 +0100
committerGitHub <noreply@github.com>2017-11-20 13:20:02 +0100
commit5f1522ad7652e562f98328b05d905c407bab99e9 (patch)
treef8a73c0c5eb53ef4ba05eb5fd0ca5c9f0fa5d882 /src/pj_malloc.c
parent3d6f36a2e10d103727a072d160fcf724daa871d5 (diff)
downloadPROJ-5f1522ad7652e562f98328b05d905c407bab99e9.tar.gz
PROJ-5f1522ad7652e562f98328b05d905c407bab99e9.zip
Replace pj_ell_set with reimplementation... (#675)
* Replace pj_ell_set with reimplementation supporting ellipsoid inheritance * remove unreachable code from pj_ell_set.c * Swap steps, so ellps args are read first, in accordance with historical behaviour * Add ellipsoid tests to CI targets * Reduce some optimistic tolerances OS/X appears to have a slightly off float handling, resulting in differences at the nanometer level. Switching to 10 nm.
Diffstat (limited to 'src/pj_malloc.c')
-rw-r--r--src/pj_malloc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pj_malloc.c b/src/pj_malloc.c
index c003c717..c9275074 100644
--- a/src/pj_malloc.c
+++ b/src/pj_malloc.c
@@ -103,7 +103,7 @@ void pj_dalloc(void *ptr) {
/**********************************************************************/
free(ptr);
}
-
+
/**********************************************************************/
void *pj_dealloc (void *ptr) {
@@ -150,7 +150,7 @@ void *pj_dealloc_params (projCtx ctx, paralist *start, int errlev) {
Also called from pj_init_ctx when encountering errors before the PJ
proper is allocated.
-******************************************************************************/
+******************************************************************************/
paralist *t, *n;
for (t = start; t; t = n) {
n = t->next;
@@ -177,12 +177,12 @@ void *pj_default_destructor (PJ *P, int errlev) { /* Destructor */
if (0==P)
return 0;
-
+
/* free grid lists */
pj_dealloc( P->gridlist );
pj_dealloc( P->vgridlist_geoid );
pj_dealloc( P->catalog_name );
-
+
/* 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(); */
@@ -191,7 +191,7 @@ void *pj_default_destructor (PJ *P, int errlev) { /* Destructor */
/* free the interface to Charles Karney's geodesic library */
pj_dealloc( P->geod );
-
+
/* free parameter list elements */
pj_dealloc_params (pj_get_ctx(P), P->params, errlev);