From 4b84ab835a245b5a029fd8571a801362fb8e4fdd Mon Sep 17 00:00:00 2001
From: supermerill <merill@fr.fr>
Date: Sat, 28 Mar 2020 01:00:23 +0100
Subject: [PATCH] fix gcc compile

---
 src/libslic3r/PerimeterGenerator.cpp | 13 ++-----------
 src/libslic3r/PrintObject.cpp        |  4 ++--
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/libslic3r/PerimeterGenerator.cpp b/src/libslic3r/PerimeterGenerator.cpp
index e33993936..2ffbb62a3 100644
--- a/src/libslic3r/PerimeterGenerator.cpp
+++ b/src/libslic3r/PerimeterGenerator.cpp
@@ -624,7 +624,6 @@ void PerimeterGenerator::process()
                         //reverse only not-hole perimeters
                         ExtrusionEntityCollection coll2;
                         for (const auto loop : entities.entities) {
-                            std::cout << loop->is_loop() <<" test " << (((ExtrusionLoop*)loop)->loop_role()) <<" & " << ExtrusionLoopRole::elrHole <<"\n";
                             if (loop->is_loop() && !(((ExtrusionLoop*)loop)->loop_role() & ExtrusionLoopRole::elrHole) != 0) {
                                 coll2.entities.push_back(loop);
                             }
@@ -922,7 +921,6 @@ PerimeterGenerator::_get_nearest_point(const PerimeterGeneratorLoops &children,
                 coord_t dist = (coord_t)nearest_p.distance_to(p);
                 //if no projection, go to next
                 if (dist == 0) continue;
-                //std::cout << " child point " << idx_point << "/" << (myPolylines[idx_poly].me.polyline.points.size() - 1 )<< " dist = " << unscale(dist) << " < ? " << unscale(intersect.distance)<<" \n";
                 if (dist + SCALED_EPSILON / 2 < intersect.distance) {
                     //ok, copy the idx
                     intersect.distance = dist;
@@ -951,11 +949,6 @@ PerimeterGenerator::_get_nearest_point(const PerimeterGeneratorLoops &children,
                 coord_t dist = (coord_t)nearest_p.distance_to(p);
                 //if no projection, go to next
                 if (dist == 0) continue;
-                //if (nearest_p.coincides_with_epsilon(myPolylines.paths[idx_poly].polyline.points.back())) {
-                //    Line segment(*(myPolylines.paths[idx_poly].polyline.points.end() - 2), myPolylines.paths[idx_poly].polyline.points.back());
-                //    dist = (coord_t)segment.point_at(segment.length() - dist_cut).distance_to(p);
-                //}
-                //std::cout << " my point " << idx_point << " dist=" << unscale(dist) << " <? " << unscale(intersect.distance) << " \n";
                 if (dist + SCALED_EPSILON / 2 < intersect.distance) {
                     //ok, copy the idx
                     intersect.distance = dist;
@@ -993,9 +986,7 @@ PerimeterGenerator::_extrude_and_cut_loop(const PerimeterGeneratorLoop &loop, co
         single_point.paths.back().polyline = poly_point;
         return single_point;
     }
-    //std::cout << "idx_closest_from_entry_point : " << loop.polygon.closest_point_index(entry_point) << "/" << loop.polygon.points.size()<<"\n";
     const size_t idx_closest_from_entry_point = loop.polygon.closest_point_index(entry_point);
-    //std::cout << "loop.polygon.points[idx_closest_from_entry_point].distance_to(entry_point) : " << unscale(loop.polygon.points[idx_closest_from_entry_point].distance_to(entry_point)) << "\n";
     if (loop.polygon.points[idx_closest_from_entry_point].distance_to(entry_point) > SCALED_EPSILON) {
         //create new Point
         //get first point
@@ -1007,7 +998,7 @@ PerimeterGenerator::_extrude_and_cut_loop(const PerimeterGeneratorLoop &loop, co
                 break;
             }
         }
-        if (idx_before == (size_t)-1) std::cout << "ERROR: _traverse_and_join_loops : idx_before can't be finded to create new point\n";
+        if (idx_before == (size_t)-1) std::cerr << "ERROR: _traverse_and_join_loops : idx_before can't be finded to create new point\n";
         initial_polyline = loop.polygon.split_at_index(idx_before);
         initial_polyline.points.push_back(entry_point);
         initial_polyline.points[0] = entry_point;
@@ -1197,7 +1188,7 @@ PerimeterGenerator::_traverse_and_join_loops(const PerimeterGeneratorLoop &loop,
                     }
                 }
                 if (idx_before == (size_t)-1) {
-                    std::cout << "ERROR: idx_before can't be finded\n";
+                    std::cerr << "ERROR: idx_before can't be finded\n";
                     continue;
                 }
 
diff --git a/src/libslic3r/PrintObject.cpp b/src/libslic3r/PrintObject.cpp
index 83dc3ffc1..cf2d53805 100644
--- a/src/libslic3r/PrintObject.cpp
+++ b/src/libslic3r/PrintObject.cpp
@@ -3003,14 +3003,14 @@ void PrintObject::discover_horizontal_shells()
             // If ensure_vertical_shell_thickness, then the rest has already been performed by discover_vertical_shells().
             if (region_config.ensure_vertical_shell_thickness.value)
                 continue;
-            
+
             coordf_t print_z  = layer->print_z;
             coordf_t bottom_z = layer->bottom_z();
             for (size_t idx_surface_type = 0; idx_surface_type < 3; ++ idx_surface_type) {
                 m_print->throw_if_canceled();
                 SurfaceType type = (idx_surface_type == 0) ? (stPosTop | stDensSolid) : 
                     ( (idx_surface_type == 1) ? (stPosBottom | stDensSolid) : (stPosBottom | stDensSolid |stModBridge));
-                int num_solid_layers = (type & stPosTop == stPosTop) ? region_config.top_solid_layers.value : region_config.bottom_solid_layers.value;
+                int num_solid_layers = ( (type & stPosTop) == stPosTop) ? region_config.top_solid_layers.value : region_config.bottom_solid_layers.value;
                 if (num_solid_layers == 0)
                     continue;
                 // Find slices of current type for current layer.