From c63f0d287020c52821da3952a569f31017d9a35a Mon Sep 17 00:00:00 2001 From: Steven James Date: Fri, 20 Oct 2023 16:18:58 -0400 Subject: [PATCH] Make actually buildable in Ubuntu. --- src/libslic3r/Emboss.cpp | 5 +++-- src/libslic3r/NSVGUtils.cpp | 3 ++- src/slic3r/GUI/IconManager.cpp | 4 ++++ src/slic3r/GUI/Jobs/EmbossJob.cpp | 1 + 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/libslic3r/Emboss.cpp b/src/libslic3r/Emboss.cpp index 0ff5ffc0ba..aeb865c98c 100644 --- a/src/libslic3r/Emboss.cpp +++ b/src/libslic3r/Emboss.cpp @@ -2,6 +2,7 @@ ///|/ ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher ///|/ +#include #include "Emboss.hpp" #include #include @@ -562,7 +563,7 @@ Duplicates collect_duplicit_indices(const ExPolygons &expoly) // initialize original index locations std::vector idx(pts.size()); - iota(idx.begin(), idx.end(), 0); + std::iota(idx.begin(), idx.end(), 0); std::sort(idx.begin(), idx.end(), [&pts](uint32_t i1, uint32_t i2) { return pts[i1] < pts[i2]; }); @@ -2218,4 +2219,4 @@ void remove_spikes(ExPolygons &expolygons, const SpikeDesc &spike_desc) remove_bad(expolygons); } -#endif // REMOVE_SPIKES \ No newline at end of file +#endif // REMOVE_SPIKES diff --git a/src/libslic3r/NSVGUtils.cpp b/src/libslic3r/NSVGUtils.cpp index 21fde6b9d0..b2ca975b30 100644 --- a/src/libslic3r/NSVGUtils.cpp +++ b/src/libslic3r/NSVGUtils.cpp @@ -7,6 +7,7 @@ #include // to_chars #include +#include #include "ClipperUtils.hpp" #include "Emboss.hpp" // heal for shape @@ -521,4 +522,4 @@ HealedExPolygons stroke_to_expolygons(const LinesPath &lines_path, const NSVGsha return Emboss::heal_polygons(result, is_non_zero, param.max_heal_iteration); } -} // namespace \ No newline at end of file +} // namespace diff --git a/src/slic3r/GUI/IconManager.cpp b/src/slic3r/GUI/IconManager.cpp index a0637189f1..aa319d016e 100644 --- a/src/slic3r/GUI/IconManager.cpp +++ b/src/slic3r/GUI/IconManager.cpp @@ -1,6 +1,10 @@ #include "IconManager.hpp" #include +#include #include +#include +#include +#include #include "nanosvg/nanosvg.h" #include "nanosvg/nanosvgrast.h" #include "libslic3r/Utils.hpp" // ScopeGuard diff --git a/src/slic3r/GUI/Jobs/EmbossJob.cpp b/src/slic3r/GUI/Jobs/EmbossJob.cpp index 3fc4616cb9..3c6902dfbb 100644 --- a/src/slic3r/GUI/Jobs/EmbossJob.cpp +++ b/src/slic3r/GUI/Jobs/EmbossJob.cpp @@ -6,6 +6,7 @@ #include #include +#include #include #include // load_obj for default mesh