Merge pull request #583 from busstoptaktik/destructor

Introduce a default destructor for PJ objects

1 files changed, 11 insertions, 11 deletions

diff --git a/src/PJ_poly.c b/src/PJ_poly.c
index f5af36ac..209669c0 100644
--- a/src/PJ_poly.c
+++ b/src/PJ_poly.c
@@ -1,4 +1,5 @@
 #define PJ_LIB__
+#include <errno.h>
 #include <proj.h>
 #include "projects.h"
 
@@ -126,32 +127,31 @@ static LP s_inverse (XY xy, PJ *P) {           /* Spheroidal, inverse */
 }
 
 
-static void *freeup_new (PJ *P) {                       /* Destructor */
+static void *destructor(PJ *P, int errlev) {
     if (0==P)
         return 0;
+
     if (0==P->opaque)
-        return pj_dealloc (P);
+        return pj_default_destructor (P, errlev);
+
     if (P->opaque->en)
         pj_dealloc (P->opaque->en);
-    pj_dealloc (P->opaque);
 
-    return pj_dealloc(P);
-}
-
-static void freeup (PJ *P) {
-    freeup_new (P);
-    return;
+    return pj_default_destructor(P, errlev);
 }
 
 
 PJ *PROJECTION(poly) {
     struct pj_opaque *Q = pj_calloc (1, sizeof (struct pj_opaque));
     if (0==Q)
-        return freeup_new (P);
+        return pj_default_destructor (P, ENOMEM);
+
     P->opaque = Q;
+    P->destructor = destructor;
 
     if (P->es != 0.0) {
-        if (!(Q->en = pj_enfn(P->es))) return freeup_new(P);
+        if (!(Q->en = pj_enfn(P->es)))
+            return pj_default_destructor (P, ENOMEM);
         Q->ml0 = pj_mlfn(P->phi0, sin(P->phi0), cos(P->phi0), Q->en);
         P->inv = e_inverse;
         P->fwd = e_forward;