diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-03-01 18:46:06 +0100 |
|---|---|---|
| committer | Kristian Evers <kristianevers@gmail.com> | 2019-03-01 18:46:06 +0100 |
| commit | a2aab5e44f5671d4b79deebcdea0b449354aa9c7 (patch) | |
| tree | 2ffe42831666ebca0f59aaf5b2c3dd54f4d33035 /src/open_lib.cpp | |
| parent | 5284dfd3c7d66893b6e8f23c0b18bee26aadabc3 (diff) | |
| parent | b4b7d02deaad22246d8c23507725cf31f3dc4986 (diff) | |
| download | PROJ-a2aab5e44f5671d4b79deebcdea0b449354aa9c7.tar.gz PROJ-a2aab5e44f5671d4b79deebcdea0b449354aa9c7.zip | |
Merge branch '6.0' of https://github.com/OSGeo/proj.4 into 6.0
Diffstat (limited to 'src/open_lib.cpp')
| -rw-r--r-- | src/open_lib.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/open_lib.cpp b/src/open_lib.cpp index 510704e9..a00d3d0e 100644 --- a/src/open_lib.cpp +++ b/src/open_lib.cpp @@ -194,10 +194,10 @@ pj_open_lib_ex(projCtx ctx, const char *name, const char *mode, sysname = name; /* or try to use application provided file finder */ - else if( ctx && ctx->file_finder != nullptr && (sysname = ctx->file_finder( ctx, name, ctx->file_finder_user_data )) != nullptr ) + else if( ctx->file_finder != nullptr && (sysname = ctx->file_finder( ctx, name, ctx->file_finder_user_data )) != nullptr ) ; - else if( ctx && ctx->file_finder_legacy != nullptr && (sysname = ctx->file_finder_legacy( name )) != nullptr ) + else if( ctx->file_finder_legacy != nullptr && (sysname = ctx->file_finder_legacy( name )) != nullptr ) ; /* or is environment PROJ_LIB defined */ @@ -234,7 +234,7 @@ pj_open_lib_ex(projCtx ctx, const char *name, const char *mode, } /* If none of those work and we have a search path, try it */ - if (!fid && ctx && !ctx->search_paths.empty() ) + if( !fid && !ctx->search_paths.empty() ) { for( const auto& path: ctx->search_paths ) { try { |