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/chamb.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/chamb.cpp')
| -rw-r--r-- | src/projections/chamb.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/projections/chamb.cpp b/src/projections/chamb.cpp index e6bac22c..36609e79 100644 --- a/src/projections/chamb.cpp +++ b/src/projections/chamb.cpp @@ -129,10 +129,14 @@ PJ *PROJECTION(chamb) { Q->beta_0 = lc(P->ctx,Q->c[0].v.r, Q->c[2].v.r, Q->c[1].v.r); Q->beta_1 = lc(P->ctx,Q->c[0].v.r, Q->c[1].v.r, Q->c[2].v.r); Q->beta_2 = M_PI - Q->beta_0; - Q->p.y = 2. * (Q->c[0].p.y = Q->c[1].p.y = Q->c[2].v.r * sin(Q->beta_0)); + Q->c[0].p.y = Q->c[2].v.r * sin(Q->beta_0); + Q->c[1].p.y = Q->c[0].p.y; + Q->p.y = 2. * Q->c[0].p.y; Q->c[2].p.y = 0.; - Q->c[0].p.x = - (Q->c[1].p.x = 0.5 * Q->c[0].v.r); - Q->p.x = Q->c[2].p.x = Q->c[0].p.x + Q->c[2].v.r * cos(Q->beta_0); + Q->c[1].p.x = 0.5 * Q->c[0].v.r; + Q->c[0].p.x = -Q->c[1].p.x; + Q->c[2].p.x = Q->c[0].p.x + Q->c[2].v.r * cos(Q->beta_0); + Q->p.x = Q->c[2].p.x; P->es = 0.; P->fwd = chamb_s_forward; |