From 754f62987a8035497236e2fae24cc4e9d8d91937 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Thu, 11 Jan 2018 12:22:24 +0100 Subject: axisswap initialization: avoid switch case fallthrough case without break are really confusing, and should be avoided as much as possible IMHO. Also error out if a unrecognized character is provided as the axis value. --- src/PJ_axisswap.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src') diff --git a/src/PJ_axisswap.c b/src/PJ_axisswap.c index f7e89c33..d57834fc 100644 --- a/src/PJ_axisswap.c +++ b/src/PJ_axisswap.c @@ -211,19 +211,31 @@ PJ *CONVERSION(axisswap,0) { switch(P->axis[i]) { case 'w': Q->sign[i] = -1; + Q->axis[i] = 0; + break; case 'e': + Q->sign[i] = 1; Q->axis[i] = 0; break; case 's': Q->sign[i] = -1; + Q->axis[i] = 1; + break; case 'n': + Q->sign[i] = 1; Q->axis[i] = 1; break; case 'd': Q->sign[i] = -1; + Q->axis[i] = 2; + break; case 'u': + Q->sign[i] = 1; Q->axis[i] = 2; break; + default: + proj_log_error(P, "axisswap: unknown axis '%c'", P->axis[i]); + return pj_default_destructor(P, PJD_ERR_AXIS); } } n = 3; -- cgit v1.2.3