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/conversions | |
| 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/conversions')
| -rw-r--r-- | src/conversions/axisswap.cpp | 2 | ||||
| -rw-r--r-- | src/conversions/set.cpp | 2 | ||||
| -rw-r--r-- | src/conversions/topocentric.cpp | 4 | ||||
| -rw-r--r-- | src/conversions/unitconvert.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/conversions/axisswap.cpp b/src/conversions/axisswap.cpp index 33d0937c..682f74ef 100644 --- a/src/conversions/axisswap.cpp +++ b/src/conversions/axisswap.cpp @@ -174,7 +174,7 @@ PJ *CONVERSION(axisswap,0) { unsigned int i, j, n = 0; 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; diff --git a/src/conversions/set.cpp b/src/conversions/set.cpp index 3db6db10..fa8c3eb7 100644 --- a/src/conversions/set.cpp +++ b/src/conversions/set.cpp @@ -42,7 +42,7 @@ PJ *OPERATION(set, 0) { auto set = static_cast<struct Set*>(calloc (1, sizeof(struct Set))); P->opaque = set; if (nullptr==P->opaque) - return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/); + return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/); if (pj_param_exists(P->params, "v_1")) { diff --git a/src/conversions/topocentric.cpp b/src/conversions/topocentric.cpp index 88119efa..bbe52400 100644 --- a/src/conversions/topocentric.cpp +++ b/src/conversions/topocentric.cpp @@ -78,7 +78,7 @@ PJ *CONVERSION(topocentric,1) { /*********************************************************************/ 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 = static_cast<void *>(Q); // The topocentric origin can be specified either in geocentric coordinates @@ -120,7 +120,7 @@ PJ *CONVERSION(topocentric,1) { // Pass a dummy ellipsoid definition that will be overridden just afterwards PJ* cart = proj_create(P->ctx, "+proj=cart +a=1"); if (cart == nullptr) - return pj_default_destructor(P, PROJ_ERR_INVALID_OP /*ENOMEM*/); + return pj_default_destructor(P, PROJ_ERR_OTHER /*ENOMEM*/); /* inherit ellipsoid definition from P to cart */ pj_inherit_ellipsoid_def (P, cart); diff --git a/src/conversions/unitconvert.cpp b/src/conversions/unitconvert.cpp index 58a60c37..187acf17 100644 --- a/src/conversions/unitconvert.cpp +++ b/src/conversions/unitconvert.cpp @@ -443,7 +443,7 @@ PJ *CONVERSION(unitconvert,0) { int z_out_is_linear = -1; /* unknown */ 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; |