3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-30 20:21:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix compiler warnings and failing compilation on macOS

Browse source
This commit is contained in:
Lukáš Hejl 2020-09-10 22:57:58 +02:00
parent 7ef5def077
commit 137e7a0712
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/libslic3r/Fill/FillAdaptive.cpp
View file

@ -435,7 +435,7 @@ std::unique_ptr<FillAdaptive_Internal::Octree> FillSupportCubic::build_octree(
auto octree = std::make_unique<Octree>(std::make_unique<Cube>(cube_center), cube_center, cubes_properties); auto octree = std::make_unique<Octree>(std::make_unique<Cube>(cube_center), cube_center, cubes_properties);
double cube_edge_length = line_spacing / 2.0; double cube_edge_length = line_spacing / 2.0;
size_t max_depth = octree->cubes_properties.size() - 1; int max_depth = int(octree->cubes_properties.size()) - 1;
BoundingBoxf3 mesh_bb = triangle_mesh.bounding_box(); BoundingBoxf3 mesh_bb = triangle_mesh.bounding_box();
Vec3f vertical(0, 0, 1); Vec3f vertical(0, 0, 1);
@ -462,13 +462,13 @@ std::unique_ptr<FillAdaptive_Internal::Octree> FillSupportCubic::build_octree(
Vec3d triangle_end_relative = triangle_bb.max - mesh_bb.min; Vec3d triangle_end_relative = triangle_bb.max - mesh_bb.min;
Vec3crd triangle_start_idx = Vec3crd( Vec3crd triangle_start_idx = Vec3crd(
std::floor(triangle_start_relative.x() / cube_edge_length), int(std::floor(triangle_start_relative.x() / cube_edge_length)),
std::floor(triangle_start_relative.y() / cube_edge_length), int(std::floor(triangle_start_relative.y() / cube_edge_length)),
std::floor(triangle_start_relative.z() / cube_edge_length)); int(std::floor(triangle_start_relative.z() / cube_edge_length)));
Vec3crd triangle_end_idx = Vec3crd( Vec3crd triangle_end_idx = Vec3crd(
std::floor(triangle_end_relative.x() / cube_edge_length), int(std::floor(triangle_end_relative.x() / cube_edge_length)),
std::floor(triangle_end_relative.y() / cube_edge_length), int(std::floor(triangle_end_relative.y() / cube_edge_length)),
std::floor(triangle_end_relative.z() / cube_edge_length)); int(std::floor(triangle_end_relative.z() / cube_edge_length)));
for (int z = triangle_start_idx.z(); z <= triangle_end_idx.z(); ++z) for (int z = triangle_start_idx.z(); z <= triangle_end_idx.z(); ++z)
{ {

2
src/libslic3r/PrintObject.cpp
View file

@ -377,7 +377,7 @@ void PrintObject::infill()
BOOST_LOG_TRIVIAL(debug) << "Filling layers in parallel - start"; BOOST_LOG_TRIVIAL(debug) << "Filling layers in parallel - start";
tbb::parallel_for( tbb::parallel_for(
tbb::blocked_range<size_t>(0, m_layers.size()), tbb::blocked_range<size_t>(0, m_layers.size()),
[this, &adaptive_fill_octree, &support_fill_octree](const tbb::blocked_range<size_t>& range) { [this, &adaptive_fill_octree = adaptive_fill_octree, &support_fill_octree = support_fill_octree](const tbb::blocked_range<size_t>& range) {
for (size_t layer_idx = range.begin(); layer_idx < range.end(); ++ layer_idx) { for (size_t layer_idx = range.begin(); layer_idx < range.end(); ++ layer_idx) {
m_print->throw_if_canceled(); m_print->throw_if_canceled();
m_layers[layer_idx]->make_fills(adaptive_fill_octree.get(), support_fill_octree.get()); m_layers[layer_idx]->make_fills(adaptive_fill_octree.get(), support_fill_octree.get());