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
committerEven Rouault <even.rouault@spatialys.com>2020-03-08 19:58:35 +0100
commit60d3df673ca224107eb63e459073fc11ab5f4f16 (patch)
tree52c871c17f0c98c90ce6415cdb79dc1e73c14f4d /src/projections/hammer.cpp
parent38ec5e662a74d40e02e38dc5dca553c3ecb04356 (diff)
downloadPROJ-60d3df673ca224107eb63e459073fc11ab5f4f16.tar.gz
PROJ-60d3df673ca224107eb63e459073fc11ab5f4f16.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.;