Np 208 various fixes (#2127)

conanfile.py

@@ -125,7 +125,7 @@ def requirements(self):
             self.requires("protobuf/3.21.12")
         self.requires("clipper/6.4.2@ultimaker/stable")
         self.requires("boost/1.82.0")
-        self.requires("rapidjson/1.1.0")
+        self.requires("rapidjson/cci.20230929")
         self.requires("stb/20200203")
         self.requires("spdlog/1.12.0")
         self.requires("fmt/10.1.1")

include/utils/ExtrusionLine.h

@@ -5,6 +5,8 @@
 #ifndef UTILS_EXTRUSION_LINE_H
 #define UTILS_EXTRUSION_LINE_H
 
+#include <algorithm>
+
 #include <range/v3/view/enumerate.hpp>
 #include <range/v3/view/reverse.hpp>
 #include <range/v3/view/sliding.hpp>

src/geometry/PartsView.cpp

@@ -3,6 +3,9 @@
 
 #include "geometry/PartsView.h"
 
+#include <algorithm>
+#include <vector>
+
 #include "geometry/Polygon.h"
 #include "geometry/SingleShape.h"
 

src/geometry/Polyline.cpp

@@ -3,6 +3,7 @@
 
 #include "geometry/Polyline.h"
 
+#include <algorithm>
 #include <numbers>
 #include <numeric>
 
@@ -104,10 +105,7 @@ Polyline::const_segments_iterator Polyline::endSegments() const
     {
         return const_segments_iterator(end(), begin(), end());
     }
-    else
-    {
-        return const_segments_iterator(size() > 1 ? std::prev(end()) : end(), begin(), end());
-    }
+    return const_segments_iterator(size() > 1 ? std::prev(end()) : end(), begin(), end());
 }
 
 Polyline::segments_iterator Polyline::beginSegments()
@@ -121,10 +119,7 @@ Polyline::segments_iterator Polyline::endSegments()
     {
         return segments_iterator(end(), begin(), end());
     }
-    else
-    {
-        return segments_iterator(size() > 1 ? std::prev(end()) : end(), begin(), end());
-    }
+    return segments_iterator(size() > 1 ? std::prev(end()) : end(), begin(), end());
 }
 
 coord_t Polyline::length() const

src/infill/ZigzagConnectorProcessor.cpp

@@ -3,6 +3,7 @@
 
 #include "infill/ZigzagConnectorProcessor.h"
 
+#include <algorithm>
 #include <cassert>
 
 #include "geometry/OpenPolyline.h"
@@ -93,17 +94,14 @@ bool ZigzagConnectorProcessor::handleConnectorTooCloseToSegment(const coord_t sc
     {
         return false;
     }
-    else
-    {
-        return std::find_if(
-                   current_connector_.begin(),
-                   current_connector_.end(),
-                   [scanline_x, min_distance_to_scanline](const Point2LL& point)
-                   {
-                       return std::abs(point.X - scanline_x) >= min_distance_to_scanline;
-                   })
-            == current_connector_.end();
-    }
+    return std::find_if(
+               current_connector_.begin(),
+               current_connector_.end(),
+               [scanline_x, min_distance_to_scanline](const Point2LL& point)
+               {
+                   return std::abs(point.X - scanline_x) >= min_distance_to_scanline;
+               })
+        == current_connector_.end();
 }
 
 void ZigzagConnectorProcessor::registerScanlineSegmentIntersection(const Point2LL& intersection, int scanline_index, coord_t min_distance_to_scanline)

src/utils/AABB.cpp

@@ -3,6 +3,7 @@
 
 #include "utils/AABB.h"
 
+#include <algorithm>
 #include <limits>
 
 #include "geometry/Polygon.h"