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/goode.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/goode.cpp')
| -rw-r--r-- | src/projections/goode.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/projections/goode.cpp b/src/projections/goode.cpp index c716649d..fdace387 100644 --- a/src/projections/goode.cpp +++ b/src/projections/goode.cpp @@ -69,12 +69,16 @@ PJ *PROJECTION(goode) { P->destructor = destructor; P->es = 0.; - if (!(Q->sinu = pj_sinu(nullptr)) || !(Q->moll = pj_moll(nullptr))) + Q->sinu = pj_sinu(nullptr); + Q->moll = pj_moll(nullptr); + if (Q->sinu == nullptr || Q->moll == nullptr) return destructor (P, ENOMEM); Q->sinu->es = 0.; Q->sinu->ctx = P->ctx; Q->moll->ctx = P->ctx; - if (!(Q->sinu = pj_sinu(Q->sinu)) || !(Q->moll = pj_moll(Q->moll))) + Q->sinu = pj_sinu(Q->sinu); + Q->moll = pj_moll(Q->moll); + if (Q->sinu == nullptr || Q->moll == nullptr) return destructor (P, ENOMEM); P->fwd = goode_s_forward; |