aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--src/pj_gridinfo.c1
-rw-r--r--src/pj_init.c2
3 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b7c5b535..72f7b757 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-05 Frank Warmerdam <warmerdam@pobox.com>
+
+ * src/pj_init.c, src/pj_gridinfo.c: Correct error handling for missing
+ grid shift files and defaults files (#116)
+
2011-06-09 Frank Warmerdam <warmerdam@pobox.com>
* src/PJ_robin.c: fix mistaken constant value (#113).
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;
}