aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFrank Warmerdam <warmerdam@pobox.com>2011-07-06 01:41:00 +0000
committerFrank Warmerdam <warmerdam@pobox.com>2011-07-06 01:41:00 +0000
commit9ca4c109aee5f1c32ffe91228b265342c8a0e661 (patch)
tree081d880a7deadf99d0056b62fc4a55cc5a1bc390 /src
parentfeb5f32df0fe91fb741c219f78092c7ff76037ce (diff)
downloadPROJ-9ca4c109aee5f1c32ffe91228b265342c8a0e661.tar.gz
PROJ-9ca4c109aee5f1c32ffe91228b265342c8a0e661.zip
adjust error handling for missing grid shift files (#116)
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2067 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src')
-rw-r--r--src/pj_gridinfo.c1
-rw-r--r--src/pj_init.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/pj_gridinfo.c b/src/pj_gridinfo.c
index 9b49d099..34e65fb2 100644
--- a/src/pj_gridinfo.c
+++ b/src/pj_gridinfo.c
@@ -769,6 +769,7 @@ PJ_GRIDINFO *pj_gridinfo_init( projCtx ctx, const char *gridname )
/* -------------------------------------------------------------------- */
strcpy(fname, gridname);
if (!(fp = pj_open_lib(ctx, fname, "rb"))) {
+ ctx->last_errno = 0; /* don't treat as a persistent error */
return gilist;
}
diff --git a/src/pj_init.c b/src/pj_init.c
index 8d52debd..108faf2f 100644
--- a/src/pj_init.c
+++ b/src/pj_init.c
@@ -95,6 +95,8 @@ get_defaults(projCtx ctx, paralist **start, paralist *next, char *name) {
}
if (errno)
errno = 0; /* don't care if can't open file */
+ ctx->last_errno = 0;
+
return next;
}