diff options
| author | Alan D. Snow <alansnow21@gmail.com> | 2020-08-20 10:48:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-20 17:48:40 +0200 |
| commit | bc1dcf2cd581a5c144a9c35028bd33aa9191882f (patch) | |
| tree | fede8e9f75fe796ab51c624ade530938bd28a6e2 /src/proj_internal.h | |
| parent | 2b3475c853b37b1485e92ef8cf78b02fb0db6142 (diff) | |
| download | PROJ-bc1dcf2cd581a5c144a9c35028bd33aa9191882f.tar.gz PROJ-bc1dcf2cd581a5c144a9c35028bd33aa9191882f.zip | |
projCtx_t: Copy ini file settings, proj4_init_rules, etc.. when initializing context from global (#2331)
Diffstat (limited to 'src/proj_internal.h')
| -rw-r--r-- | src/proj_internal.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/proj_internal.h b/src/proj_internal.h index 01da337b..79b1da10 100644 --- a/src/proj_internal.h +++ b/src/proj_internal.h @@ -735,22 +735,23 @@ struct projCtx_t { const char* (*file_finder) (PJ_CONTEXT *, const char*, void* user_data) = nullptr; void* file_finder_user_data = nullptr; - projNetworkCallbacksAndData networking{}; - bool defer_grid_opening = false; // set by pj_obj_create() + bool defer_grid_opening = false; // set transiently by pj_obj_create() projFileApiCallbackAndData fileApi{}; std::string custom_sqlite3_vfs_name{}; + std::string user_writable_directory{}; + // BEGIN ini file settings bool iniFileLoaded = false; std::string endpoint{}; - - std::string user_writable_directory{}; + projNetworkCallbacksAndData networking{}; projGridChunkCache gridChunkCache{}; + TMercAlgo defaultTmercAlgo = TMercAlgo::PODER_ENGSAGER; // can be overridden by content of proj.ini + // END ini file settings int projStringParserCreateFromPROJStringRecursionCounter = 0; // to avoid potential infinite recursion in PROJStringParser::createFromPROJString() int pipelineInitRecursiongCounter = 0; // to avoid potential infinite recursion in pipeline.cpp - TMercAlgo defaultTmercAlgo = TMercAlgo::PODER_ENGSAGER; // can be overridden by content of proj.ini projCtx_t() = default; projCtx_t(const projCtx_t&); |
