aboutsummaryrefslogtreecommitdiff
path: root/src/projections/fouc_s.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/fouc_s.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/fouc_s.cpp')
-rw-r--r--src/projections/fouc_s.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/projections/fouc_s.cpp b/src/projections/fouc_s.cpp
index 29d6437d..c5989514 100644
--- a/src/projections/fouc_s.cpp
+++ b/src/projections/fouc_s.cpp
@@ -33,14 +33,14 @@ static PJ_XY fouc_s_s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forwa
static PJ_LP fouc_s_s_inverse (PJ_XY xy, PJ *P) { /* Spheroidal, inverse */
PJ_LP lp = {0.0,0.0};
struct pj_opaque *Q = static_cast<struct pj_opaque*>(P->opaque);
- double V;
int i;
if (Q->n != 0.0) {
lp.phi = xy.y;
for (i = MAX_ITER; i ; --i) {
- lp.phi -= V = (Q->n * lp.phi + Q->n1 * sin(lp.phi) - xy.y ) /
- (Q->n + Q->n1 * cos(lp.phi));
+ const double V = (Q->n * lp.phi + Q->n1 * sin(lp.phi) - xy.y ) /
+ (Q->n + Q->n1 * cos(lp.phi));
+ lp.phi -= V;
if (fabs(V) < LOOP_TOL)
break;
}
@@ -48,7 +48,7 @@ static PJ_LP fouc_s_s_inverse (PJ_XY xy, PJ *P) { /* Spheroidal, inver
lp.phi = xy.y < 0. ? -M_HALFPI : M_HALFPI;
} else
lp.phi = aasin(P->ctx,xy.y);
- V = cos(lp.phi);
+ const double V = cos(lp.phi);
lp.lam = xy.x * (Q->n + Q->n1 * V) / V;
return lp;
}