From 257c285c734215305b12e415d1253ec6b75ee67b Mon Sep 17 00:00:00 2001 From: Filip Sykala Date: Mon, 26 Apr 2021 12:14:38 +0200 Subject: [PATCH] FIX: remove warnings ../src/libslic3r/SLA/SupportIslands/PolygonUtils.cpp:12:10: warning: variable 'is_in_limits' set but not used [-Wunused-but-set-variable] ../src/libslic3r/SLA/SupportIslands/VoronoiGraphUtils.cpp:294:45: warning: unused variable 'success' [-Wunused-variable] --- src/libslic3r/SLA/SupportIslands/PolygonUtils.cpp | 13 +++++++------ .../SLA/SupportIslands/VoronoiGraphUtils.cpp | 6 ++++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/libslic3r/SLA/SupportIslands/PolygonUtils.cpp b/src/libslic3r/SLA/SupportIslands/PolygonUtils.cpp index 00315e23b9..e20526e0d0 100644 --- a/src/libslic3r/SLA/SupportIslands/PolygonUtils.cpp +++ b/src/libslic3r/SLA/SupportIslands/PolygonUtils.cpp @@ -3,25 +3,26 @@ using namespace Slic3r::sla; +inline bool is_in_coord_limits(const double& value) { + return (value < std::numeric_limits::max()) && + (value > std::numeric_limits::min()); +} + Slic3r::Polygon PolygonUtils::create_regular(size_t count_points, double radius, const Point ¢er) { assert(radius >= 1.); assert(count_points >= 3); - auto is_in_limits = [](double value) { - return (value < std::numeric_limits::max()) && - (value > std::numeric_limits::min()); - }; Points points; points.reserve(count_points); double increase_angle = 2 * M_PI / count_points; for (size_t i = 0; i < count_points; ++i) { double angle = i * increase_angle; double x = cos(angle) * radius + center.x(); - assert(is_in_limits(x)); + assert(is_in_coord_limits(x)); double y = sin(angle) * radius + center.y(); - assert(is_in_limits(y)); + assert(is_in_coord_limits(y)); points.emplace_back(x, y); } return Polygon(points); diff --git a/src/libslic3r/SLA/SupportIslands/VoronoiGraphUtils.cpp b/src/libslic3r/SLA/SupportIslands/VoronoiGraphUtils.cpp index 7b67679698..84c42b7814 100644 --- a/src/libslic3r/SLA/SupportIslands/VoronoiGraphUtils.cpp +++ b/src/libslic3r/SLA/SupportIslands/VoronoiGraphUtils.cpp @@ -291,9 +291,11 @@ VoronoiGraph::Node *VoronoiGraphUtils::getNode(VoronoiGraph & graph, Point point = to_point(vertex); double distance = line.distance_to(point); - [[maybe_unused]] auto [iterator, success] = - data.emplace(vertex, VoronoiGraph::Node(vertex, distance)); + auto [iterator, success] = data.emplace(vertex, VoronoiGraph::Node(vertex, distance)); + assert(success); + if (!success) return nullptr; + return &iterator->second; }