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_param.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_param.c')
| -rw-r--r-- | src/pj_param.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/pj_param.c b/src/pj_param.c index c18554a0..119006e1 100644 --- a/src/pj_param.c +++ b/src/pj_param.c @@ -34,11 +34,15 @@ pj_mkparam(char *str) { /************************************************************************/ PVALUE /* test for presence or get parameter value */ -pj_param(paralist *pl, const char *opt) { +pj_param(projCtx ctx, paralist *pl, const char *opt) { + int type; unsigned l; PVALUE value; + if( ctx == NULL ) + ctx = pj_get_default_ctx(); + type = *opt++; /* simple linear lookup */ l = strlen(opt); @@ -60,7 +64,7 @@ pj_param(paralist *pl, const char *opt) { value.f = atof(opt); break; case 'r': /* degrees input */ - value.f = dmstor(opt, 0); + value.f = dmstor_ctx(ctx, opt, 0); break; case 's': /* char string */ value.s = (char *) opt; @@ -74,7 +78,7 @@ pj_param(paralist *pl, const char *opt) { value.i = 1; break; default: - pj_errno = -8; + pj_ctx_set_errno(ctx, -8); value.i = 0; break; } |