diff options
Diffstat (limited to 'src/PJ_eqc.c')
| -rw-r--r-- | src/PJ_eqc.c | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/src/PJ_eqc.c b/src/PJ_eqc.c index 576e0e3a..4f471df1 100644 --- a/src/PJ_eqc.c +++ b/src/PJ_eqc.c @@ -1,4 +1,5 @@ #define PJ_LIB__ +#include <errno.h> #include <proj.h> #include "projects.h" @@ -32,33 +33,14 @@ static LP s_inverse (XY xy, PJ *P) { /* Spheroidal, inverse */ } -static void *freeup_new (PJ *P) { /* Destructor */ - if (0==P) - return 0; - if (0==P->opaque) - return pj_dealloc (P); - - pj_dealloc (P->opaque); - return pj_dealloc(P); -} - - -static void freeup (PJ *P) { - freeup_new (P); - return; -} - - PJ *PROJECTION(eqc) { 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; - if ((Q->rc = cos(pj_param(P->ctx, P->params, "rlat_ts").f)) <= 0.) { - proj_errno_set(P, PJD_ERR_LAT_TS_LARGER_THAN_90); - return freeup_new(P); - } + if ((Q->rc = cos(pj_param(P->ctx, P->params, "rlat_ts").f)) <= 0.) + return pj_default_destructor (P, PJD_ERR_LAT_TS_LARGER_THAN_90); P->inv = s_inverse; P->fwd = s_forward; P->es = 0.; |
