diff options
| author | Sakari Kapanen <sakari.m.kapanen@gmail.com> | 2016-11-02 23:29:59 +0300 |
|---|---|---|
| committer | Sakari Kapanen <sakari.m.kapanen@gmail.com> | 2016-11-02 23:29:59 +0300 |
| commit | 381c88ce0c71d0f0c149dc655090a9ad907b0faf (patch) | |
| tree | 1d4212e3043647059959a17760194fe41afc0f91 /xs/src/libslic3r/Surface.hpp | |
| parent | d530bdba67d2a73abd512ea5f8f69ed181620289 (diff) | |
Fix typos preventing compilation with CPPVER >= 11
Diffstat (limited to 'xs/src/libslic3r/Surface.hpp')
| -rw-r--r-- | xs/src/libslic3r/Surface.hpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xs/src/libslic3r/Surface.hpp b/xs/src/libslic3r/Surface.hpp index df6f07d3a..09bc3e5f5 100644 --- a/xs/src/libslic3r/Surface.hpp +++ b/xs/src/libslic3r/Surface.hpp @@ -99,11 +99,12 @@ inline Polygons to_polygons(const SurfacesPtr &src) #if SLIC3R_CPPVER >= 11 inline Polygons to_polygons(SurfacesPtr &&src) { + size_t num = 0; for (SurfacesPtr::const_iterator it = src.begin(); it != src.end(); ++it) num += (*it)->expolygon.holes.size() + 1; Polygons polygons; polygons.reserve(num); - for (ExPolygons::const_iterator it = src.begin(); it != src.end(); ++it) { + for (SurfacesPtr::const_iterator it = src.begin(); it != src.end(); ++it) { polygons.push_back(std::move((*it)->expolygon.contour)); for (Polygons::const_iterator ith = (*it)->expolygon.holes.begin(); ith != (*it)->expolygon.holes.end(); ++ith) { polygons.push_back(std::move(*ith)); @@ -146,7 +147,7 @@ inline void polygons_append(Polygons &dst, Surfaces &&src) dst.reserve(dst.size() + number_polygons(src)); for (Surfaces::const_iterator it = src.begin(); it != src.end(); ++ it) { dst.push_back(std::move(it->expolygon.contour)); - std::move(std::begin(it->expolygon.contour), std::end(it->expolygon.contour), std::back_inserter(dst)); + std::move(std::begin(it->expolygon.holes), std::end(it->expolygon.holes), std::back_inserter(dst)); } } #endif @@ -167,7 +168,7 @@ inline void polygons_append(Polygons &dst, SurfacesPtr &&src) dst.reserve(dst.size() + number_polygons(src)); for (SurfacesPtr::const_iterator it = src.begin(); it != src.end(); ++ it) { dst.push_back(std::move((*it)->expolygon.contour)); - std::move(std::begin((*it)->expolygon.contour), std::end((*it)->expolygon.contour), std::back_inserter(dst)); + std::move(std::begin((*it)->expolygon.holes), std::end((*it)->expolygon.holes), std::back_inserter(dst)); } } #endif |