diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2010-06-11 03:26:04 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2010-06-11 03:26:04 +0000 |
| commit | cf5c8cd32ebf39f7ff24c426ac00e75a7ae34da8 (patch) | |
| tree | c7e18dad05709f747a2aaccb21da844ae6b43f24 /src/pj_factors.c | |
| parent | 02b4b8db7f5d3ce59baca4a38b8059538ccf3217 (diff) | |
| download | PROJ-cf5c8cd32ebf39f7ff24c426ac00e75a7ae34da8.tar.gz PROJ-cf5c8cd32ebf39f7ff24c426ac00e75a7ae34da8.zip | |
roll projCtx through various other low level functions
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1856 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src/pj_factors.c')
| -rw-r--r-- | src/pj_factors.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pj_factors.c b/src/pj_factors.c index 2c478a81..6a4db92e 100644 --- a/src/pj_factors.c +++ b/src/pj_factors.c @@ -13,7 +13,7 @@ pj_factors(LP lp, PJ *P, double h, struct FACTORS *fac) { /* check for forward and latitude or longitude overange */ if ((t = fabs(lp.phi)-HALFPI) > EPS || fabs(lp.lam) > 10.) { - pj_ctx_set_errno( P->ctx->last_errno, -14); + pj_ctx_set_errno( P->ctx, -14); return 1; } else { /* proceed */ errno = pj_errno = 0; @@ -72,7 +72,7 @@ pj_factors(LP lp, PJ *P, double h, struct FACTORS *fac) { fac->s = (fac->der.y_p * fac->der.x_l - fac->der.x_p * fac->der.y_l) * r / cosphi; /* meridian-parallel angle theta prime */ - fac->thetap = aasin(fac->s / (fac->h * fac->k)); + fac->thetap = aasin(P->ctx,fac->s / (fac->h * fac->k)); /* Tissot ellips axis */ t = fac->k * fac->k + fac->h * fac->h; fac->a = sqrt(t + 2. * fac->s); @@ -80,7 +80,7 @@ pj_factors(LP lp, PJ *P, double h, struct FACTORS *fac) { fac->b = 0.5 * (fac->a - t); fac->a = 0.5 * (fac->a + t); /* omega */ - fac->omega = 2. * aasin((fac->a - fac->b)/(fac->a + fac->b)); + fac->omega = 2. * aasin(P->ctx,(fac->a - fac->b)/(fac->a + fac->b)); } return 0; } |