aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@mines-paris.org>2018-01-11 16:42:59 +0100
committerGitHub <noreply@github.com>2018-01-11 16:42:59 +0100
commit53b30f10c6e8d74a79b5d0763a53c5e1732e34b7 (patch)
treedcea8b969011a218a1def67ccb12efbd192ceb85
parent29916584ae00a16ef0974d419a89d6f12edecc12 (diff)
parent754f62987a8035497236e2fae24cc4e9d8d91937 (diff)
downloadPROJ-53b30f10c6e8d74a79b5d0763a53c5e1732e34b7.tar.gz
PROJ-53b30f10c6e8d74a79b5d0763a53c5e1732e34b7.zip
Merge pull request #737 from rouault/axisswap_add_break
axisswap initialization: avoid switch case fallthrough
-rw-r--r--src/PJ_axisswap.c12
1 files changed, 12 insertions, 0 deletions
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;