diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-01-09 11:56:39 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2019-01-09 12:34:40 +0100 |
| commit | 11bc4783ca2c5fed8603d0c49f5aea102eca2432 (patch) | |
| tree | 95adef15f42efa35ff8862e9c3753c6206068f87 /include | |
| parent | 96339b80be1ad3db18075e2d8d650ef121797964 (diff) | |
| download | PROJ-11bc4783ca2c5fed8603d0c49f5aea102eca2432.tar.gz PROJ-11bc4783ca2c5fed8603d0c49f5aea102eca2432.zip | |
proj.db search: use pj_find_file() mechanism instead of hand coded simplified version of it
Diffstat (limited to 'include')
| -rw-r--r-- | include/proj/io.hpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/include/proj/io.hpp b/include/proj/io.hpp index 3d09e7d3..ec3301f8 100644 --- a/include/proj/io.hpp +++ b/include/proj/io.hpp @@ -36,6 +36,8 @@ #include <utility> #include <vector> +#include "proj.h" + #include "util.hpp" NS_PROJ_START @@ -683,14 +685,11 @@ class PROJ_GCC_DLL DatabaseContext { PROJ_DLL ~DatabaseContext(); //! @endcond - PROJ_DLL static DatabaseContextNNPtr create(); - PROJ_DLL static DatabaseContextNNPtr - create(const std::string &databasePath); - - PROJ_DLL static DatabaseContextNNPtr - create(const std::string &databasePath, - const std::vector<std::string> &auxiliaryDatabasePaths); + create(const std::string &databasePath = std::string(), + const std::vector<std::string> &auxiliaryDatabasePaths = + std::vector<std::string>(), + PJ_CONTEXT *ctx = nullptr); PROJ_DLL const std::string &getPath() const; @@ -707,8 +706,6 @@ class PROJ_GCC_DLL DatabaseContext { PROJ_DLL static DatabaseContextNNPtr create(void *sqlite_handle); - PROJ_INTERNAL void attachPJContext(void *pjCtxt); - PROJ_INTERNAL bool lookForGridAlternative(const std::string &officialName, std::string &projFilename, std::string &projFormat, |