aboutsummaryrefslogtreecommitdiff
path: root/src/projections/hammer.cpp
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2020-03-06 20:38:38 +0100
committerKristian Evers <kristianevers@gmail.com>2020-03-09 11:08:58 +0100
commitf830121a2f7a4d631b906e5f22f5a96dac55f084 (patch)
treeb32ba74fe3e249d9bd2eeb5e224a126cabd2c228 /src/projections/hammer.cpp
parent04f74f53962de4149aa32c35c13148268fd37cd2 (diff)
downloadPROJ-f830121a2f7a4d631b906e5f22f5a96dac55f084.tar.gz
PROJ-f830121a2f7a4d631b906e5f22f5a96dac55f084.zip
src/projections/: remove assignments in expression and multiple statements per line
Should hopefully result in no change in results, and hopefully more readable code...
Diffstat (limited to 'src/projections/hammer.cpp')
-rw-r--r--src/projections/hammer.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/projections/hammer.cpp b/src/projections/hammer.cpp
index 56bdf74e..8d6d9408 100644
--- a/src/projections/hammer.cpp
+++ b/src/projections/hammer.cpp
@@ -63,12 +63,14 @@ PJ *PROJECTION(hammer) {
P->opaque = Q;
if (pj_param(P->ctx, P->params, "tW").i) {
- if ((Q->w = fabs(pj_param(P->ctx, P->params, "dW").f)) <= 0.)
+ Q->w = fabs(pj_param(P->ctx, P->params, "dW").f);
+ if (Q->w <= 0.)
return pj_default_destructor (P, PJD_ERR_W_OR_M_ZERO_OR_LESS);
} else
Q->w = .5;
if (pj_param(P->ctx, P->params, "tM").i) {
- if ((Q->m = fabs(pj_param(P->ctx, P->params, "dM").f)) <= 0.)
+ Q->m = fabs(pj_param(P->ctx, P->params, "dM").f);
+ if (Q->m <= 0.)
return pj_default_destructor (P, PJD_ERR_W_OR_M_ZERO_OR_LESS);
} else
Q->m = 1.;