From 24fd96226595911eeeafa6a412bfa59d228523f7 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Mon, 22 Jan 2024 16:03:04 +0100 Subject: [PATCH 1/3] Unhandled exception CURA issue :https://github.com/Ultimaker/Cura/issues/18092 --- conanfile.py | 1 + include/utils/polygon.h | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 6c0fe885b4..251083b01f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -152,6 +152,7 @@ def generate(self): folder_dists.append("tests") if self.options.enable_benchmarks: folder_dists.append("benchmark") + folder_dists.append("stress_benchmark") for dist_folder in folder_dists: dist_path = path.join(self.build_folder, dist_folder) diff --git a/include/utils/polygon.h b/include/utils/polygon.h index 86f9a7aa22..e83c2a9275 100644 --- a/include/utils/polygon.h +++ b/include/utils/polygon.h @@ -1552,7 +1552,10 @@ class PolygonsPart : public Polygons } ConstPolygonRef outerPolygon() const { - return paths[0]; + if (! paths.empty()) + { + return paths[0]; + } } /*! From bcd8be64f2f6ed7a3be06dfd97d1a2bc693439c9 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Wed, 24 Jan 2024 11:42:44 +0100 Subject: [PATCH 2/3] Reverting 24fd96226595911eeeafa6a412bfa59d228523f7 --- include/utils/polygon.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/include/utils/polygon.h b/include/utils/polygon.h index e83c2a9275..86f9a7aa22 100644 --- a/include/utils/polygon.h +++ b/include/utils/polygon.h @@ -1552,10 +1552,7 @@ class PolygonsPart : public Polygons } ConstPolygonRef outerPolygon() const { - if (! paths.empty()) - { - return paths[0]; - } + return paths[0]; } /*! From 5c37ca54750bd41c9996aca19d2e1a7b3ea68d79 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 24 Jan 2024 15:14:36 +0100 Subject: [PATCH 3/3] Use tool requires for protobuf --- conanfile.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index 251083b01f..e73ab6fc2e 100644 --- a/conanfile.py +++ b/conanfile.py @@ -91,7 +91,8 @@ def validate(self): def build_requirements(self): self.test_requires("standardprojectsettings/[>=0.1.0]@ultimaker/stable") - self.test_requires("protobuf/3.21.9") + if self.options.enable_arcus or self.options.enable_plugins: + self.tool_requires("protobuf/3.21.9") if not self.conf.get("tools.build:skip_test", False, check_type=bool): self.test_requires("gtest/1.12.1") if self.options.enable_benchmarks: @@ -105,6 +106,8 @@ def requirements(self): self.requires(req) if self.options.get_safe("enable_sentry", False): self.requires("sentry-native/0.6.5") + if self.options.enable_arcus or self.options.enable_plugins: + self.requires("protobuf/3.21.9") self.requires("asio-grpc/2.6.0") self.requires("grpc/1.50.1") self.requires("clipper/6.4.2@ultimaker/stable") @@ -115,7 +118,6 @@ def requirements(self): self.requires("fmt/10.1.1") self.requires("range-v3/0.12.0") self.requires("neargye-semver/0.3.0") - self.requires("protobuf/3.21.9") self.requires("zlib/1.2.12") self.requires("openssl/3.2.0")