aboutsummaryrefslogtreecommitdiff
path: root/src/proj_internal.h
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2022-02-12 19:04:02 +0100
committerEven Rouault <even.rouault@spatialys.com>2022-02-12 19:04:06 +0100
commit0f4509430517b5fd5f411e4c47e51971cbdafce3 (patch)
tree9f5e5e679159caa91fbcf2fae9563a15ba6a203f /src/proj_internal.h
parenta9ce8aa28f0ccf775f238b2ca1bafca0c7616bcf (diff)
downloadPROJ-0f4509430517b5fd5f411e4c47e51971cbdafce3.tar.gz
PROJ-0f4509430517b5fd5f411e4c47e51971cbdafce3.zip
proj.ini: add a 'ca_bundle_path' variable
Cf thread https://lists.osgeo.org/pipermail/gdal-dev/2022-February/thread.html#55391
Diffstat (limited to 'src/proj_internal.h')
-rw-r--r--src/proj_internal.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/proj_internal.h b/src/proj_internal.h
index 0ae90cf6..dd478932 100644
--- a/src/proj_internal.h
+++ b/src/proj_internal.h
@@ -644,7 +644,6 @@ struct projCppContext;
struct projNetworkCallbacksAndData
{
bool enabled = false;
- bool enabled_env_variable_checked = false; // whereas we have checked PROJ_NETWORK env variable
proj_network_open_cbk_type open = nullptr;
proj_network_close_cbk_type close = nullptr;
proj_network_get_header_value_cbk_type get_header_value = nullptr;
@@ -688,7 +687,6 @@ struct pj_ctx{
int use_proj4_init_rules = -1; /* -1 = unknown, 0 = no, 1 = yes */
bool forceOver = false;
int epsg_file_exists = -1; /* -1 = unknown, 0 = no, 1 = yes */
- std::string ca_bundle_path{};
std::string env_var_proj_lib{}; // content of PROJ_LIB environment variable. Use Filemanager::getProjLibEnvVar() to access
std::vector<std::string> search_paths{};
@@ -708,6 +706,7 @@ struct pj_ctx{
bool iniFileLoaded = false;
std::string endpoint{};
projNetworkCallbacksAndData networking{};
+ std::string ca_bundle_path{};
projGridChunkCache gridChunkCache{};
TMercAlgo defaultTmercAlgo = TMercAlgo::PODER_ENGSAGER; // can be overridden by content of proj.ini
// END ini file settings