aboutsummaryrefslogtreecommitdiff
path: root/src/projections/misrsom.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/misrsom.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/misrsom.cpp')
-rw-r--r--src/projections/misrsom.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/projections/misrsom.cpp b/src/projections/misrsom.cpp
index 09e2d8f3..71116e1e 100644
--- a/src/projections/misrsom.cpp
+++ b/src/projections/misrsom.cpp
@@ -53,7 +53,8 @@ static void seraz0(double lam, double mult, PJ *P) {
h = sqrt((1. + Q->q * sdsq) / (1. + Q->w * sdsq)) * ((1. +
Q->w * sdsq) / (d__1 * d__1) - Q->p22 * Q->ca);
sq = sqrt(Q->xj * Q->xj + s * s);
- Q->b += fc = mult * (h * Q->xj - s * s) / sq;
+ fc = mult * (h * Q->xj - s * s) / sq;
+ Q->b += fc;
Q->a2 += fc * cos(lam + lam);
Q->a4 += fc * cos(lam * 4.);
fc = mult * s * (h + Q->xj) / sq;
@@ -89,7 +90,8 @@ static PJ_XY misrsom_e_forward (PJ_LP lp, PJ *P) { /* Ellipsoidal, forw
fac = lampp - sin(lampp) * M_HALFPI;
for (l = 50; l; --l) {
lamt = lp.lam + Q->p22 * sav;
- if (fabs(c = cos(lamt)) < TOL)
+ c = cos(lamt);
+ if (fabs(c) < TOL)
lamt -= TOL;
xlam = (P->one_es * tanphi * Q->sa + sin(lamt) * Q->ca) / c;
lamdp = atan(xlam) + fac;