Merge branch 'lh_fix_warnings' into master_27x

This commit is contained in:
Lukáš Hejl 2024-01-04 10:22:48 +01:00
commit eede1f1e9c
11 changed files with 16 additions and 12 deletions

View File

@ -200,7 +200,8 @@ public:
} }
void emit_string(const std::string_view s) { void emit_string(const std::string_view s) {
strncpy(ptr_err.ptr, s.data(), s.size()); // Be aware that std::string_view::data() returns a pointer to a buffer that is not necessarily null-terminated.
memcpy(ptr_err.ptr, s.data(), s.size());
ptr_err.ptr += s.size(); ptr_err.ptr += s.size();
} }

View File

@ -120,6 +120,7 @@ static inline bool circle_approximation_sufficient(const Circle &circle, const P
return true; return true;
} }
#if 0
static inline bool get_deviation_sum_squared(const Circle &circle, const Points::const_iterator begin, const Points::const_iterator end, const double tolerance, double &total_deviation) static inline bool get_deviation_sum_squared(const Circle &circle, const Points::const_iterator begin, const Points::const_iterator end, const double tolerance, double &total_deviation)
{ {
// The circle was calculated from the 1st and last point of the point sequence, thus the fitting of those points does not need to be evaluated. // The circle was calculated from the 1st and last point of the point sequence, thus the fitting of those points does not need to be evaluated.
@ -148,6 +149,7 @@ static inline bool get_deviation_sum_squared(const Circle &circle, const Points:
return true; return true;
} }
#endif
double arc_fit_variance(const Point &start_pos, const Point &end_pos, const float radius, bool is_ccw, double arc_fit_variance(const Point &start_pos, const Point &end_pos, const float radius, bool is_ccw,
const Points::const_iterator begin, const Points::const_iterator end) const Points::const_iterator begin, const Points::const_iterator end)

View File

@ -78,7 +78,7 @@ std::string PrintBase::output_filename(const std::string &format, const std::str
cfg.opt_string("input_filename_base") + default_ext : cfg.opt_string("input_filename_base") + default_ext :
this->placeholder_parser().process(format, 0, &cfg); this->placeholder_parser().process(format, 0, &cfg);
if (filename.extension().empty()) if (filename.extension().empty())
filename = boost::filesystem::change_extension(filename, default_ext); filename.replace_extension(default_ext);
return filename.string(); return filename.string();
} catch (std::runtime_error &err) { } catch (std::runtime_error &err) {
throw Slic3r::PlaceholderParserError(_u8L("Failed processing of the output_filename_format template.") + "\n" + err.what()); throw Slic3r::PlaceholderParserError(_u8L("Failed processing of the output_filename_format template.") + "\n" + err.what());

View File

@ -707,7 +707,7 @@ CopyFileResult copy_file_inner(const std::string& from, const std::string& to, s
// That may happen when copying on some exotic file system, for example Linux on Chrome. // That may happen when copying on some exotic file system, for example Linux on Chrome.
copy_file_linux(source, target, ec); copy_file_linux(source, target, ec);
#else // __linux__ #else // __linux__
boost::filesystem::copy_file(source, target, boost::filesystem::copy_option::overwrite_if_exists, ec); boost::filesystem::copy_file(source, target, boost::filesystem::copy_options::overwrite_existing, ec);
#endif // __linux__ #endif // __linux__
if (ec) { if (ec) {
error_message = ec.message(); error_message = ec.message();

View File

@ -138,7 +138,7 @@ void FileGet::priv::get_perform()
if (m_written == 0) if (m_written == 0)
{ {
boost::filesystem::path dest_path = m_dest_folder / m_filename; boost::filesystem::path dest_path = m_dest_folder / m_filename;
std::string extension = boost::filesystem::extension(dest_path); std::string extension = dest_path.extension().string();
std::string just_filename = m_filename.substr(0, m_filename.size() - extension.size()); std::string just_filename = m_filename.substr(0, m_filename.size() - extension.size());
std::string final_filename = just_filename; std::string final_filename = just_filename;
// Find unsed filename // Find unsed filename

View File

@ -503,7 +503,7 @@ void GalleryDialog::change_thumbnail()
png_path.replace_extension("png"); png_path.replace_extension("png");
fs::path current = fs::path(into_u8(input_files.Item(0))); fs::path current = fs::path(into_u8(input_files.Item(0)));
fs::copy_file(current, png_path, fs::copy_option::overwrite_if_exists); fs::copy_file(current, png_path, fs::copy_options::overwrite_existing);
} }
catch (fs::filesystem_error const& e) { catch (fs::filesystem_error const& e) {
std::cerr << e.what() << '\n'; std::cerr << e.what() << '\n';

View File

@ -5633,7 +5633,7 @@ void Plater::convert_gcode_to_ascii()
if (res == EResult::InvalidMagicNumber) { if (res == EResult::InvalidMagicNumber) {
in_file.close(); in_file.close();
out_file.close(); out_file.close();
boost::filesystem::copy_file(input_path, output_path, boost::filesystem::copy_option::overwrite_if_exists); boost::filesystem::copy_file(input_path, output_path, boost::filesystem::copy_options::overwrite_existing);
} }
else if (res != EResult::Success) { else if (res != EResult::Success) {
MessageDialog msg_dlg(this, _L(std::string(translate_result(res))), _L("Error converting G-code file"), wxICON_INFORMATION | wxOK); MessageDialog msg_dlg(this, _L(std::string(translate_result(res))), _L("Error converting G-code file"), wxICON_INFORMATION | wxOK);
@ -5712,7 +5712,7 @@ void Plater::convert_gcode_to_binary()
if (res == EResult::AlreadyBinarized) { if (res == EResult::AlreadyBinarized) {
in_file.close(); in_file.close();
out_file.close(); out_file.close();
boost::filesystem::copy_file(input_path, output_path, boost::filesystem::copy_option::overwrite_if_exists); boost::filesystem::copy_file(input_path, output_path, boost::filesystem::copy_options::overwrite_existing);
} }
else if (res != EResult::Success) { else if (res != EResult::Success) {
MessageDialog msg_dlg(this, _L(std::string(translate_result(res))), _L("Error converting G-code file"), wxICON_INFORMATION | wxOK); MessageDialog msg_dlg(this, _L(std::string(translate_result(res))), _L("Error converting G-code file"), wxICON_INFORMATION | wxOK);
@ -5945,7 +5945,7 @@ bool Plater::preview_zip_archive(const boost::filesystem::path& archive_path)
std::replace(name.begin(), name.end(), '\\', '/'); std::replace(name.begin(), name.end(), '\\', '/');
// rename if file exists // rename if file exists
std::string filename = path.filename().string(); std::string filename = path.filename().string();
std::string extension = boost::filesystem::extension(path); std::string extension = path.extension().string();
std::string just_filename = filename.substr(0, filename.size() - extension.size()); std::string just_filename = filename.substr(0, filename.size() - extension.size());
std::string final_filename = just_filename; std::string final_filename = just_filename;

View File

@ -759,7 +759,7 @@ namespace search_for_drives_internal
stat(path.c_str(), &buf); stat(path.c_str(), &buf);
uid_t uid = buf.st_uid; uid_t uid = buf.st_uid;
if (getuid() == uid) if (getuid() == uid)
out.emplace_back(DriveData{ boost::filesystem::basename(boost::filesystem::path(path)), path }); out.emplace_back(DriveData{ boost::filesystem::path(path).stem().string(), path });
} }
} }
} }

View File

@ -24,6 +24,8 @@
#endif //__linux__ #endif //__linux__
namespace { namespace {
#ifdef _WIN32
bool ptree_get_value(const boost::property_tree::ptree& pt, const std::string& target, std::string& result) bool ptree_get_value(const boost::property_tree::ptree& pt, const std::string& target, std::string& result)
{ {
// Check if the current node has the target element // Check if the current node has the target element
@ -41,7 +43,7 @@ bool ptree_get_value(const boost::property_tree::ptree& pt, const std::string& t
return false; // Element not found in this subtree return false; // Element not found in this subtree
} }
#ifdef _WIN32
// Fill SSID map. Implementation from Raspberry Pi imager and Win32 Api examples. // Fill SSID map. Implementation from Raspberry Pi imager and Win32 Api examples.
// https://github.com/raspberrypi/rpi-imager/blob/qml/src/windows/winwlancredentials.cpp // https://github.com/raspberrypi/rpi-imager/blob/qml/src/windows/winwlancredentials.cpp
// https://learn.microsoft.com/en-us/windows/win32/api/wlanapi/nf-wlanapi-wlangetavailablenetworklist // https://learn.microsoft.com/en-us/windows/win32/api/wlanapi/nf-wlanapi-wlangetavailablenetworklist

View File

@ -478,7 +478,7 @@ TEST_CASE("Arachne - #8849 - Missing part of model", "[ArachneMissingPart8849]")
export_perimeters_to_svg(debug_out_path("arachne-missing-part-8849.svg"), polygons, perimeters, union_ex(wall_tool_paths.getInnerContour())); export_perimeters_to_svg(debug_out_path("arachne-missing-part-8849.svg"), polygons, perimeters, union_ex(wall_tool_paths.getInnerContour()));
#endif #endif
int64_t total_extrusion_length = 0; [[maybe_unused]] int64_t total_extrusion_length = 0;
for (Arachne::VariableWidthLines &perimeter : perimeters) for (Arachne::VariableWidthLines &perimeter : perimeters)
for (Arachne::ExtrusionLine &extrusion_line : perimeter) for (Arachne::ExtrusionLine &extrusion_line : perimeter)
total_extrusion_length += extrusion_line.getLength(); total_extrusion_length += extrusion_line.getLength();

View File

@ -280,7 +280,6 @@ TEST_CASE("least squares arc fitting, interpolating end points", "[ArcWelder]")
REQUIRE(new_center_opt); REQUIRE(new_center_opt);
if (new_center_opt) { if (new_center_opt) {
Vec2d new_center = *new_center_opt; Vec2d new_center = *new_center_opt;
double new_radius = (new_center - start_pos).norm();
double total_deviation = 0; double total_deviation = 0;
double new_total_deviation = 0; double new_total_deviation = 0;
for (const Vec2d &s : samples) { for (const Vec2d &s : samples) {