diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2003-03-17 19:45:47 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2003-03-17 19:45:47 +0000 |
| commit | 058a1d2fa0594a1f6d483cdacd5701169b51670d (patch) | |
| tree | a22bd3529c3e30acf67c8e7ee9e0e4f38a518f2b /src | |
| parent | 2a88e1eb0e1ef7008b8c4786a1cc0a95cf33ec07 (diff) | |
| download | PROJ-058a1d2fa0594a1f6d483cdacd5701169b51670d.tar.gz PROJ-058a1d2fa0594a1f6d483cdacd5701169b51670d.zip | |
support '@' marker for optional grids
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1103 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src')
| -rw-r--r-- | src/pj_gridlist.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/pj_gridlist.c b/src/pj_gridlist.c index 4e5a1583..82768149 100644 --- a/src/pj_gridlist.c +++ b/src/pj_gridlist.c @@ -29,6 +29,9 @@ ****************************************************************************** * * $Log$ + * Revision 1.2 2003/03/17 19:45:47 warmerda + * support '@' marker for optional grids + * * Revision 1.1 2003/03/15 06:01:18 warmerda * New * @@ -205,8 +208,15 @@ PJ_GRIDINFO **pj_gridlist_from_nadgrids( const char *nadgrids, int *grid_count) for( s = nadgrids; *s != '\0'; ) { int end_char; + int required = 1; char name[128]; + if( *s == '@' ) + { + required = 0; + s++; + } + for( end_char = 0; s[end_char] != '\0' && s[end_char] != ','; end_char++ ) {} @@ -224,7 +234,7 @@ PJ_GRIDINFO **pj_gridlist_from_nadgrids( const char *nadgrids, int *grid_count) if( *s == ',' ) s++; - if( !pj_gridlist_merge_gridfile( name ) ) + if( !pj_gridlist_merge_gridfile( name ) && required ) { pj_errno = -38; return NULL; |