GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-31 17:51:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes required by changes in interface of libbgcode

Browse Source
This commit is contained in:
enricoturri1966 2023-08-08 12:42:26 +02:00
parent 57df182d6c
commit e1724e1fa1
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libslic3r/GCode/GCodeProcessor.cpp
View File

@ -1196,8 +1196,8 @@ void GCodeProcessor::process_binary_file(const std::string& filename, std::funct
#if ENABLE_BINARIZED_GCODE_DEBUG #if ENABLE_BINARIZED_GCODE_DEBUG
if (thumbnail_block.data.size() > 0) { if (thumbnail_block.data.size() > 0) {
auto format_filename = [](const std::string& stem, const bgcode::binarize::ThumbnailBlock& block) { auto format_filename = [](const std::string& stem, const bgcode::binarize::ThumbnailBlock& block) {
std::string ret = stem + "_" + std::to_string(block.width) + "x" + std::to_string(block.height); std::string ret = stem + "_" + std::to_string(block.params.width) + "x" + std::to_string(block.params.height);
switch ((bgcode::core::EThumbnailFormat)block.format) switch ((bgcode::core::EThumbnailFormat)block.params.format)
{ {
case bgcode::core::EThumbnailFormat::PNG: { ret += ".png"; break; } case bgcode::core::EThumbnailFormat::PNG: { ret += ".png"; break; }
case bgcode::core::EThumbnailFormat::JPG: { ret += ".jpg"; break; } case bgcode::core::EThumbnailFormat::JPG: { ret += ".jpg"; break; }

10
src/libslic3r/GCode/Thumbnails.hpp
View File

@ -72,12 +72,12 @@ inline void generate_binary_thumbnails(ThumbnailsGeneratorCallback& thumbnail_cb
auto compressed = compress_thumbnail(data, format); auto compressed = compress_thumbnail(data, format);
if (compressed->data != nullptr && compressed->size > 0) { if (compressed->data != nullptr && compressed->size > 0) {
bgcode::binarize::ThumbnailBlock& block = out_thumbnails.emplace_back(bgcode::binarize::ThumbnailBlock()); bgcode::binarize::ThumbnailBlock& block = out_thumbnails.emplace_back(bgcode::binarize::ThumbnailBlock());
block.width = (uint16_t)data.width; block.params.width = (uint16_t)data.width;
block.height = (uint16_t)data.height; block.params.height = (uint16_t)data.height;
switch (format) { switch (format) {
case GCodeThumbnailsFormat::PNG: { block.format = (uint16_t)bgcode::core::EThumbnailFormat::PNG; break; } case GCodeThumbnailsFormat::PNG: { block.params.format = (uint16_t)bgcode::core::EThumbnailFormat::PNG; break; }
case GCodeThumbnailsFormat::JPG: { block.format = (uint16_t)bgcode::core::EThumbnailFormat::JPG; break; } case GCodeThumbnailsFormat::JPG: { block.params.format = (uint16_t)bgcode::core::EThumbnailFormat::JPG; break; }
case GCodeThumbnailsFormat::QOI: { block.format = (uint16_t)bgcode::core::EThumbnailFormat::QOI; break; } case GCodeThumbnailsFormat::QOI: { block.params.format = (uint16_t)bgcode::core::EThumbnailFormat::QOI; break; }
} }
block.data.resize(compressed->size); block.data.resize(compressed->size);
memcpy(block.data.data(), compressed->data, compressed->size); memcpy(block.data.data(), compressed->data, compressed->size);