From e6b218cf4fce2917cdf529988dc9ef9d296c17c1 Mon Sep 17 00:00:00 2001 From: Thomas Knudsen Date: Thu, 16 Nov 2017 20:01:39 +0100 Subject: Switch pj_factors to use proj_geoc_lat --- src/pj_factors.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/pj_factors.c b/src/pj_factors.c index 69d59e49..e48e8961 100644 --- a/src/pj_factors.c +++ b/src/pj_factors.c @@ -14,6 +14,7 @@ int pj_factors(LP lp, PJ *P, double h, struct FACTORS *fac) { double cosphi, t, n, r; int err; + PJ_COORD coo = {{lp.lam, lp.phi, 0, 0}}; err = proj_errno_reset (P); @@ -38,7 +39,7 @@ int pj_factors(LP lp, PJ *P, double h, struct FACTORS *fac) { /* If input latitudes are geocentric, convert to geographic */ if (P->geoc) - lp.phi = atan(P->rone_es * tan(lp.phi)); + lp = proj_geoc_lat (P, PJ_INV, coo).lp; /* If latitude + one step overshoots the pole, move it slightly inside, */ /* so the numerical derivative still exists */ -- cgit v1.2.3 From f46ba4b038e4910eef84e45b7e4c06c9f6827461 Mon Sep 17 00:00:00 2001 From: Thomas Knudsen Date: Thu, 16 Nov 2017 21:09:22 +0100 Subject: Repair non-standard aggregate initialization --- src/pj_factors.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/pj_factors.c b/src/pj_factors.c index e48e8961..3c2e97cb 100644 --- a/src/pj_factors.c +++ b/src/pj_factors.c @@ -14,7 +14,8 @@ int pj_factors(LP lp, PJ *P, double h, struct FACTORS *fac) { double cosphi, t, n, r; int err; - PJ_COORD coo = {{lp.lam, lp.phi, 0, 0}}; + PJ_COORD coo = {{0, 0, 0, 0}}; + coo.lp = lp; err = proj_errno_reset (P); -- cgit v1.2.3