aboutsummaryrefslogtreecommitdiff
path: root/src/projections/nell.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/nell.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/nell.cpp')
-rw-r--r--src/projections/nell.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/projections/nell.cpp b/src/projections/nell.cpp
index 63a0eec1..faa63e59 100644
--- a/src/projections/nell.cpp
+++ b/src/projections/nell.cpp
@@ -13,16 +13,16 @@ PROJ_HEAD(nell, "Nell") "\n\tPCyl, Sph";
static PJ_XY nell_s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward */
PJ_XY xy = {0.0,0.0};
- double k, V;
int i;
(void) P;
- k = 2. * sin(lp.phi);
- V = lp.phi * lp.phi;
- lp.phi *= 1.00371 + V * (-0.0935382 + V * -0.011412);
+ const double k = 2. * sin(lp.phi);
+ const double phi_pow_2 = lp.phi * lp.phi;
+ lp.phi *= 1.00371 + phi_pow_2 * (-0.0935382 + phi_pow_2 * -0.011412);
for (i = MAX_ITER; i ; --i) {
- lp.phi -= V = (lp.phi + sin(lp.phi) - k) /
- (1. + cos(lp.phi));
+ const double V = (lp.phi + sin(lp.phi) - k) /
+ (1. + cos(lp.phi));
+ lp.phi -= V;
if (fabs(V) < LOOP_TOL)
break;
}