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_ocea.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_ocea.c')
| -rw-r--r-- | src/PJ_ocea.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/PJ_ocea.c b/src/PJ_ocea.c index cdffd6e4..8c7bd161 100644 --- a/src/PJ_ocea.c +++ b/src/PJ_ocea.c @@ -41,16 +41,16 @@ ENTRY0(ocea) P->rok = P->a / P->k0; P->rtk = P->a * P->k0; - if ( pj_param(P->params, "talpha").i) { - alpha = pj_param(P->params, "ralpha").f; - lonz = pj_param(P->params, "rlonc").f; + if ( pj_param(P->ctx, P->params, "talpha").i) { + alpha = pj_param(P->ctx, P->params, "ralpha").f; + lonz = pj_param(P->ctx, P->params, "rlonc").f; P->singam = atan(-cos(alpha)/(-sin(phi_0) * sin(alpha))) + lonz; P->sinphi = asin(cos(phi_0) * sin(alpha)); } else { - phi_1 = pj_param(P->params, "rlat_1").f; - phi_2 = pj_param(P->params, "rlat_2").f; - lam_1 = pj_param(P->params, "rlon_1").f; - lam_2 = pj_param(P->params, "rlon_2").f; + phi_1 = pj_param(P->ctx, P->params, "rlat_1").f; + phi_2 = pj_param(P->ctx, P->params, "rlat_2").f; + lam_1 = pj_param(P->ctx, P->params, "rlon_1").f; + lam_2 = pj_param(P->ctx, P->params, "rlon_2").f; P->singam = atan2(cos(phi_1) * sin(phi_2) * cos(lam_1) - sin(phi_1) * cos(phi_2) * cos(lam_2), sin(phi_1) * cos(phi_2) * sin(lam_2) - |