ports/cad/PrusaSlicer/files/patch-src_slic3r_Utils_WxFontUtils.cpp
zielonka michal 79e5fba255 cad/PrusaSlicer: update to 2.6.0
PR:		272730
Reported by:	michal.zielonka.8001@gmail.com
Approved by:	teodorsigaev@gmail.com (maintainer)
2023-07-28 14:47:57 +02:00

45 lines
1.7 KiB
C++

--- src/slic3r/Utils/WxFontUtils.cpp.orig 2023-07-25 13:16:26 UTC
+++ src/slic3r/Utils/WxFontUtils.cpp
@@ -8,7 +8,7 @@
#include <wx/uri.h>
#include <wx/fontutil.h> // wxNativeFontInfo
#include <wx/osx/core/cfdictionary.h>
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__FreeBSD__)
#include "slic3r/Utils/FontConfigHelp.hpp"
#endif
@@ -72,7 +72,7 @@ bool WxFontUtils::can_load(const wxFont &font)
#elif defined(__APPLE__)
return true;
//return is_valid_ttf(get_file_path(font));
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__FreeBSD__)
return true;
// font config check file path take about 4000ms for chech them all
//std::string font_path = Slic3r::GUI::get_font_path(font);
@@ -93,7 +93,7 @@ std::unique_ptr<Emboss::FontFile> WxFontUtils::create_
return nullptr;
}
return Emboss::create_font_file(file_path.c_str());
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__FreeBSD__)
std::string font_path = Slic3r::GUI::get_font_path(font);
if (font_path.empty()){
BOOST_LOG_TRIVIAL(error) << "Can not read font('" << get_human_readable_name(font) << "'), "
@@ -114,7 +114,7 @@ EmbossStyle::Type WxFontUtils::get_actual_type()
return EmbossStyle::Type::wx_win_font_descr;
#elif defined(__APPLE__)
return EmbossStyle::Type::wx_mac_font_descr;
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__FreeBSD__)
return EmbossStyle::Type::wx_lin_font_descr;
#else
return EmbossStyle::Type::undefined;
@@ -348,4 +348,4 @@ std::unique_ptr<Emboss::FontFile> WxFontUtils::set_bol
// There is NO bold font by wx
font.SetWeight(orig_weight);
return nullptr;
-}
\ No newline at end of file
+}