diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2017-02-28 01:02:25 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2017-02-28 17:02:53 +0100 |
| commit | 21d16428760469717fd25ebf9d03c286db935c66 (patch) | |
| tree | 0747dd9d46c106e11a4e85d0caaacc002f2557e9 /src/pj_phi2.c | |
| parent | 8bf1acf2692e7628c2a7b41ad53d876f9b9b09e9 (diff) | |
| download | PROJ-21d16428760469717fd25ebf9d03c286db935c66.tar.gz PROJ-21d16428760469717fd25ebf9d03c286db935c66.zip | |
Enable cppcheck and fix related mostly false-positive warnings
Diffstat (limited to 'src/pj_phi2.c')
| -rw-r--r-- | src/pj_phi2.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/pj_phi2.c b/src/pj_phi2.c index 60b36ec4..fa6d9950 100644 --- a/src/pj_phi2.c +++ b/src/pj_phi2.c @@ -6,18 +6,22 @@ double pj_phi2(projCtx ctx, double ts, double e) { - double eccnth, Phi, con, dphi; + double eccnth, Phi, con; int i; eccnth = .5 * e; Phi = M_HALFPI - 2. * atan (ts); i = N_ITER; - do { + for(;;) { + double dphi; con = e * sin (Phi); dphi = M_HALFPI - 2. * atan (ts * pow((1. - con) / (1. + con), eccnth)) - Phi; Phi += dphi; - } while ( fabs(dphi) > TOL && --i); + if( fabs(dphi) > TOL && --i ) + continue; + break; + } if (i <= 0) pj_ctx_set_errno( ctx, -18 ); return Phi; |