Fixed crashes due to obvious mistakes

Ultimaker · Apr 10, 2024 · 60046cd · 60046cd
1 parent dc4c4e1
commit 60046cd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/include/geometry/lines_set.h b/include/geometry/lines_set.h
@@ -110,7 +110,7 @@ class LinesSet
 
     void push_back(const LinesSet& other)
     {
-        lines_.insert(other.lines_.end(), other.lines_.begin(), other.lines_.end());
+        lines_.insert(lines_.end(), other.lines_.begin(), other.lines_.end());
     }
 
     void pop_back()
@@ -151,7 +151,7 @@ class LinesSet
 
     std::vector<LineType>::iterator erase(std::vector<LineType>::const_iterator first, std::vector<LineType>::const_iterator last)
     {
-        lines_.erase(first, last);
+        return lines_.erase(first, last);
     }
 
     LinesSet& operator=(LinesSet&& other)

diff --git a/src/geometry/shape.cpp b/src/geometry/shape.cpp
@@ -853,7 +853,7 @@ Shape Shape::removeNearSelfIntersections() const
         map_poly& wpoly = mwpoly.back();
         for (auto& path : polygon)
         {
-            wpoly.push_back(std::move(*reinterpret_cast<std::vector<mapbox::geometry::point<coord_t>>*>(&path)));
+            wpoly.push_back(std::move(*reinterpret_cast<std::vector<mapbox::geometry::point<coord_t>>*>(&path.getPoints())));
             for (auto& point : wpoly.back())
             {
                 point.x /= 4;

diff --git a/src/utils/Simplify.cpp b/src/utils/Simplify.cpp
@@ -82,9 +82,7 @@ MixedLinesSet Simplify::polyline(const MixedLinesSet& polylines) const
 
 ClosedPolyline Simplify::polyline(const ClosedPolyline& polyline) const
 {
-    assert(polyline.addClosingSegment() && "Simplify algorithm doesn't expect explicitely closed polylines");
-    constexpr bool is_closed = false;
-    return simplify(polyline, is_closed);
+    return simplify(polyline, polyline.isExplicitelyClosed());
 }
 
 OpenPolyline Simplify::polyline(const OpenPolyline& polyline) const