From a27c0255e7b8e6aab1b91e49fd7870d1ee4e1a80 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 15 Dec 2020 17:53:29 +0100
Subject: Remap ENOMEM from PROJ_ERR_INVALID_OP to PROJ_ERR_OTHER

---
 src/transformations/affine.cpp       | 4 ++--
 src/transformations/defmodel.cpp     | 2 +-
 src/transformations/deformation.cpp  | 2 +-
 src/transformations/helmert.cpp      | 2 +-
 src/transformations/horner.cpp       | 2 +-
 src/transformations/molodensky.cpp   | 2 +-
 src/transformations/xyzgridshift.cpp | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/transformations')

diff --git a/src/transformations/affine.cpp b/src/transformations/affine.cpp
index 39fbb615..e6a94f1e 100644
--- a/src/transformations/affine.cpp
+++ b/src/transformations/affine.cpp
@@ -176,7 +176,7 @@ static void computeReverseParameters(PJ* P)
 PJ *TRANSFORMATION(affine,0 /* no need for ellipsoid */) {
     struct pj_opaque_affine *Q = initQ();
     if (nullptr==Q)
-        return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = (void *) Q;
 
     P->fwd4d = forward_4d;
@@ -227,7 +227,7 @@ PJ *TRANSFORMATION(affine,0 /* no need for ellipsoid */) {
 PJ *TRANSFORMATION(geogoffset,0 /* no need for ellipsoid */) {
     struct pj_opaque_affine *Q = initQ();
     if (nullptr==Q)
-        return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = (void *) Q;
 
     P->fwd4d = forward_4d;
diff --git a/src/transformations/defmodel.cpp b/src/transformations/defmodel.cpp
index 2ae8aec8..0d9f6690 100644
--- a/src/transformations/defmodel.cpp
+++ b/src/transformations/defmodel.cpp
@@ -384,7 +384,7 @@ PJ *TRANSFORMATION(defmodel, 1) {
     // Pass a dummy ellipsoid definition that will be overridden just afterwards
     auto cart = proj_create(P->ctx, "+proj=cart +a=1");
     if (cart == nullptr)
-        return destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
 
     /* inherit ellipsoid definition from P to Q->cart */
     pj_inherit_ellipsoid_def(P, cart);
diff --git a/src/transformations/deformation.cpp b/src/transformations/deformation.cpp
index 56909eb2..1a04d0f5 100644
--- a/src/transformations/deformation.cpp
+++ b/src/transformations/deformation.cpp
@@ -358,7 +358,7 @@ PJ *TRANSFORMATION(deformation,1) {
     // Pass a dummy ellipsoid definition that will be overridden just afterwards
     Q->cart = proj_create(P->ctx, "+proj=cart +a=1");
     if (Q->cart == nullptr)
-        return destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
 
     /* inherit ellipsoid definition from P to Q->cart */
     pj_inherit_ellipsoid_def (P, Q->cart);
diff --git a/src/transformations/helmert.cpp b/src/transformations/helmert.cpp
index edb85355..f9bb45e0 100644
--- a/src/transformations/helmert.cpp
+++ b/src/transformations/helmert.cpp
@@ -478,7 +478,7 @@ static PJ_COORD helmert_reverse_4d (PJ_COORD point, PJ *P) {
 static PJ* init_helmert_six_parameters(PJ* P) {
     struct pj_opaque_helmert *Q = static_cast<struct pj_opaque_helmert*>(calloc (1, sizeof (struct pj_opaque_helmert)));
     if (nullptr==Q)
-        return pj_default_destructor (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = (void *) Q;
 
     /* In most cases, we work on 3D cartesian coordinates */
diff --git a/src/transformations/horner.cpp b/src/transformations/horner.cpp
index f9403d2b..7c8ad192 100644
--- a/src/transformations/horner.cpp
+++ b/src/transformations/horner.cpp
@@ -471,7 +471,7 @@ PJ *PROJECTION(horner) {
 
     Q = horner_alloc (degree, complex_polynomia);
     if (Q == nullptr)
-        return horner_freeup (P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return horner_freeup (P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = Q;
 
     if (complex_polynomia) {
diff --git a/src/transformations/molodensky.cpp b/src/transformations/molodensky.cpp
index 2d173ac6..70cf987b 100644
--- a/src/transformations/molodensky.cpp
+++ b/src/transformations/molodensky.cpp
@@ -299,7 +299,7 @@ static PJ_COORD reverse_4d(PJ_COORD obs, PJ *P) {
 PJ *TRANSFORMATION(molodensky,1) {
     struct pj_opaque_molodensky *Q = static_cast<struct pj_opaque_molodensky*>(calloc(1, sizeof(struct pj_opaque_molodensky)));
     if (nullptr==Q)
-        return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
     P->opaque = (void *) Q;
 
     P->fwd4d = forward_4d;
diff --git a/src/transformations/xyzgridshift.cpp b/src/transformations/xyzgridshift.cpp
index e11a4863..c75944ba 100644
--- a/src/transformations/xyzgridshift.cpp
+++ b/src/transformations/xyzgridshift.cpp
@@ -257,7 +257,7 @@ PJ *TRANSFORMATION(xyzgridshift,0) {
     // Pass a dummy ellipsoid definition that will be overridden just afterwards
     Q->cart = proj_create(P->ctx, "+proj=cart +a=1");
     if (Q->cart == nullptr)
-        return destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/);
+        return destructor(P, PROJ_ERR_OTHER /*ENOMEM*/);
 
     /* inherit ellipsoid definition from P to Q->cart */
     pj_inherit_ellipsoid_def (P, Q->cart);
-- 
cgit v1.2.3