diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2020-03-09 10:25:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-09 10:25:08 +0100 |
| commit | 46c47e9adf6376ae06afabe5d24a0016a05ced82 (patch) | |
| tree | 52c871c17f0c98c90ce6415cdb79dc1e73c14f4d /src/projections/hammer.cpp | |
| parent | 38ec5e662a74d40e02e38dc5dca553c3ecb04356 (diff) | |
| parent | 60d3df673ca224107eb63e459073fc11ab5f4f16 (diff) | |
| download | PROJ-46c47e9adf6376ae06afabe5d24a0016a05ced82.tar.gz PROJ-46c47e9adf6376ae06afabe5d24a0016a05ced82.zip | |
Merge pull request #2025 from rouault/projections_remove_assignments_in_expressions
src/projections/: remove assignments in expression and multiple statements per line
Diffstat (limited to 'src/projections/hammer.cpp')
| -rw-r--r-- | src/projections/hammer.cpp | 6 |
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.; |