From 20456b45e5f84515c7505d2e416e4150a6e10e9d Mon Sep 17 00:00:00 2001 From: Vojtech Bubnik Date: Tue, 9 Feb 2021 19:46:09 +0100 Subject: [PATCH] Fix of the previous commit (fixing warnings) --- src/libslic3r/Fill/FillRectilinear.cpp | 8 ++++---- src/slic3r/Utils/RetinaHelperImpl.mm | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libslic3r/Fill/FillRectilinear.cpp b/src/libslic3r/Fill/FillRectilinear.cpp index 668d9a6eb3..97cd7ca000 100644 --- a/src/libslic3r/Fill/FillRectilinear.cpp +++ b/src/libslic3r/Fill/FillRectilinear.cpp @@ -2245,13 +2245,13 @@ static std::vector chain_monotonic_regions( #endif /* NDEBUG */ // How many times to repeat the ant simulation (number of ant generations). - constexpr int const const num_rounds = 25; + constexpr int const num_rounds = 25; // After how many rounds without an improvement to exit? - constexpr int const num_rounds_no_change_exit = 8; + constexpr int const num_rounds_no_change_exit = 8; // With how many ants each of the run will be performed? - const int const num_ants = std::min(int(regions.size()), 10); + const int num_ants = std::min(int(regions.size()), 10); // Base (initial) pheromone level. This value will be adjusted based on the length of the first greedy path found. - float pheromone_initial_deposit = 0.5f; + float pheromone_initial_deposit = 0.5f; // Evaporation rate of pheromones. constexpr float const pheromone_evaporation = 0.1f; // Evaporation rate to diversify paths taken by individual ants. diff --git a/src/slic3r/Utils/RetinaHelperImpl.mm b/src/slic3r/Utils/RetinaHelperImpl.mm index ee4e4d589d..e33124f962 100644 --- a/src/slic3r/Utils/RetinaHelperImpl.mm +++ b/src/slic3r/Utils/RetinaHelperImpl.mm @@ -11,7 +11,7 @@ namespace Slic3r { namespace GUI { -RetinaHelper::RetinaHelper(wxWindow*) +RetinaHelper::RetinaHelper(wxWindow *window) { m_self = nullptr; m_self = [[RetinaHelperImpl alloc] initWithView:window->GetHandle() handler:window->GetEventHandler()];