diff options
| -rw-r--r-- | src/ctx.cpp | 1 | ||||
| -rw-r--r-- | src/filemanager.cpp | 30 | ||||
| -rw-r--r-- | src/proj_internal.h | 2 |
3 files changed, 0 insertions, 33 deletions
diff --git a/src/ctx.cpp b/src/ctx.cpp index 8e25db2a..2093950b 100644 --- a/src/ctx.cpp +++ b/src/ctx.cpp @@ -163,7 +163,6 @@ pj_ctx::pj_ctx(const pj_ctx& other) : epsg_file_exists(other.epsg_file_exists), ca_bundle_path(other.ca_bundle_path), env_var_proj_lib(other.env_var_proj_lib), - file_finder_legacy(other.file_finder_legacy), file_finder(other.file_finder), file_finder_user_data(other.file_finder_user_data), custom_sqlite3_vfs_name(other.custom_sqlite3_vfs_name), diff --git a/src/filemanager.cpp b/src/filemanager.cpp index dbcb8ddc..b3b074a2 100644 --- a/src/filemanager.cpp +++ b/src/filemanager.cpp @@ -1418,10 +1418,6 @@ pj_open_lib_internal(PJ_CONTEXT *ctx, const char *name, const char *mode, ctx, name, ctx->file_finder_user_data)) != nullptr) ; - else if (ctx->file_finder_legacy != nullptr && - (sysname = ctx->file_finder_legacy(name)) != nullptr) - ; - /* The user has search paths set */ else if (!ctx->search_paths.empty()) { for (const auto &path : ctx->search_paths) { @@ -1796,19 +1792,6 @@ void pj_load_ini(PJ_CONTEXT *ctx) { //! @endcond /************************************************************************/ -/* pj_set_finder() */ -/************************************************************************/ - -void pj_set_finder(const char *(*new_finder)(const char *)) - -{ - auto ctx = pj_get_default_ctx(); - if (ctx) { - ctx->file_finder_legacy = new_finder; - } -} - -/************************************************************************/ /* proj_context_set_file_finder() */ /************************************************************************/ @@ -1879,19 +1862,6 @@ void proj_context_set_search_paths(PJ_CONTEXT *ctx, int count_paths, } /************************************************************************/ -/* pj_set_searchpath() */ -/* */ -/* Path control for callers that can't practically provide */ -/* pj_set_finder() style callbacks. Call with (0,NULL) as args */ -/* to clear the searchpath set. */ -/************************************************************************/ - -void pj_set_searchpath(int count, const char **path) { - proj_context_set_search_paths(nullptr, count, - const_cast<const char *const *>(path)); -} - -/************************************************************************/ /* proj_context_set_ca_bundle_path() */ /************************************************************************/ diff --git a/src/proj_internal.h b/src/proj_internal.h index 2915284c..24c9b653 100644 --- a/src/proj_internal.h +++ b/src/proj_internal.h @@ -947,8 +947,6 @@ PJ_LPZ PROJ_DLL pj_inv3d(PJ_XYZ, PJ *); void PROJ_DLL pj_clear_initcache(void); void PROJ_DLL pj_pr_list(PJ *); void PROJ_DLL pj_free(PJ *); -void PROJ_DLL pj_set_finder( const char *(*)(const char *) ); -void PROJ_DLL pj_set_searchpath ( int count, const char **path ); PJ PROJ_DLL *pj_init(int, char **); PJ PROJ_DLL *pj_init_plus(const char *); PJ PROJ_DLL *pj_init_ctx( PJ_CONTEXT *, int, char ** ); |