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/somerc.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/somerc.cpp')
| -rw-r--r-- | src/projections/somerc.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/projections/somerc.cpp b/src/projections/somerc.cpp index be1f660d..fe6477fa 100644 --- a/src/projections/somerc.cpp +++ b/src/projections/somerc.cpp @@ -82,7 +82,9 @@ PJ *PROJECTION(somerc) { cp *= cp; Q->c = sqrt (1 + P->es * cp * cp * P->rone_es); sp = sin (P->phi0); - Q->cosp0 = cos( phip0 = aasin (P->ctx, Q->sinp0 = sp / Q->c) ); + Q->sinp0 = sp / Q->c; + phip0 = aasin (P->ctx, Q->sinp0); + Q->cosp0 = cos(phip0); sp *= P->e; Q->K = log (tan (M_FORTPI + 0.5 * phip0)) - Q->c * ( log (tan (M_FORTPI + 0.5 * P->phi0)) - Q->hlf_e * |
