From 55e7cee52465a081be731175653ffbdec7763fe6 Mon Sep 17 00:00:00 2001 From: Ravi Peters Date: Thu, 29 Feb 2024 16:05:27 +0100 Subject: [PATCH 1/2] do not GDALClose(driver), this is not needed and seems to cause crashes --- src/Map3d.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Map3d.cpp b/src/Map3d.cpp index 567cf9fb..0b69edef 100644 --- a/src/Map3d.cpp +++ b/src/Map3d.cpp @@ -488,7 +488,7 @@ bool Map3d::get_postgis_output(std::string connstr, bool pdok, bool citygml) { std::cerr << "ERROR: Cannot open database '" + connstr + "' for writing" << std::endl; dataSource->RollbackTransaction(); GDALClose(dataSource); - GDALClose(driver); + // GDALClose(driver); return false; } layers.emplace(layername, layer); @@ -544,7 +544,7 @@ bool Map3d::get_postgis_output(std::string connstr, bool pdok, bool citygml) { return false; } GDALClose(dataSource); - GDALClose(driver); + // GDALClose(driver); return true; #endif } @@ -563,14 +563,14 @@ bool Map3d::get_gdal_output(std::string filename, std::string drivername, bool m if (layer == NULL) { std::cerr << "ERROR: Cannot open file '" + filename + "' for writing" << std::endl; GDALClose(layer); - GDALClose(driver); + // GDALClose(driver); return false; } for (auto& f : _lsFeatures) { f->get_shape(layer, false); } GDALClose(layer); - GDALClose(driver); + // GDALClose(driver); } else { std::unordered_map layers; @@ -604,7 +604,7 @@ void Map3d::close_gdal_resources(GDALDriver* driver, std::unordered_map Date: Thu, 29 Feb 2024 16:05:35 +0100 Subject: [PATCH 2/2] bump version --- docs/_data/sidebars/3dfier_sidebar.yml | 2 +- src/main.cpp | 2 +- vcpkg.json | 35 +++++++++++++++----------- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/docs/_data/sidebars/3dfier_sidebar.yml b/docs/_data/sidebars/3dfier_sidebar.yml index 24a55b7c..434e7662 100644 --- a/docs/_data/sidebars/3dfier_sidebar.yml +++ b/docs/_data/sidebars/3dfier_sidebar.yml @@ -3,7 +3,7 @@ entries: - title: sidebar product: 3dfier - version: v1.3.3 + version: v1.3.5 logo: 3dfierLogo.png folders: - title: diff --git a/src/main.cpp b/src/main.cpp index b159ec69..6d588bd7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -36,7 +36,7 @@ #include #include -std::string VERSION = "1.3.3"; +std::string VERSION = "1.3.5"; bool validate_yaml(const char* arg, std::set& allowedFeatures); int main(int argc, const char * argv[]); diff --git a/vcpkg.json b/vcpkg.json index 40bb4eff..9b442d15 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,16 +1,21 @@ { - "name": "3dfier", - "version-string": "1.3.2", - "dependencies": [ - "boost-program-options", - "boost-geometry", - "boost-locale", - "boost-chrono", - "boost-system", - "boost-filesystem", - "cgal", - "gdal", - "lastools", - "yaml-cpp" - ] -} \ No newline at end of file + "name": "3dfier", + "version-string": "1.3.5", + "dependencies": [ + "boost-program-options", + "boost-geometry", + "boost-locale", + "boost-chrono", + "boost-system", + "boost-filesystem", + "cgal", + "gdal", + { + "name": "libpq", + "version>=": "16.2" + }, + "lastools", + "yaml-cpp" + ], + "builtin-baseline": "3dd44b931481d7a8e9ba412621fa810232b66289" +}