3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-22 22:24:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed compiler warnings

Browse source
This commit is contained in:
Vojtech Bubnik 2021-06-20 16:39:10 +02:00
parent 0d70a2be69
commit d291bb397b
4 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libslic3r/TriangleMeshSlicer.cpp
View file

@ -405,7 +405,7 @@ void slice_facet_with_slabs(
assert(min_layer == zs.end() ? max_layer == zs.end() : *min_layer >= min_z); assert(min_layer == zs.end() ? max_layer == zs.end() : *min_layer >= min_z);
assert(max_layer == zs.end() || *max_layer > max_z); assert(max_layer == zs.end() || *max_layer > max_z);
auto emit_slab_edge = [&lines, &lines_mutex, num_edges](IntersectionLine il, size_t slab_id, bool reverse) { auto emit_slab_edge = [&lines, &lines_mutex](IntersectionLine il, size_t slab_id, bool reverse) {
if (reverse) if (reverse)
il.reverse(); il.reverse();
boost::lock_guard<std::mutex> l(lines_mutex[(slab_id + 32) >> 6]); boost::lock_guard<std::mutex> l(lines_mutex[(slab_id + 32) >> 6]);

3
src/libslic3r/TriangleSelector.cpp
View file

@ -1224,7 +1224,8 @@ bool TriangleSelector::has_facets(const std::pair<std::vector<std::pair<int, int
std::vector<int> parents_children; std::vector<int> parents_children;
parents_children.reserve(64); parents_children.reserve(64);
for (auto [triangle_id, ibit] : data.first) { for (const std::pair<int, int> &triangle_id_and_ibit : data.first) {
int ibit = triangle_id_and_ibit.second;
assert(ibit < data.second.size()); assert(ibit < data.second.size());
auto next_nibble = [&data, &ibit = ibit]() { auto next_nibble = [&data, &ibit = ibit]() {
int n = 0; int n = 0;

2
src/slic3r/GUI/3DScene.hpp
View file

@ -202,8 +202,6 @@ public:
vertices_and_normals_interleaved_size = 0; vertices_and_normals_interleaved_size = 0;
triangle_indices_size = 0; triangle_indices_size = 0;
quad_indices_size = 0; quad_indices_size = 0;
static const float min = std::numeric_limits<float>::lowest();
static const float max = std::numeric_limits<float>::max();
m_bounding_box.setEmpty(); m_bounding_box.setEmpty();
} }

2
src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
View file

@ -458,7 +458,7 @@ void TriangleSelectorMmuGui::render(ImGuiWrapper *imgui)
GLIndexedVertexArray *iva = nullptr; GLIndexedVertexArray *iva = nullptr;
if (tr.is_selected_by_seed_fill()) if (tr.is_selected_by_seed_fill())
iva = &m_iva_seed_fill; iva = &m_iva_seed_fill;
else if (int color = int(tr.get_state()); color < m_iva_colors.size()) else if (int color = int(tr.get_state()); color < int(m_iva_colors.size()))
iva = &m_iva_colors[color]; iva = &m_iva_colors[color];
if (iva) { if (iva) {
if (iva->vertices_and_normals_interleaved.size() + 18 > iva->vertices_and_normals_interleaved.capacity()) if (iva->vertices_and_normals_interleaved.size() + 18 > iva->vertices_and_normals_interleaved.capacity())