From f61119e02fd40d261f9a5fd0d60bd1c80b83808a Mon Sep 17 00:00:00 2001 From: Vojtech Bubnik Date: Tue, 9 Feb 2021 20:04:11 +0100 Subject: [PATCH] Yet another clang compiler warning suppressed. --- src/libslic3r/Fill/FillBase.cpp | 2 +- src/libslic3r/SlicingAdaptive.cpp | 2 +- src/slic3r/GUI/RemovableDriveManagerMM.mm | 14 ++++++-------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/libslic3r/Fill/FillBase.cpp b/src/libslic3r/Fill/FillBase.cpp index a6501accc..735c656ae 100644 --- a/src/libslic3r/Fill/FillBase.cpp +++ b/src/libslic3r/Fill/FillBase.cpp @@ -678,6 +678,7 @@ static inline bool line_rounded_thick_segment_collision( return intersects; } +#if 0 static inline bool inside_interval(double low, double high, double p) { return p >= low && p <= high; @@ -690,7 +691,6 @@ static inline bool interval_inside_interval(double outer_low, double outer_high, return inside_interval(outer_low, outer_high, inner_low) && inside_interval(outer_low, outer_high, inner_high); } -#if 0 static inline bool cyclic_interval_inside_interval(double outer_low, double outer_high, double inner_low, double inner_high, double length) { if (outer_low > outer_high) diff --git a/src/libslic3r/SlicingAdaptive.cpp b/src/libslic3r/SlicingAdaptive.cpp index 778e3e184..776351ac0 100644 --- a/src/libslic3r/SlicingAdaptive.cpp +++ b/src/libslic3r/SlicingAdaptive.cpp @@ -52,7 +52,7 @@ static inline std::pair face_z_span(const stl_facet &f) // https://tams.informatik.uni-hamburg.de/publications/2017/Adaptive%20Slicing%20for%20the%20FDM%20Process%20Revisited.pdf // (page 51, formula (8)) // Currenty @platch's error metric formula is not used. -static constexpr const double SURFACE_CONST = 0.18403; +//static constexpr const double SURFACE_CONST = 0.18403; // for a given facet, compute maximum height within the allowed surface roughness / stairstepping deviation static inline float layer_height_from_slope(const SlicingAdaptive::FaceZ &face, float max_surface_deviation) diff --git a/src/slic3r/GUI/RemovableDriveManagerMM.mm b/src/slic3r/GUI/RemovableDriveManagerMM.mm index 0dbe38909..3bd1fba7e 100644 --- a/src/slic3r/GUI/RemovableDriveManagerMM.mm +++ b/src/slic3r/GUI/RemovableDriveManagerMM.mm @@ -52,9 +52,8 @@ static void unmount_callback(DADiskRef disk, DADissenterRef dissenter, void *con { int err = 0; DADiskRef disk; - DASessionRef session; - CFDictionaryRef descDict; - session = DASessionCreate(nullptr); + CFDictionaryRef descDict = nullptr; + DASessionRef session = DASessionCreate(nullptr); if (session == nullptr) err = EINVAL; if (err == 0) { @@ -96,16 +95,15 @@ static void unmount_callback(DADiskRef disk, DADissenterRef dissenter, void *con //this eject drive is not used now -(void)eject_drive:(NSString *)path { - DADiskRef disk; - DASessionRef session; NSURL *url = [[NSURL alloc] initFileURLWithPath:path]; + DASessionRef session = DASessionCreate(nullptr); int err = 0; - session = DASessionCreate(nullptr); if (session == nullptr) err = EINVAL; + DADiskRef disk = nullptr; + if (err == 0) + disk = DADiskCreateFromVolumePath(nullptr, session, (CFURLRef)url); if (err == 0) - disk = DADiskCreateFromVolumePath(nullptr,session,(CFURLRef)url); - if( err == 0) //DADiskUnmount(disk, kDADiskUnmountOptionDefault, nullptr, nullptr); DADiskUnmount(disk, kDADiskUnmountOptionWhole | kDADiskUnmountOptionForce, unmount_callback, nullptr); if (disk != nullptr)