aboutsummaryrefslogtreecommitdiff
path: root/src/projections/august.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/august.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/august.cpp')
-rw-r--r--src/projections/august.cpp25
1 files changed, 14 insertions, 11 deletions
diff --git a/src/projections/august.cpp b/src/projections/august.cpp
index 2104c3cc..049c6d90 100644
--- a/src/projections/august.cpp
+++ b/src/projections/august.cpp
@@ -11,17 +11,20 @@ PROJ_HEAD(august, "August Epicycloidal") "\n\tMisc Sph, no inv";
static PJ_XY august_s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward */
PJ_XY xy = {0.0,0.0};
- double t, c1, c, x1, x12, y1, y12;
- (void) P;
-
- t = tan(.5 * lp.phi);
- c1 = sqrt(1. - t * t);
- c = 1. + c1 * cos(lp.lam *= .5);
- x1 = sin(lp.lam) * c1 / c;
- y1 = t / c;
- xy.x = M * x1 * (3. + (x12 = x1 * x1) - 3. * (y12 = y1 * y1));
- xy.y = M * y1 * (3. + 3. * x12 - y12);
- return (xy);
+ double t, c1, c, x1, x12, y1, y12;
+ (void) P;
+
+ t = tan(.5 * lp.phi);
+ c1 = sqrt(1. - t * t);
+ lp.lam *= .5;
+ c = 1. + c1 * cos(lp.lam);
+ x1 = sin(lp.lam) * c1 / c;
+ y1 = t / c;
+ x12 = x1 * x1;
+ y12 = y1 * y1;
+ xy.x = M * x1 * (3. + x12 - 3. * y12);
+ xy.y = M * y1 * (3. + 3. * x12 - y12);
+ return (xy);
}