aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Karney <charles.karney@sri.com>2020-10-26 14:57:52 -0400
committerCharles Karney <charles.karney@sri.com>2020-10-26 14:57:52 -0400
commit6c2363e88f8eb86e1331b3dc5f05897436ad9c43 (patch)
tree53f8b1327bbbfe537c2b97a1c597605422e6e7ca
parent1b484f853061e8577d95205f27e1ebbdbf80ec47 (diff)
downloadPROJ-6c2363e88f8eb86e1331b3dc5f05897436ad9c43.tar.gz
PROJ-6c2363e88f8eb86e1331b3dc5f05897436ad9c43.zip
phi2.cpp: remove unused static consts + minor code tweak
-rw-r--r--src/phi2.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/phi2.cpp b/src/phi2.cpp
index 6e810240..c60ca055 100644
--- a/src/phi2.cpp
+++ b/src/phi2.cpp
@@ -7,9 +7,6 @@
#include "proj.h"
#include "proj_internal.h"
-static const double TOL = 1.0e-10;
-static const int N_ITER = 15;
-
double pj_sinhpsi2tanphi(projCtx ctx, const double taup, const double e) {
/****************************************************************************
* Convert tau' = sinh(psi) = tan(chi) to tau = tan(phi). The code is taken
@@ -97,7 +94,7 @@ double pj_sinhpsi2tanphi(projCtx ctx, const double taup, const double e) {
sig = sinh( e * atanh(e * tau / tau1) ),
taupa = sqrt(1 + sig * sig) * tau - sig * tau1,
dtau = (taup - taupa) * (1 + e2m * tau * tau) /
- ( e2m * sqrt(1 + tau * tau) * sqrt(1 + taupa * taupa) );
+ ( e2m * tau1 * sqrt(1 + taupa * taupa) );
tau += dtau;
if (!(fabs(dtau) >= stol))
break;