diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-03-10 21:52:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-10 21:52:59 +0100 |
| commit | 1aa66623994c685ad7359fa38ed08e46aa85a960 (patch) | |
| tree | 3adbbfa941e81127567cb9b76505ae949d5ff033 /src | |
| parent | ad1732b5e4d3ba1652f8f8b154d62fa8bd7f28c1 (diff) | |
| parent | 9d3fabcf8d218c4b720efb6c476055ce78dc8fae (diff) | |
| download | PROJ-1aa66623994c685ad7359fa38ed08e46aa85a960.tar.gz PROJ-1aa66623994c685ad7359fa38ed08e46aa85a960.zip | |
Merge pull request #2045 from PROJ-BOT/backport-2026-to-7.0
[Backport 7.0] utm/ups: make sure to set errno to PJD_ERR_ELLIPSOID_USE_REQUIRED if es==0
Diffstat (limited to 'src')
| -rw-r--r-- | src/projections/stere.cpp | 5 | ||||
| -rw-r--r-- | src/projections/tmerc.cpp | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/projections/stere.cpp b/src/projections/stere.cpp index d95bb7fa..abc4aa13 100644 --- a/src/projections/stere.cpp +++ b/src/projections/stere.cpp @@ -5,7 +5,7 @@ #include <math.h> PROJ_HEAD(stere, "Stereographic") "\n\tAzi, Sph&Ell\n\tlat_ts="; -PROJ_HEAD(ups, "Universal Polar Stereographic") "\n\tAzi, Sph&Ell\n\tsouth"; +PROJ_HEAD(ups, "Universal Polar Stereographic") "\n\tAzi, Ell\n\tsouth"; namespace { // anonymous namespace @@ -320,8 +320,7 @@ PJ *PROJECTION(ups) { /* International Ellipsoid */ P->phi0 = pj_param(P->ctx, P->params, "bsouth").i ? - M_HALFPI: M_HALFPI; if (P->es == 0.0) { - proj_errno_set(P, PJD_ERR_ELLIPSOID_USE_REQUIRED); - return pj_default_destructor (P, ENOMEM); + return pj_default_destructor (P, PJD_ERR_ELLIPSOID_USE_REQUIRED); } P->k0 = .994; P->x0 = 2000000.; diff --git a/src/projections/tmerc.cpp b/src/projections/tmerc.cpp index 4b2a96f0..eda1f23d 100644 --- a/src/projections/tmerc.cpp +++ b/src/projections/tmerc.cpp @@ -22,7 +22,7 @@ PROJ_HEAD(tmerc, "Transverse Mercator") "\n\tCyl, Sph&Ell\n\tapprox"; PROJ_HEAD(etmerc, "Extended Transverse Mercator") "\n\tCyl, Sph"; -PROJ_HEAD(utm, "Universal Transverse Mercator (UTM)") "\n\tCyl, Sph\n\tzone= south approx"; +PROJ_HEAD(utm, "Universal Transverse Mercator (UTM)") "\n\tCyl, Ell\n\tzone= south approx"; namespace { // anonymous namespace struct pj_opaque_approx { @@ -541,8 +541,7 @@ PJ *PROJECTION(etmerc) { PJ *PROJECTION(utm) { long zone; if (P->es == 0.0) { - proj_errno_set(P, PJD_ERR_ELLIPSOID_USE_REQUIRED); - return pj_default_destructor(P, ENOMEM); + return pj_default_destructor(P, PJD_ERR_ELLIPSOID_USE_REQUIRED); } if (P->lam0 < -1000.0 || P->lam0 > 1000.0) { return pj_default_destructor(P, PJD_ERR_INVALID_UTM_ZONE); |