Created
May 14, 2024 01:10
-
-
Save anarsoul/f942fabd263459851984141d7c60b4e9 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/deps/+wxWidgets/wxWidgets.cmake b/deps/+wxWidgets/wxWidgets.cmake | |
index ac15a48d0..fc505ada5 100644 | |
--- a/deps/+wxWidgets/wxWidgets.cmake | |
+++ b/deps/+wxWidgets/wxWidgets.cmake | |
@@ -33,7 +33,7 @@ add_cmake_project(wxWidgets | |
-DwxUSE_REGEX=OFF | |
-DwxUSE_LIBXPM=builtin | |
-DwxUSE_LIBJPEG=sys | |
- -DwxUSE_LIBTIFF=sys | |
+ -DwxUSE_LIBTIFF=OFF | |
-DwxUSE_EXPAT=sys | |
-DwxUSE_LIBSDL=OFF | |
-DwxUSE_XTEST=OFF | |
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt | |
index 2ea3c3111..04e9e5499 100644 | |
--- a/src/CMakeLists.txt | |
+++ b/src/CMakeLists.txt | |
@@ -61,7 +61,7 @@ if (SLIC3R_GUI) | |
endif() | |
find_package(JPEG MODULE QUIET) | |
- find_package(TIFF MODULE QUIET) # Tiff exported config is broken for static build | |
+ # find_package(TIFF MODULE QUIET) # Tiff exported config is broken for static build | |
find_package(NanoSVG REQUIRED) | |
string(REGEX MATCH "wxpng" WX_PNG_BUILTIN ${wxWidgets_LIBRARIES}) | |
diff --git a/src/libslic3r/GCode/Thumbnails.hpp b/src/libslic3r/GCode/Thumbnails.hpp | |
index a5f980336..88f6a1999 100644 | |
--- a/src/libslic3r/GCode/Thumbnails.hpp | |
+++ b/src/libslic3r/GCode/Thumbnails.hpp | |
@@ -52,7 +52,7 @@ inline void export_thumbnails_to_file(ThumbnailsGeneratorCallback &thumbnail_cb, | |
if (thumbnail_cb != nullptr) { | |
for (const auto& [format, size] : thumbnails_list) { | |
static constexpr const size_t max_row_length = 78; | |
- ThumbnailsList thumbnails = thumbnail_cb(ThumbnailsParams{ {size}, true, true, true, true }); | |
+ ThumbnailsList thumbnails = thumbnail_cb(ThumbnailsParams{ {size}, true, true, false, true }); | |
for (const ThumbnailData& data : thumbnails) | |
if (data.is_valid()) { | |
auto compressed = compress_thumbnail(data, format); | |
@@ -89,7 +89,7 @@ inline void generate_binary_thumbnails(ThumbnailsGeneratorCallback& thumbnail_cb | |
assert(thumbnail_cb != nullptr); | |
if (thumbnail_cb != nullptr) { | |
for (const auto& [format, size] : thumbnails_list) { | |
- ThumbnailsList thumbnails = thumbnail_cb(ThumbnailsParams{ {size}, true, true, true, true }); | |
+ ThumbnailsList thumbnails = thumbnail_cb(ThumbnailsParams{ {size}, true, true, false, true }); | |
for (const ThumbnailData &data : thumbnails) | |
if (data.is_valid()) { | |
auto compressed = compress_thumbnail(data, format); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment