Merge pull request #2025 from rouault/projections_remove_assignments_in_expressions

src/projections/: remove assignments in expression and multiple statements per line

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);
 }