Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/prusa3d/PrusaSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVojtech Bubnik <bubnikv@gmail.com>2021-05-31 15:48:12 +0300
committerVojtech Bubnik <bubnikv@gmail.com>2021-05-31 15:48:26 +0300
commitdf87f1b929cb9c041805062bc24a166e7897c602 (patch)
treeb62a5040583666ac87631a6e5e4aa5b63b14d75b /src/libslic3r
parent660acede9e42b513bd3f61cf31085306fd10d4d6 (diff)
Fixed some compiler warnings
Diffstat (limited to 'src/libslic3r')
-rw-r--r--src/libslic3r/PrintObjectSlice.cpp10
-rw-r--r--src/libslic3r/Slicing.cpp2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/libslic3r/PrintObjectSlice.cpp b/src/libslic3r/PrintObjectSlice.cpp
index 0bda23d27..8d606ebea 100644
--- a/src/libslic3r/PrintObjectSlice.cpp
+++ b/src/libslic3r/PrintObjectSlice.cpp
@@ -598,7 +598,7 @@ static inline void apply_mm_segmentation(PrintObject &print_object, ThrowOnCance
continue;
// Split LayerRegions by by_extruder regions.
auto it_painted_region = layer_range.painted_regions.begin();
- for (size_t region_id = 0; region_id < layer->region_count(); ++ region_id)
+ for (int region_id = 0; region_id < int(layer->region_count()); ++ region_id)
if (LayerRegion &layerm = *layer->get_region(region_id); ! layerm.slices.surfaces.empty()) {
const BoundingBox bbox = get_extents(layerm.slices.surfaces);
assert(it_painted_region < layer_range.painted_regions.end());
@@ -607,13 +607,13 @@ static inline void apply_mm_segmentation(PrintObject &print_object, ThrowOnCance
assert(&layerm.region() == it_painted_region->region && layerm.region().print_object_region_id() == region_id);
// 1-based extruder ID
bool self_trimmed = false;
- size_t self_extruder_id;
- for (size_t extruder_id = 1; extruder_id <= by_extruder.size(); ++ extruder_id)
+ int self_extruder_id = -1;
+ for (int extruder_id = 1; extruder_id <= int(by_extruder.size()); ++ extruder_id)
if (ByExtruder &segmented = by_extruder[extruder_id - 1]; segmented.bbox.defined && bbox.overlap(segmented.bbox)) {
// Find the target region.
- for (; it_painted_region->extruder_id < extruder_id; ++ it_painted_region)
+ for (; int(it_painted_region->extruder_id) < extruder_id; ++ it_painted_region)
assert(it_painted_region < layer_range.painted_regions.end());
- assert(layer_range.volume_regions[it_painted_region->parent].region == &layerm.region() && it_painted_region->extruder_id == extruder_id);
+ assert(layer_range.volume_regions[it_painted_region->parent].region == &layerm.region() && int(it_painted_region->extruder_id) == extruder_id);
//FIXME Don't trim by self, it is not reliable.
if (&layerm.region() == it_painted_region->region) {
self_extruder_id = extruder_id;
diff --git a/src/libslic3r/Slicing.cpp b/src/libslic3r/Slicing.cpp
index c39f07a1f..7d4fac7a2 100644
--- a/src/libslic3r/Slicing.cpp
+++ b/src/libslic3r/Slicing.cpp
@@ -376,7 +376,7 @@ std::vector<double> smooth_height_profile(const std::vector<double>& profile, co
}
}
- height = std::clamp((weight_total != 0.0) ? height /= weight_total : hi, slicing_params.min_layer_height, slicing_params.max_layer_height);
+ height = std::clamp(weight_total == 0 ? hi : height / weight_total, slicing_params.min_layer_height, slicing_params.max_layer_height);
if (smoothing_params.keep_min)
height = std::min(height, hi);
}