diff options
Diffstat (limited to 'src/PJ_tmerc.c')
| -rw-r--r-- | src/PJ_tmerc.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/PJ_tmerc.c b/src/PJ_tmerc.c index 04afc64c..b3ec0030 100644 --- a/src/PJ_tmerc.c +++ b/src/PJ_tmerc.c @@ -1,4 +1,5 @@ #define PJ_LIB__ +#include <errno.h> #include <proj.h> #include "projects.h" @@ -160,26 +161,24 @@ static LP s_inverse (XY xy, PJ *P) { /* Spheroidal, inverse */ } -static void *freeup_new (PJ *P) { /* Destructor */ +static void *destructor(PJ *P, int errlev) { /* Destructor */ if (0==P) return 0; + if (0==P->opaque) - return pj_dealloc (P); + return pj_default_destructor(P, errlev); + pj_dealloc (P->opaque->en); - pj_dealloc (P->opaque); - return pj_dealloc(P); + return pj_default_destructor(P, errlev); } -static void freeup (PJ *P) { - freeup_new (P); - return; -} static PJ *setup(PJ *P) { /* general initialization */ struct pj_opaque *Q = P->opaque; if (P->es != 0.0) { if (!(Q->en = pj_enfn(P->es))) - return freeup_new(P); + return pj_default_destructor(P, ENOMEM); + Q->ml0 = pj_mlfn(P->phi0, sin(P->phi0), cos(P->phi0), Q->en); Q->esp = P->es / (1. - P->es); P->inv = e_inverse; @@ -197,8 +196,11 @@ static PJ *setup(PJ *P) { /* general initialization */ PJ *PROJECTION(tmerc) { 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; + return setup(P); } |