diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-03-06 20:38:38 +0100 |
|---|---|---|
| committer | Kristian Evers <kristianevers@gmail.com> | 2020-03-09 11:08:58 +0100 |
| commit | f830121a2f7a4d631b906e5f22f5a96dac55f084 (patch) | |
| tree | b32ba74fe3e249d9bd2eeb5e224a126cabd2c228 /src/projections/collg.cpp | |
| parent | 04f74f53962de4149aa32c35c13148268fd37cd2 (diff) | |
| download | PROJ-f830121a2f7a4d631b906e5f22f5a96dac55f084.tar.gz PROJ-f830121a2f7a4d631b906e5f22f5a96dac55f084.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/collg.cpp')
| -rw-r--r-- | src/projections/collg.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/projections/collg.cpp b/src/projections/collg.cpp index 40319a51..1b9d2da7 100644 --- a/src/projections/collg.cpp +++ b/src/projections/collg.cpp @@ -14,7 +14,8 @@ PROJ_HEAD(collg, "Collignon") "\n\tPCyl, Sph"; static PJ_XY collg_s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward */ PJ_XY xy = {0.0,0.0}; (void) P; - if ((xy.y = 1. - sin(lp.phi)) <= 0.) + xy.y = 1. - sin(lp.phi); + if (xy.y <= 0.) xy.y = 0.; else xy.y = sqrt(xy.y); @@ -27,7 +28,8 @@ static PJ_XY collg_s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forwar static PJ_LP collg_s_inverse (PJ_XY xy, PJ *P) { /* Spheroidal, inverse */ PJ_LP lp = {0.0,0.0}; lp.phi = xy.y / FYC - 1.; - if (fabs(lp.phi = 1. - lp.phi * lp.phi) < 1.) + lp.phi = 1. - lp.phi * lp.phi; + if (fabs(lp.phi) < 1.) lp.phi = asin(lp.phi); else if (fabs(lp.phi) > ONEEPS) { proj_errno_set(P, PJD_ERR_TOLERANCE_CONDITION); @@ -36,7 +38,8 @@ static PJ_LP collg_s_inverse (PJ_XY xy, PJ *P) { /* Spheroidal, invers lp.phi = lp.phi < 0. ? -M_HALFPI : M_HALFPI; } - if ((lp.lam = 1. - sin(lp.phi)) <= 0.) + lp.lam = 1. - sin(lp.phi); + if (lp.lam <= 0.) lp.lam = 0.; else lp.lam = xy.x / (FXC * sqrt(lp.lam)); |