aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Evers <kristianevers@gmail.com>2022-03-11 10:26:36 +0100
committerGitHub <noreply@github.com>2022-03-11 10:26:36 +0100
commitfb4f815a09f98b5581f6cac0f232035101fcce23 (patch)
tree6fcd65ff7c8e1097679fb9cb26ac64fe230c738b
parentd54cc9e44759818f3356c35c7b59f3ffaf7213db (diff)
parent9b35b53275e3ebf1986236736a5f6ffb2695db1a (diff)
downloadPROJ-fb4f815a09f98b5581f6cac0f232035101fcce23.tar.gz
PROJ-fb4f815a09f98b5581f6cac0f232035101fcce23.zip
Merge pull request #3113 from OSGeo/backport-3112-to-9.0
[Backport 9.0] DOCS: add missing functions from filemanager.cpp
-rw-r--r--docs/source/development/reference/functions.rst6
-rw-r--r--src/proj.h4
2 files changed, 8 insertions, 2 deletions
diff --git a/docs/source/development/reference/functions.rst b/docs/source/development/reference/functions.rst
index 0e3eeada..7a6b37a1 100644
--- a/docs/source/development/reference/functions.rst
+++ b/docs/source/development/reference/functions.rst
@@ -880,9 +880,15 @@ Setting custom I/O functions
.. doxygenfunction:: proj_context_set_sqlite3_vfs_name
:project: doxygen_api
+.. doxygenfunction:: proj_context_set_file_finder
+ :project: doxygen_api
+
.. doxygenfunction:: proj_context_set_search_paths
:project: doxygen_api
+.. doxygenfunction:: proj_context_set_ca_bundle_path
+ :project: doxygen_api
+
Network related functionality
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/src/proj.h b/src/proj.h
index 4b12d573..615a4d81 100644
--- a/src/proj.h
+++ b/src/proj.h
@@ -379,12 +379,12 @@ PJ_CONTEXT PROJ_DLL *proj_context_clone (PJ_CONTEXT *ctx);
/** Callback to resolve a filename to a full path */
typedef const char* (*proj_file_finder) (PJ_CONTEXT *ctx, const char*, void* user_data);
+/*! @endcond */
void PROJ_DLL proj_context_set_file_finder(PJ_CONTEXT *ctx, proj_file_finder finder, void* user_data);
-/*! @endcond */
void PROJ_DLL proj_context_set_search_paths(PJ_CONTEXT *ctx, int count_paths, const char* const* paths);
-/*! @cond Doxygen_Suppress */
void PROJ_DLL proj_context_set_ca_bundle_path(PJ_CONTEXT *ctx, const char *path);
+/*! @cond Doxygen_Suppress */
void PROJ_DLL proj_context_use_proj4_init_rules(PJ_CONTEXT *ctx, int enable);
int PROJ_DLL proj_context_get_use_proj4_init_rules(PJ_CONTEXT *ctx, int from_legacy_code_path);