diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2010-06-11 01:51:24 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2010-06-11 01:51:24 +0000 |
| commit | ec678c07c2acb83da8a2187c541b8a2e452dec4b (patch) | |
| tree | a4c004a6e88d7330fe9d1c6ed793129831b5bdca /src/pj_ell_set.c | |
| parent | a7290836114dc82b35eceb1efcb5ecdf605d335f (diff) | |
| download | PROJ-ec678c07c2acb83da8a2187c541b8a2e452dec4b.tar.gz PROJ-ec678c07c2acb83da8a2187c541b8a2e452dec4b.zip | |
preliminary implementation of projCtx API
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1854 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src/pj_ell_set.c')
| -rw-r--r-- | src/pj_ell_set.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/pj_ell_set.c b/src/pj_ell_set.c index 56cabd4c..c0d139d7 100644 --- a/src/pj_ell_set.c +++ b/src/pj_ell_set.c @@ -7,7 +7,7 @@ #define RV4 .06944444444444444444 /* 5/72 */ #define RV6 .04243827160493827160 /* 55/1296 */ int /* initialize geographic shape parameters */ -pj_ell_set(paralist *pl, double *a, double *es) { +pj_ell_set(projCtx ctx, paralist *pl, double *a, double *es) { int i; double b=0.0, e; char *name; @@ -27,7 +27,7 @@ pj_ell_set(paralist *pl, double *a, double *es) { for (start = pl; start && start->next ; start = start->next) ; curr = start; for (i = 0; (s = pj_ellps[i].id) && strcmp(name, s) ; ++i) ; - if (!s) { pj_errno = -9; return 1; } + if (!s) { pj_ctx_set_errno( ctx, -9); return 1; } curr = curr->next = pj_mkparam(pj_ellps[i].major); curr = curr->next = pj_mkparam(pj_ellps[i].ell); } @@ -40,7 +40,7 @@ pj_ell_set(paralist *pl, double *a, double *es) { } else if (pj_param(pl, "trf").i) { /* recip flattening */ *es = pj_param(pl, "drf").f; if (!*es) { - pj_errno = -10; + pj_ctx_set_errno( ctx, -10); goto bomb; } *es = 1./ *es; @@ -76,7 +76,7 @@ pj_ell_set(paralist *pl, double *a, double *es) { tmp = sin(pj_param(pl, i ? "rR_lat_a" : "rR_lat_g").f); if (fabs(tmp) > HALFPI) { - pj_errno = -11; + pj_ctx_set_errno(ctx,-11); goto bomb; } tmp = 1. - *es * tmp * tmp; @@ -90,13 +90,13 @@ bomb: pj_dalloc(start->next); start->next = 0; } - if (pj_errno) + if (ctx->last_errno) return 1; } /* some remaining checks */ if (*es < 0.) - { pj_errno = -12; return 1; } + { pj_ctx_set_errno( ctx, -12); return 1; } if (*a <= 0.) - { pj_errno = -13; return 1; } + { pj_ctx_set_errno( ctx, -13); return 1; } return 0; } |