diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-12-15 17:53:29 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2020-12-15 17:53:29 +0100 |
| commit | a27c0255e7b8e6aab1b91e49fd7870d1ee4e1a80 (patch) | |
| tree | d1ef799526f06828328b58ce8ee92c028f723b6a /src/projections/healpix.cpp | |
| parent | b020666081223adb8a623e6b3ad2c6a3b2ce077a (diff) | |
| download | PROJ-a27c0255e7b8e6aab1b91e49fd7870d1ee4e1a80.tar.gz PROJ-a27c0255e7b8e6aab1b91e49fd7870d1ee4e1a80.zip | |
Remap ENOMEM from PROJ_ERR_INVALID_OP to PROJ_ERR_OTHER
Diffstat (limited to 'src/projections/healpix.cpp')
| -rw-r--r-- | src/projections/healpix.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/projections/healpix.cpp b/src/projections/healpix.cpp index b6863fad..0340f7dd 100644 --- a/src/projections/healpix.cpp +++ b/src/projections/healpix.cpp @@ -615,7 +615,7 @@ static PJ *destructor (PJ *P, int errlev) { /* Destructor PJ *PROJECTION(healpix) { struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque))); if (nullptr==Q) - return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/); + return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/); P->opaque = Q; P->destructor = destructor; @@ -625,7 +625,7 @@ PJ *PROJECTION(healpix) { if (P->es != 0.0) { Q->apa = pj_authset(P->es); /* For auth_lat(). */ if (nullptr==Q->apa) - return destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/); + return destructor(P, PROJ_ERR_OTHER /*ENOMEM*/); Q->qp = pj_qsfn(1.0, P->e, P->one_es); /* For auth_lat(). */ P->a = P->a*sqrt(0.5*Q->qp); /* Set P->a to authalic radius. */ pj_calc_ellipsoid_params (P, P->a, P->es); /* Ensure we have a consistent parameter set */ @@ -643,7 +643,7 @@ PJ *PROJECTION(healpix) { PJ *PROJECTION(rhealpix) { struct pj_opaque *Q = static_cast<struct pj_opaque*>(calloc (1, sizeof (struct pj_opaque))); if (nullptr==Q) - return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/); + return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/); P->opaque = Q; P->destructor = destructor; @@ -664,7 +664,7 @@ PJ *PROJECTION(rhealpix) { if (P->es != 0.0) { Q->apa = pj_authset(P->es); /* For auth_lat(). */ if (nullptr==Q->apa) - return destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/); + return destructor(P, PROJ_ERR_OTHER /*ENOMEM*/); Q->qp = pj_qsfn(1.0, P->e, P->one_es); /* For auth_lat(). */ P->a = P->a*sqrt(0.5*Q->qp); /* Set P->a to authalic radius. */ P->ra = 1.0/P->a; |