aboutsummaryrefslogtreecommitdiff
path: root/src/iso19111/factory.cpp
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2019-09-15 22:38:14 +0200
committerGitHub <noreply@github.com>2019-09-15 22:38:14 +0200
commit1aaca77c2aa548a7be16fc2a2a00a5ef8e867e2a (patch)
tree03bb1cb4a1b33b83ec18ef476be4e19180195b43 /src/iso19111/factory.cpp
parenteb5906bb14afba3a5a5508314cfcaa661b75d29d (diff)
parent73042b0139ccbdb86996c653b179746e5bc4de67 (diff)
downloadPROJ-1aaca77c2aa548a7be16fc2a2a00a5ef8e867e2a.tar.gz
PROJ-1aaca77c2aa548a7be16fc2a2a00a5ef8e867e2a.zip
Merge pull request #1616 from OSGeo/backport-1614-to-6.2
[Backport 6.2] Fixes related to #1597
Diffstat (limited to 'src/iso19111/factory.cpp')
-rw-r--r--src/iso19111/factory.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/iso19111/factory.cpp b/src/iso19111/factory.cpp
index 0f6790c0..60083455 100644
--- a/src/iso19111/factory.cpp
+++ b/src/iso19111/factory.cpp
@@ -1000,9 +1000,11 @@ bool DatabaseContext::lookForGridInfo(const std::string &projFilename,
if (d->pjCtxt() == nullptr) {
d->setPjCtxt(pj_get_default_ctx());
}
+ int errno_before = proj_context_errno(d->pjCtxt());
gridAvailable =
pj_find_file(d->pjCtxt(), projFilename.c_str(), &fullFilename[0],
fullFilename.size() - 1) != 0;
+ proj_context_errno_set(d->pjCtxt(), errno_before);
fullFilename.resize(strlen(fullFilename.c_str()));
auto res =