WIP: Implemented support for QOI G-code thumbnail format as requested
by the RepRapFirmware team due to their low RAM budget for decompression. Bundled the QOI image compression library.
This commit is contained in:
parent
222e3ec6ef
commit
87cff55856
@ -14,6 +14,7 @@ add_subdirectory(Shiny)
|
|||||||
add_subdirectory(semver)
|
add_subdirectory(semver)
|
||||||
add_subdirectory(libigl)
|
add_subdirectory(libigl)
|
||||||
add_subdirectory(hints)
|
add_subdirectory(hints)
|
||||||
|
add_subdirectory(qoi)
|
||||||
|
|
||||||
# Adding libnest2d project for bin packing...
|
# Adding libnest2d project for bin packing...
|
||||||
add_subdirectory(libnest2d)
|
add_subdirectory(libnest2d)
|
||||||
|
@ -98,6 +98,8 @@ set(SLIC3R_SOURCES
|
|||||||
Format/SL1.cpp
|
Format/SL1.cpp
|
||||||
GCode/ThumbnailData.cpp
|
GCode/ThumbnailData.cpp
|
||||||
GCode/ThumbnailData.hpp
|
GCode/ThumbnailData.hpp
|
||||||
|
GCode/Thumbnails.cpp
|
||||||
|
GCode/Thumbnails.hpp
|
||||||
GCode/CoolingBuffer.cpp
|
GCode/CoolingBuffer.cpp
|
||||||
GCode/CoolingBuffer.hpp
|
GCode/CoolingBuffer.hpp
|
||||||
GCode/FindReplace.cpp
|
GCode/FindReplace.cpp
|
||||||
@ -362,6 +364,7 @@ target_link_libraries(libslic3r
|
|||||||
${CMAKE_DL_LIBS}
|
${CMAKE_DL_LIBS}
|
||||||
PNG::PNG
|
PNG::PNG
|
||||||
ZLIB::ZLIB
|
ZLIB::ZLIB
|
||||||
|
qoi
|
||||||
)
|
)
|
||||||
|
|
||||||
if (TARGET OpenVDB::openvdb)
|
if (TARGET OpenVDB::openvdb)
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
#include "EdgeGrid.hpp"
|
#include "EdgeGrid.hpp"
|
||||||
#include "Geometry/ConvexHull.hpp"
|
#include "Geometry/ConvexHull.hpp"
|
||||||
#include "GCode/PrintExtents.hpp"
|
#include "GCode/PrintExtents.hpp"
|
||||||
|
#include "GCode/Thumbnails.hpp"
|
||||||
#include "GCode/WipeTower.hpp"
|
#include "GCode/WipeTower.hpp"
|
||||||
#include "ShortestPath.hpp"
|
#include "ShortestPath.hpp"
|
||||||
#include "Print.hpp"
|
#include "Print.hpp"
|
||||||
@ -54,8 +55,6 @@
|
|||||||
|
|
||||||
#include <Shiny/Shiny.h>
|
#include <Shiny/Shiny.h>
|
||||||
|
|
||||||
#include "miniz_extension.hpp"
|
|
||||||
|
|
||||||
using namespace std::literals::string_view_literals;
|
using namespace std::literals::string_view_literals;
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
@ -937,49 +936,6 @@ namespace DoExport {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename WriteToOutput, typename ThrowIfCanceledCallback>
|
|
||||||
static void export_thumbnails_to_file(ThumbnailsGeneratorCallback &thumbnail_cb, const std::vector<Vec2d> &sizes, WriteToOutput output, ThrowIfCanceledCallback throw_if_canceled)
|
|
||||||
{
|
|
||||||
// Write thumbnails using base64 encoding
|
|
||||||
if (thumbnail_cb != nullptr)
|
|
||||||
{
|
|
||||||
const size_t max_row_length = 78;
|
|
||||||
ThumbnailsList thumbnails = thumbnail_cb(ThumbnailsParams{ sizes, true, true, true, true });
|
|
||||||
for (const ThumbnailData& data : thumbnails)
|
|
||||||
{
|
|
||||||
if (data.is_valid())
|
|
||||||
{
|
|
||||||
size_t png_size = 0;
|
|
||||||
void* png_data = tdefl_write_image_to_png_file_in_memory_ex((const void*)data.pixels.data(), data.width, data.height, 4, &png_size, MZ_DEFAULT_LEVEL, 1);
|
|
||||||
if (png_data != nullptr)
|
|
||||||
{
|
|
||||||
std::string encoded;
|
|
||||||
encoded.resize(boost::beast::detail::base64::encoded_size(png_size));
|
|
||||||
encoded.resize(boost::beast::detail::base64::encode((void*)&encoded[0], (const void*)png_data, png_size));
|
|
||||||
|
|
||||||
output((boost::format("\n;\n; thumbnail begin %dx%d %d\n") % data.width % data.height % encoded.size()).str().c_str());
|
|
||||||
|
|
||||||
unsigned int row_count = 0;
|
|
||||||
while (encoded.size() > max_row_length)
|
|
||||||
{
|
|
||||||
output((boost::format("; %s\n") % encoded.substr(0, max_row_length)).str().c_str());
|
|
||||||
encoded = encoded.substr(max_row_length);
|
|
||||||
++row_count;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (encoded.size() > 0)
|
|
||||||
output((boost::format("; %s\n") % encoded).str().c_str());
|
|
||||||
|
|
||||||
output("; thumbnail end\n;\n");
|
|
||||||
|
|
||||||
mz_free(png_data);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
throw_if_canceled();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fill in print_statistics and return formatted string containing filament statistics to be inserted into G-code comment section.
|
// Fill in print_statistics and return formatted string containing filament statistics to be inserted into G-code comment section.
|
||||||
static std::string update_print_stats_and_format_filament_stats(
|
static std::string update_print_stats_and_format_filament_stats(
|
||||||
const bool has_wipe_tower,
|
const bool has_wipe_tower,
|
||||||
@ -1163,7 +1119,9 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
|
|||||||
// Write information on the generator.
|
// Write information on the generator.
|
||||||
file.write_format("; %s\n\n", Slic3r::header_slic3r_generated().c_str());
|
file.write_format("; %s\n\n", Slic3r::header_slic3r_generated().c_str());
|
||||||
|
|
||||||
DoExport::export_thumbnails_to_file(thumbnail_cb, print.full_print_config().option<ConfigOptionPoints>("thumbnails")->values,
|
GCodeThumbnails::export_thumbnails_to_file(thumbnail_cb,
|
||||||
|
print.full_print_config().option<ConfigOptionPoints>("thumbnails")->values,
|
||||||
|
print.full_print_config().opt_enum<GCodeThumbnailsFormat>("thumbnails_format"),
|
||||||
[&file](const char* sz) { file.write(sz); },
|
[&file](const char* sz) { file.write(sz); },
|
||||||
[&print]() { print.throw_if_canceled(); });
|
[&print]() { print.throw_if_canceled(); });
|
||||||
|
|
||||||
|
71
src/libslic3r/GCode/Thumbnails.cpp
Normal file
71
src/libslic3r/GCode/Thumbnails.cpp
Normal file
@ -0,0 +1,71 @@
|
|||||||
|
#include "Thumbnails.hpp"
|
||||||
|
#include "../miniz_extension.hpp"
|
||||||
|
|
||||||
|
#include <qoi/qoi.h>
|
||||||
|
|
||||||
|
namespace Slic3r::GCodeThumbnails {
|
||||||
|
|
||||||
|
using namespace std::literals;
|
||||||
|
|
||||||
|
struct CompressedPNG : CompressedImageBuffer
|
||||||
|
{
|
||||||
|
~CompressedPNG() override { if (data) mz_free(data); }
|
||||||
|
std::string_view tag() const override { return "thumbnail"sv; }
|
||||||
|
};
|
||||||
|
|
||||||
|
struct CompressedQOI : CompressedImageBuffer
|
||||||
|
{
|
||||||
|
~CompressedQOI() override { free(data); }
|
||||||
|
std::string_view tag() const override { return "thumbnail_OQI"sv; }
|
||||||
|
};
|
||||||
|
|
||||||
|
std::unique_ptr<CompressedImageBuffer> compress_thumbnail_png(const ThumbnailData &data)
|
||||||
|
{
|
||||||
|
auto out = std::make_unique<CompressedPNG>();
|
||||||
|
out->data = tdefl_write_image_to_png_file_in_memory_ex((const void*)data.pixels.data(), data.width, data.height, 4, &out->size, MZ_DEFAULT_LEVEL, 1);
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<CompressedImageBuffer> compress_thumbnail_jpg(const ThumbnailData& data)
|
||||||
|
{
|
||||||
|
//FIXME change to JPG
|
||||||
|
auto out = std::make_unique<CompressedPNG>();
|
||||||
|
out->data = tdefl_write_image_to_png_file_in_memory_ex((const void*)data.pixels.data(), data.width, data.height, 4, &out->size, MZ_DEFAULT_LEVEL, 1);
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<CompressedImageBuffer> compress_thumbnail_qoi(const ThumbnailData &data)
|
||||||
|
{
|
||||||
|
qoi_desc desc;
|
||||||
|
desc.width = data.width;
|
||||||
|
desc.height = data.height;
|
||||||
|
desc.channels = 4;
|
||||||
|
desc.colorspace = QOI_SRGB;
|
||||||
|
|
||||||
|
// Take vector of RGBA pixels and flip the image vertically
|
||||||
|
std::vector<uint8_t> rgba_pixels(data.pixels.size() * 4);
|
||||||
|
size_t row_size = data.width * 4;
|
||||||
|
for (size_t y = 0; y < data.height; ++ y)
|
||||||
|
memcpy(rgba_pixels.data() + (data.height - y - 1) * row_size, data.pixels.data() + y * row_size, row_size);
|
||||||
|
|
||||||
|
auto out = std::make_unique<CompressedQOI>();
|
||||||
|
int size;
|
||||||
|
out->data = qoi_encode((const void*)rgba_pixels.data(), &desc, &size);
|
||||||
|
out->size = size;
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<CompressedImageBuffer> compress_thumbnail(const ThumbnailData &data, GCodeThumbnailsFormat format)
|
||||||
|
{
|
||||||
|
switch (format) {
|
||||||
|
case GCodeThumbnailsFormat::PNG:
|
||||||
|
default:
|
||||||
|
return compress_thumbnail_png(data);
|
||||||
|
case GCodeThumbnailsFormat::JPG:
|
||||||
|
return compress_thumbnail_jpg(data);
|
||||||
|
case GCodeThumbnailsFormat::QOI:
|
||||||
|
return compress_thumbnail_qoi(data);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace Slic3r::GCodeThumbnails
|
58
src/libslic3r/GCode/Thumbnails.hpp
Normal file
58
src/libslic3r/GCode/Thumbnails.hpp
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
#ifndef slic3r_GCodeThumbnails_hpp_
|
||||||
|
#define slic3r_GCodeThumbnails_hpp_
|
||||||
|
|
||||||
|
#include "../Point.hpp"
|
||||||
|
#include "../PrintConfig.hpp"
|
||||||
|
#include "ThumbnailData.hpp"
|
||||||
|
|
||||||
|
#include <vector>
|
||||||
|
#include <memory>
|
||||||
|
#include <string_view>
|
||||||
|
|
||||||
|
namespace Slic3r::GCodeThumbnails {
|
||||||
|
|
||||||
|
struct CompressedImageBuffer
|
||||||
|
{
|
||||||
|
void *data { nullptr };
|
||||||
|
size_t size { 0 };
|
||||||
|
virtual ~CompressedImageBuffer() {}
|
||||||
|
virtual std::string_view tag() const = 0;
|
||||||
|
};
|
||||||
|
|
||||||
|
std::unique_ptr<CompressedImageBuffer> compress_thumbnail(const ThumbnailData &data, GCodeThumbnailsFormat format);
|
||||||
|
|
||||||
|
template<typename WriteToOutput, typename ThrowIfCanceledCallback>
|
||||||
|
inline void export_thumbnails_to_file(ThumbnailsGeneratorCallback &thumbnail_cb, const std::vector<Vec2d> &sizes, GCodeThumbnailsFormat format, WriteToOutput output, ThrowIfCanceledCallback throw_if_canceled)
|
||||||
|
{
|
||||||
|
// Write thumbnails using base64 encoding
|
||||||
|
if (thumbnail_cb != nullptr) {
|
||||||
|
static constexpr const size_t max_row_length = 78;
|
||||||
|
ThumbnailsList thumbnails = thumbnail_cb(ThumbnailsParams{ sizes, true, true, true, true });
|
||||||
|
for (const ThumbnailData& data : thumbnails)
|
||||||
|
if (data.is_valid()) {
|
||||||
|
auto compressed = compress_thumbnail(data, format);
|
||||||
|
if (compressed->data && compressed->size) {
|
||||||
|
std::string encoded;
|
||||||
|
encoded.resize(boost::beast::detail::base64::encoded_size(compressed->size));
|
||||||
|
encoded.resize(boost::beast::detail::base64::encode((void*)encoded.data(), (const void*)compressed->data, compressed->size));
|
||||||
|
|
||||||
|
output((boost::format("\n;\n; %s begin %dx%d %d\n") % compressed->tag() % data.width % data.height % encoded.size()).str().c_str());
|
||||||
|
|
||||||
|
while (encoded.size() > max_row_length) {
|
||||||
|
output((boost::format("; %s\n") % encoded.substr(0, max_row_length)).str().c_str());
|
||||||
|
encoded = encoded.substr(max_row_length);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (encoded.size() > 0)
|
||||||
|
output((boost::format("; %s\n") % encoded).str().c_str());
|
||||||
|
|
||||||
|
output((boost::format("; %s end\n;\n") % compressed->tag()).str().c_str());
|
||||||
|
}
|
||||||
|
throw_if_canceled();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace Slic3r::GCodeThumbnails
|
||||||
|
|
||||||
|
#endif // slic3r_GCodeThumbnails_hpp_
|
@ -484,7 +484,7 @@ static std::vector<std::string> s_Preset_printer_options {
|
|||||||
"cooling_tube_length", "high_current_on_filament_swap", "parking_pos_retraction", "extra_loading_move", "max_print_height",
|
"cooling_tube_length", "high_current_on_filament_swap", "parking_pos_retraction", "extra_loading_move", "max_print_height",
|
||||||
"default_print_profile", "inherits",
|
"default_print_profile", "inherits",
|
||||||
"remaining_times", "silent_mode",
|
"remaining_times", "silent_mode",
|
||||||
"machine_limits_usage", "thumbnails"
|
"machine_limits_usage", "thumbnails", "thumbnails_format"
|
||||||
};
|
};
|
||||||
|
|
||||||
static std::vector<std::string> s_Preset_sla_print_options {
|
static std::vector<std::string> s_Preset_sla_print_options {
|
||||||
|
@ -130,7 +130,8 @@ bool Print::invalidate_state_by_config_options(const ConfigOptionResolver & /* n
|
|||||||
"start_gcode",
|
"start_gcode",
|
||||||
"start_filament_gcode",
|
"start_filament_gcode",
|
||||||
"toolchange_gcode",
|
"toolchange_gcode",
|
||||||
"threads",
|
"thumbnails",
|
||||||
|
"thumbnails_format",
|
||||||
"use_firmware_retraction",
|
"use_firmware_retraction",
|
||||||
"use_relative_e_distances",
|
"use_relative_e_distances",
|
||||||
"use_volumetric_e",
|
"use_volumetric_e",
|
||||||
|
@ -43,7 +43,7 @@ static t_config_enum_values s_keys_map_PrinterTechnology {
|
|||||||
};
|
};
|
||||||
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(PrinterTechnology)
|
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(PrinterTechnology)
|
||||||
|
|
||||||
static t_config_enum_values s_keys_map_GCodeFlavor {
|
static const t_config_enum_values s_keys_map_GCodeFlavor {
|
||||||
{ "reprap", gcfRepRapSprinter },
|
{ "reprap", gcfRepRapSprinter },
|
||||||
{ "reprapfirmware", gcfRepRapFirmware },
|
{ "reprapfirmware", gcfRepRapFirmware },
|
||||||
{ "repetier", gcfRepetier },
|
{ "repetier", gcfRepetier },
|
||||||
@ -59,14 +59,14 @@ static t_config_enum_values s_keys_map_GCodeFlavor {
|
|||||||
};
|
};
|
||||||
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(GCodeFlavor)
|
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(GCodeFlavor)
|
||||||
|
|
||||||
static t_config_enum_values s_keys_map_MachineLimitsUsage {
|
static const t_config_enum_values s_keys_map_MachineLimitsUsage {
|
||||||
{ "emit_to_gcode", int(MachineLimitsUsage::EmitToGCode) },
|
{ "emit_to_gcode", int(MachineLimitsUsage::EmitToGCode) },
|
||||||
{ "time_estimate_only", int(MachineLimitsUsage::TimeEstimateOnly) },
|
{ "time_estimate_only", int(MachineLimitsUsage::TimeEstimateOnly) },
|
||||||
{ "ignore", int(MachineLimitsUsage::Ignore) }
|
{ "ignore", int(MachineLimitsUsage::Ignore) }
|
||||||
};
|
};
|
||||||
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(MachineLimitsUsage)
|
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(MachineLimitsUsage)
|
||||||
|
|
||||||
static t_config_enum_values s_keys_map_PrintHostType {
|
static const t_config_enum_values s_keys_map_PrintHostType {
|
||||||
{ "prusalink", htPrusaLink },
|
{ "prusalink", htPrusaLink },
|
||||||
{ "octoprint", htOctoPrint },
|
{ "octoprint", htOctoPrint },
|
||||||
{ "duet", htDuet },
|
{ "duet", htDuet },
|
||||||
@ -77,20 +77,20 @@ static t_config_enum_values s_keys_map_PrintHostType {
|
|||||||
};
|
};
|
||||||
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(PrintHostType)
|
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(PrintHostType)
|
||||||
|
|
||||||
static t_config_enum_values s_keys_map_AuthorizationType {
|
static const t_config_enum_values s_keys_map_AuthorizationType {
|
||||||
{ "key", atKeyPassword },
|
{ "key", atKeyPassword },
|
||||||
{ "user", atUserPassword }
|
{ "user", atUserPassword }
|
||||||
};
|
};
|
||||||
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(AuthorizationType)
|
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(AuthorizationType)
|
||||||
|
|
||||||
static t_config_enum_values s_keys_map_FuzzySkinType {
|
static const t_config_enum_values s_keys_map_FuzzySkinType {
|
||||||
{ "none", int(FuzzySkinType::None) },
|
{ "none", int(FuzzySkinType::None) },
|
||||||
{ "external", int(FuzzySkinType::External) },
|
{ "external", int(FuzzySkinType::External) },
|
||||||
{ "all", int(FuzzySkinType::All) }
|
{ "all", int(FuzzySkinType::All) }
|
||||||
};
|
};
|
||||||
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(FuzzySkinType)
|
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(FuzzySkinType)
|
||||||
|
|
||||||
static t_config_enum_values s_keys_map_InfillPattern {
|
static const t_config_enum_values s_keys_map_InfillPattern {
|
||||||
{ "rectilinear", ipRectilinear },
|
{ "rectilinear", ipRectilinear },
|
||||||
{ "monotonic", ipMonotonic },
|
{ "monotonic", ipMonotonic },
|
||||||
{ "alignedrectilinear", ipAlignedRectilinear },
|
{ "alignedrectilinear", ipAlignedRectilinear },
|
||||||
@ -114,41 +114,41 @@ static t_config_enum_values s_keys_map_InfillPattern {
|
|||||||
};
|
};
|
||||||
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(InfillPattern)
|
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(InfillPattern)
|
||||||
|
|
||||||
static t_config_enum_values s_keys_map_IroningType {
|
static const t_config_enum_values s_keys_map_IroningType {
|
||||||
{ "top", int(IroningType::TopSurfaces) },
|
{ "top", int(IroningType::TopSurfaces) },
|
||||||
{ "topmost", int(IroningType::TopmostOnly) },
|
{ "topmost", int(IroningType::TopmostOnly) },
|
||||||
{ "solid", int(IroningType::AllSolid) }
|
{ "solid", int(IroningType::AllSolid) }
|
||||||
};
|
};
|
||||||
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(IroningType)
|
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(IroningType)
|
||||||
|
|
||||||
static t_config_enum_values s_keys_map_SlicingMode {
|
static const t_config_enum_values s_keys_map_SlicingMode {
|
||||||
{ "regular", int(SlicingMode::Regular) },
|
{ "regular", int(SlicingMode::Regular) },
|
||||||
{ "even_odd", int(SlicingMode::EvenOdd) },
|
{ "even_odd", int(SlicingMode::EvenOdd) },
|
||||||
{ "close_holes", int(SlicingMode::CloseHoles) }
|
{ "close_holes", int(SlicingMode::CloseHoles) }
|
||||||
};
|
};
|
||||||
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(SlicingMode)
|
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(SlicingMode)
|
||||||
|
|
||||||
static t_config_enum_values s_keys_map_SupportMaterialPattern {
|
static const t_config_enum_values s_keys_map_SupportMaterialPattern {
|
||||||
{ "rectilinear", smpRectilinear },
|
{ "rectilinear", smpRectilinear },
|
||||||
{ "rectilinear-grid", smpRectilinearGrid },
|
{ "rectilinear-grid", smpRectilinearGrid },
|
||||||
{ "honeycomb", smpHoneycomb }
|
{ "honeycomb", smpHoneycomb }
|
||||||
};
|
};
|
||||||
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(SupportMaterialPattern)
|
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(SupportMaterialPattern)
|
||||||
|
|
||||||
static t_config_enum_values s_keys_map_SupportMaterialStyle {
|
static const t_config_enum_values s_keys_map_SupportMaterialStyle {
|
||||||
{ "grid", smsGrid },
|
{ "grid", smsGrid },
|
||||||
{ "snug", smsSnug }
|
{ "snug", smsSnug }
|
||||||
};
|
};
|
||||||
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(SupportMaterialStyle)
|
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(SupportMaterialStyle)
|
||||||
|
|
||||||
static t_config_enum_values s_keys_map_SupportMaterialInterfacePattern {
|
static const t_config_enum_values s_keys_map_SupportMaterialInterfacePattern {
|
||||||
{ "auto", smipAuto },
|
{ "auto", smipAuto },
|
||||||
{ "rectilinear", smipRectilinear },
|
{ "rectilinear", smipRectilinear },
|
||||||
{ "concentric", smipConcentric }
|
{ "concentric", smipConcentric }
|
||||||
};
|
};
|
||||||
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(SupportMaterialInterfacePattern)
|
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(SupportMaterialInterfacePattern)
|
||||||
|
|
||||||
static t_config_enum_values s_keys_map_SeamPosition {
|
static const t_config_enum_values s_keys_map_SeamPosition {
|
||||||
{ "random", spRandom },
|
{ "random", spRandom },
|
||||||
{ "nearest", spNearest },
|
{ "nearest", spNearest },
|
||||||
{ "aligned", spAligned },
|
{ "aligned", spAligned },
|
||||||
@ -190,6 +190,13 @@ static const t_config_enum_values s_keys_map_DraftShield = {
|
|||||||
};
|
};
|
||||||
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(DraftShield)
|
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(DraftShield)
|
||||||
|
|
||||||
|
static const t_config_enum_values s_keys_map_GCodeThumbnailsFormat = {
|
||||||
|
{ "PNG", int(GCodeThumbnailsFormat::PNG) },
|
||||||
|
{ "JPG", int(GCodeThumbnailsFormat::JPG) },
|
||||||
|
{ "QOI", int(GCodeThumbnailsFormat::QOI) }
|
||||||
|
};
|
||||||
|
CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(GCodeThumbnailsFormat)
|
||||||
|
|
||||||
static const t_config_enum_values s_keys_map_ForwardCompatibilitySubstitutionRule = {
|
static const t_config_enum_values s_keys_map_ForwardCompatibilitySubstitutionRule = {
|
||||||
{ "disable", ForwardCompatibilitySubstitutionRule::Disable },
|
{ "disable", ForwardCompatibilitySubstitutionRule::Disable },
|
||||||
{ "enable", ForwardCompatibilitySubstitutionRule::Enable },
|
{ "enable", ForwardCompatibilitySubstitutionRule::Enable },
|
||||||
@ -259,6 +266,16 @@ void PrintConfigDef::init_common_params()
|
|||||||
def->gui_type = ConfigOptionDef::GUIType::one_string;
|
def->gui_type = ConfigOptionDef::GUIType::one_string;
|
||||||
def->set_default_value(new ConfigOptionPoints());
|
def->set_default_value(new ConfigOptionPoints());
|
||||||
|
|
||||||
|
def = this->add("thumbnails_format", coEnum);
|
||||||
|
def->label = L("Format of G-code thumbnails");
|
||||||
|
def->tooltip = L("Format of G-code thumbnails: PNG for best quality, JPG for smallest size, QOI for low memory firmware");
|
||||||
|
def->mode = comExpert;
|
||||||
|
def->enum_keys_map = &ConfigOptionEnum<GCodeThumbnailsFormat>::get_enum_values();
|
||||||
|
def->enum_values.push_back("PNG");
|
||||||
|
def->enum_values.push_back("JPG");
|
||||||
|
def->enum_values.push_back("QOI");
|
||||||
|
def->set_default_value(new ConfigOptionEnum<GCodeThumbnailsFormat>(GCodeThumbnailsFormat::PNG));
|
||||||
|
|
||||||
def = this->add("layer_height", coFloat);
|
def = this->add("layer_height", coFloat);
|
||||||
def->label = L("Layer height");
|
def->label = L("Layer height");
|
||||||
def->category = L("Layers and Perimeters");
|
def->category = L("Layers and Perimeters");
|
||||||
|
@ -131,6 +131,10 @@ enum DraftShield {
|
|||||||
dsDisabled, dsLimited, dsEnabled
|
dsDisabled, dsLimited, dsEnabled
|
||||||
};
|
};
|
||||||
|
|
||||||
|
enum class GCodeThumbnailsFormat {
|
||||||
|
PNG, JPG, QOI
|
||||||
|
};
|
||||||
|
|
||||||
#define CONFIG_OPTION_ENUM_DECLARE_STATIC_MAPS(NAME) \
|
#define CONFIG_OPTION_ENUM_DECLARE_STATIC_MAPS(NAME) \
|
||||||
template<> const t_config_enum_names& ConfigOptionEnum<NAME>::get_enum_names(); \
|
template<> const t_config_enum_names& ConfigOptionEnum<NAME>::get_enum_names(); \
|
||||||
template<> const t_config_enum_values& ConfigOptionEnum<NAME>::get_enum_values();
|
template<> const t_config_enum_values& ConfigOptionEnum<NAME>::get_enum_values();
|
||||||
@ -152,6 +156,7 @@ CONFIG_OPTION_ENUM_DECLARE_STATIC_MAPS(SLADisplayOrientation)
|
|||||||
CONFIG_OPTION_ENUM_DECLARE_STATIC_MAPS(SLAPillarConnectionMode)
|
CONFIG_OPTION_ENUM_DECLARE_STATIC_MAPS(SLAPillarConnectionMode)
|
||||||
CONFIG_OPTION_ENUM_DECLARE_STATIC_MAPS(BrimType)
|
CONFIG_OPTION_ENUM_DECLARE_STATIC_MAPS(BrimType)
|
||||||
CONFIG_OPTION_ENUM_DECLARE_STATIC_MAPS(DraftShield)
|
CONFIG_OPTION_ENUM_DECLARE_STATIC_MAPS(DraftShield)
|
||||||
|
CONFIG_OPTION_ENUM_DECLARE_STATIC_MAPS(GCodeThumbnailsFormat)
|
||||||
CONFIG_OPTION_ENUM_DECLARE_STATIC_MAPS(ForwardCompatibilitySubstitutionRule)
|
CONFIG_OPTION_ENUM_DECLARE_STATIC_MAPS(ForwardCompatibilitySubstitutionRule)
|
||||||
|
|
||||||
#undef CONFIG_OPTION_ENUM_DECLARE_STATIC_MAPS
|
#undef CONFIG_OPTION_ENUM_DECLARE_STATIC_MAPS
|
||||||
|
9
src/qoi/CMakeLists.txt
Normal file
9
src/qoi/CMakeLists.txt
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
# PrusaSlicer specific CMake
|
||||||
|
|
||||||
|
cmake_minimum_required(VERSION 2.8.12)
|
||||||
|
project(qoi)
|
||||||
|
|
||||||
|
add_library(qoi STATIC
|
||||||
|
qoi.h
|
||||||
|
qoilib.c
|
||||||
|
)
|
108
src/qoi/README.md
Normal file
108
src/qoi/README.md
Normal file
@ -0,0 +1,108 @@
|
|||||||
|
Bundled with PrusaSlicer: commit 6c0831f91ffde5dfe2ceef32cbaff91d62b0e0ee
|
||||||
|
Original README follows:
|
||||||
|
|
||||||
|
|
||||||
|
![QOI Logo](https://qoiformat.org/qoi-logo.svg)
|
||||||
|
|
||||||
|
# QOI - The “Quite OK Image Format” for fast, lossless image compression
|
||||||
|
|
||||||
|
Single-file MIT licensed library for C/C++
|
||||||
|
|
||||||
|
See [qoi.h](https://github.com/phoboslab/qoi/blob/master/qoi.h) for
|
||||||
|
the documentation and format specification.
|
||||||
|
|
||||||
|
More info at https://qoiformat.org
|
||||||
|
|
||||||
|
|
||||||
|
## Why?
|
||||||
|
|
||||||
|
Compared to stb_image and stb_image_write QOI offers 20x-50x faster encoding,
|
||||||
|
3x-4x faster decoding and 20% better compression. It's also stupidly simple and
|
||||||
|
fits in about 300 lines of C.
|
||||||
|
|
||||||
|
|
||||||
|
## Example Usage
|
||||||
|
|
||||||
|
- [qoiconv.c](https://github.com/phoboslab/qoi/blob/master/qoiconv.c)
|
||||||
|
converts between png <> qoi
|
||||||
|
- [qoibench.c](https://github.com/phoboslab/qoi/blob/master/qoibench.c)
|
||||||
|
a simple wrapper to benchmark stbi, libpng and qoi
|
||||||
|
|
||||||
|
|
||||||
|
## Limitations
|
||||||
|
|
||||||
|
The QOI file format allows for huge images with up to 18 exa-pixels. A streaming
|
||||||
|
en-/decoder can handle these with minimal RAM requirements, assuming there is
|
||||||
|
enough storage space.
|
||||||
|
|
||||||
|
This particular implementation of QOI however is limited to images with a
|
||||||
|
maximum size of 400 million pixels. It will safely refuse to en-/decode anything
|
||||||
|
larger than that. This is not a streaming en-/decoder. It loads the whole image
|
||||||
|
file into RAM before doing any work and is not extensively optimized for
|
||||||
|
performance (but it's still very fast).
|
||||||
|
|
||||||
|
If this is a limitation for your use case, please look into any of the other
|
||||||
|
implementations listed below.
|
||||||
|
|
||||||
|
|
||||||
|
## Tools
|
||||||
|
|
||||||
|
- https://github.com/floooh/qoiview - native QOI viewer
|
||||||
|
- https://github.com/pfusik/qoi-ci/releases/tag/qoi-ci-1.1.0 - QOI Plugin installer for GIMP, Imagine, Paint.NET and XnView MP
|
||||||
|
- https://github.com/iOrange/QoiFileTypeNet/releases/tag/v0.2 - QOI Plugin for Paint.NET
|
||||||
|
- https://github.com/iOrange/QOIThumbnailProvider - Add thumbnails for QOI images in Windows Explorer
|
||||||
|
- https://github.com/Tom94/tev - another native QOI viewer (allows pixel peeping and comparison with other image formats)
|
||||||
|
- https://apps.apple.com/br/app/qoiconverterx/id1602159820 QOI <=> PNG converter available on the Mac App Store
|
||||||
|
- https://github.com/kaetemi/qoi-max - QOI Bitmap I/O Plugin for 3ds Max
|
||||||
|
- https://raylibtech.itch.io/rtexviewer - texture viewer, supports QOI
|
||||||
|
|
||||||
|
|
||||||
|
## Implementations & Bindings of QOI
|
||||||
|
|
||||||
|
- https://github.com/pfusik/qoi-ci (Ć, transpiled to C, C++, C#, Java, JavaScript, Python and Swift)
|
||||||
|
- https://github.com/kodonnell/qoi (Python)
|
||||||
|
- https://github.com/Cr4xy/lua-qoi (Lua)
|
||||||
|
- https://github.com/superzazu/SDL_QOI (C, SDL2 bindings)
|
||||||
|
- https://github.com/saharNooby/qoi-java (Java)
|
||||||
|
- https://github.com/MasterQ32/zig-qoi (Zig)
|
||||||
|
- https://github.com/rbino/qoix (Elixir)
|
||||||
|
- https://github.com/NUlliiON/QoiSharp (C#)
|
||||||
|
- https://github.com/aldanor/qoi-rust (Rust)
|
||||||
|
- https://github.com/zakarumych/rapid-qoi (Rust)
|
||||||
|
- https://github.com/takeyourhatoff/qoi (Go)
|
||||||
|
- https://github.com/DosWorld/pasqoi (Pascal)
|
||||||
|
- https://github.com/elihwyma/Swift-QOI (Swift)
|
||||||
|
- https://github.com/xfmoulet/qoi (Go)
|
||||||
|
- https://erratique.ch/software/qoic (OCaml)
|
||||||
|
- https://github.com/arian/go-qoi (Go)
|
||||||
|
- https://github.com/kchapelier/qoijs (JavaScript)
|
||||||
|
- https://github.com/KristofferC/QOI.jl (Julia)
|
||||||
|
- https://github.com/shadowMitia/libqoi/ (C++)
|
||||||
|
- https://github.com/MKCG/php-qoi (PHP)
|
||||||
|
- https://github.com/LightHouseSoftware/qoiformats (D)
|
||||||
|
- https://github.com/mhoward540/qoi-nim (Nim)
|
||||||
|
|
||||||
|
|
||||||
|
## QOI Support in Other Software
|
||||||
|
|
||||||
|
- [SerenityOS](https://github.com/SerenityOS/serenity) supports decoding QOI system wide through a custom [cpp implementation in LibGfx](https://github.com/SerenityOS/serenity/blob/master/Userland/Libraries/LibGfx/QOILoader.h)
|
||||||
|
- [Raylib](https://github.com/raysan5/raylib) supports decoding and encoding QOI textures through its [rtextures module](https://github.com/raysan5/raylib/blob/master/src/rtextures.c)
|
||||||
|
- [Rebol3](https://github.com/Oldes/Rebol3/issues/39) supports decoding and encoding QOI using a native codec
|
||||||
|
- [c-ray](https://github.com/vkoskiv/c-ray) supports QOI natively
|
||||||
|
- [SAIL](https://github.com/HappySeaFox/sail) image decoding library, supports decoding and encoding QOI images
|
||||||
|
- [Orx](https://github.com/orx/orx) 2D game engine, supports QOI natively
|
||||||
|
|
||||||
|
|
||||||
|
## Packages
|
||||||
|
|
||||||
|
[AUR](https://aur.archlinux.org/pkgbase/qoi-git/) - system-wide qoi.h, qoiconv and qoibench install as split packages.
|
||||||
|
|
||||||
|
|
||||||
|
## Implementations not yet conforming to the final specification
|
||||||
|
|
||||||
|
These implementations are based on the pre-release version of QOI. Resulting files are not compatible with the current version.
|
||||||
|
|
||||||
|
- https://github.com/ChevyRay/qoi_rs (Rust)
|
||||||
|
- https://github.com/panzi/jsqoi (TypeScript)
|
||||||
|
- https://github.com/0xd34df00d/hsqoi (Haskell)
|
||||||
|
|
671
src/qoi/qoi.h
Normal file
671
src/qoi/qoi.h
Normal file
@ -0,0 +1,671 @@
|
|||||||
|
/*
|
||||||
|
|
||||||
|
QOI - The "Quite OK Image" format for fast, lossless image compression
|
||||||
|
|
||||||
|
Dominic Szablewski - https://phoboslab.org
|
||||||
|
|
||||||
|
|
||||||
|
-- LICENSE: The MIT License(MIT)
|
||||||
|
|
||||||
|
Copyright(c) 2021 Dominic Szablewski
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||||
|
this software and associated documentation files(the "Software"), to deal in
|
||||||
|
the Software without restriction, including without limitation the rights to
|
||||||
|
use, copy, modify, merge, publish, distribute, sublicense, and / or sell copies
|
||||||
|
of the Software, and to permit persons to whom the Software is furnished to do
|
||||||
|
so, subject to the following conditions :
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
|
|
||||||
|
|
||||||
|
-- About
|
||||||
|
|
||||||
|
QOI encodes and decodes images in a lossless format. Compared to stb_image and
|
||||||
|
stb_image_write QOI offers 20x-50x faster encoding, 3x-4x faster decoding and
|
||||||
|
20% better compression.
|
||||||
|
|
||||||
|
|
||||||
|
-- Synopsis
|
||||||
|
|
||||||
|
// Define `QOI_IMPLEMENTATION` in *one* C/C++ file before including this
|
||||||
|
// library to create the implementation.
|
||||||
|
|
||||||
|
#define QOI_IMPLEMENTATION
|
||||||
|
#include "qoi.h"
|
||||||
|
|
||||||
|
// Encode and store an RGBA buffer to the file system. The qoi_desc describes
|
||||||
|
// the input pixel data.
|
||||||
|
qoi_write("image_new.qoi", rgba_pixels, &(qoi_desc){
|
||||||
|
.width = 1920,
|
||||||
|
.height = 1080,
|
||||||
|
.channels = 4,
|
||||||
|
.colorspace = QOI_SRGB
|
||||||
|
});
|
||||||
|
|
||||||
|
// Load and decode a QOI image from the file system into a 32bbp RGBA buffer.
|
||||||
|
// The qoi_desc struct will be filled with the width, height, number of channels
|
||||||
|
// and colorspace read from the file header.
|
||||||
|
qoi_desc desc;
|
||||||
|
void *rgba_pixels = qoi_read("image.qoi", &desc, 4);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
-- Documentation
|
||||||
|
|
||||||
|
This library provides the following functions;
|
||||||
|
- qoi_read -- read and decode a QOI file
|
||||||
|
- qoi_decode -- decode the raw bytes of a QOI image from memory
|
||||||
|
- qoi_write -- encode and write a QOI file
|
||||||
|
- qoi_encode -- encode an rgba buffer into a QOI image in memory
|
||||||
|
|
||||||
|
See the function declaration below for the signature and more information.
|
||||||
|
|
||||||
|
If you don't want/need the qoi_read and qoi_write functions, you can define
|
||||||
|
QOI_NO_STDIO before including this library.
|
||||||
|
|
||||||
|
This library uses malloc() and free(). To supply your own malloc implementation
|
||||||
|
you can define QOI_MALLOC and QOI_FREE before including this library.
|
||||||
|
|
||||||
|
This library uses memset() to zero-initialize the index. To supply your own
|
||||||
|
implementation you can define QOI_ZEROARR before including this library.
|
||||||
|
|
||||||
|
|
||||||
|
-- Data Format
|
||||||
|
|
||||||
|
A QOI file has a 14 byte header, followed by any number of data "chunks" and an
|
||||||
|
8-byte end marker.
|
||||||
|
|
||||||
|
struct qoi_header_t {
|
||||||
|
char magic[4]; // magic bytes "qoif"
|
||||||
|
uint32_t width; // image width in pixels (BE)
|
||||||
|
uint32_t height; // image height in pixels (BE)
|
||||||
|
uint8_t channels; // 3 = RGB, 4 = RGBA
|
||||||
|
uint8_t colorspace; // 0 = sRGB with linear alpha, 1 = all channels linear
|
||||||
|
};
|
||||||
|
|
||||||
|
Images are encoded row by row, left to right, top to bottom. The decoder and
|
||||||
|
encoder start with {r: 0, g: 0, b: 0, a: 255} as the previous pixel value. An
|
||||||
|
image is complete when all pixels specified by width * height have been covered.
|
||||||
|
|
||||||
|
Pixels are encoded as
|
||||||
|
- a run of the previous pixel
|
||||||
|
- an index into an array of previously seen pixels
|
||||||
|
- a difference to the previous pixel value in r,g,b
|
||||||
|
- full r,g,b or r,g,b,a values
|
||||||
|
|
||||||
|
The color channels are assumed to not be premultiplied with the alpha channel
|
||||||
|
("un-premultiplied alpha").
|
||||||
|
|
||||||
|
A running array[64] (zero-initialized) of previously seen pixel values is
|
||||||
|
maintained by the encoder and decoder. Each pixel that is seen by the encoder
|
||||||
|
and decoder is put into this array at the position formed by a hash function of
|
||||||
|
the color value. In the encoder, if the pixel value at the index matches the
|
||||||
|
current pixel, this index position is written to the stream as QOI_OP_INDEX.
|
||||||
|
The hash function for the index is:
|
||||||
|
|
||||||
|
index_position = (r * 3 + g * 5 + b * 7 + a * 11) % 64
|
||||||
|
|
||||||
|
Each chunk starts with a 2- or 8-bit tag, followed by a number of data bits. The
|
||||||
|
bit length of chunks is divisible by 8 - i.e. all chunks are byte aligned. All
|
||||||
|
values encoded in these data bits have the most significant bit on the left.
|
||||||
|
|
||||||
|
The 8-bit tags have precedence over the 2-bit tags. A decoder must check for the
|
||||||
|
presence of an 8-bit tag first.
|
||||||
|
|
||||||
|
The byte stream's end is marked with 7 0x00 bytes followed a single 0x01 byte.
|
||||||
|
|
||||||
|
|
||||||
|
The possible chunks are:
|
||||||
|
|
||||||
|
|
||||||
|
.- QOI_OP_INDEX ----------.
|
||||||
|
| Byte[0] |
|
||||||
|
| 7 6 5 4 3 2 1 0 |
|
||||||
|
|-------+-----------------|
|
||||||
|
| 0 0 | index |
|
||||||
|
`-------------------------`
|
||||||
|
2-bit tag b00
|
||||||
|
6-bit index into the color index array: 0..63
|
||||||
|
|
||||||
|
A valid encoder must not issue 2 or more consecutive QOI_OP_INDEX chunks to the
|
||||||
|
same index. QOI_OP_RUN should be used instead.
|
||||||
|
|
||||||
|
|
||||||
|
.- QOI_OP_DIFF -----------.
|
||||||
|
| Byte[0] |
|
||||||
|
| 7 6 5 4 3 2 1 0 |
|
||||||
|
|-------+-----+-----+-----|
|
||||||
|
| 0 1 | dr | dg | db |
|
||||||
|
`-------------------------`
|
||||||
|
2-bit tag b01
|
||||||
|
2-bit red channel difference from the previous pixel between -2..1
|
||||||
|
2-bit green channel difference from the previous pixel between -2..1
|
||||||
|
2-bit blue channel difference from the previous pixel between -2..1
|
||||||
|
|
||||||
|
The difference to the current channel values are using a wraparound operation,
|
||||||
|
so "1 - 2" will result in 255, while "255 + 1" will result in 0.
|
||||||
|
|
||||||
|
Values are stored as unsigned integers with a bias of 2. E.g. -2 is stored as
|
||||||
|
0 (b00). 1 is stored as 3 (b11).
|
||||||
|
|
||||||
|
The alpha value remains unchanged from the previous pixel.
|
||||||
|
|
||||||
|
|
||||||
|
.- QOI_OP_LUMA -------------------------------------.
|
||||||
|
| Byte[0] | Byte[1] |
|
||||||
|
| 7 6 5 4 3 2 1 0 | 7 6 5 4 3 2 1 0 |
|
||||||
|
|-------+-----------------+-------------+-----------|
|
||||||
|
| 1 0 | green diff | dr - dg | db - dg |
|
||||||
|
`---------------------------------------------------`
|
||||||
|
2-bit tag b10
|
||||||
|
6-bit green channel difference from the previous pixel -32..31
|
||||||
|
4-bit red channel difference minus green channel difference -8..7
|
||||||
|
4-bit blue channel difference minus green channel difference -8..7
|
||||||
|
|
||||||
|
The green channel is used to indicate the general direction of change and is
|
||||||
|
encoded in 6 bits. The red and blue channels (dr and db) base their diffs off
|
||||||
|
of the green channel difference and are encoded in 4 bits. I.e.:
|
||||||
|
dr_dg = (cur_px.r - prev_px.r) - (cur_px.g - prev_px.g)
|
||||||
|
db_dg = (cur_px.b - prev_px.b) - (cur_px.g - prev_px.g)
|
||||||
|
|
||||||
|
The difference to the current channel values are using a wraparound operation,
|
||||||
|
so "10 - 13" will result in 253, while "250 + 7" will result in 1.
|
||||||
|
|
||||||
|
Values are stored as unsigned integers with a bias of 32 for the green channel
|
||||||
|
and a bias of 8 for the red and blue channel.
|
||||||
|
|
||||||
|
The alpha value remains unchanged from the previous pixel.
|
||||||
|
|
||||||
|
|
||||||
|
.- QOI_OP_RUN ------------.
|
||||||
|
| Byte[0] |
|
||||||
|
| 7 6 5 4 3 2 1 0 |
|
||||||
|
|-------+-----------------|
|
||||||
|
| 1 1 | run |
|
||||||
|
`-------------------------`
|
||||||
|
2-bit tag b11
|
||||||
|
6-bit run-length repeating the previous pixel: 1..62
|
||||||
|
|
||||||
|
The run-length is stored with a bias of -1. Note that the run-lengths 63 and 64
|
||||||
|
(b111110 and b111111) are illegal as they are occupied by the QOI_OP_RGB and
|
||||||
|
QOI_OP_RGBA tags.
|
||||||
|
|
||||||
|
|
||||||
|
.- QOI_OP_RGB ------------------------------------------.
|
||||||
|
| Byte[0] | Byte[1] | Byte[2] | Byte[3] |
|
||||||
|
| 7 6 5 4 3 2 1 0 | 7 .. 0 | 7 .. 0 | 7 .. 0 |
|
||||||
|
|-------------------------+---------+---------+---------|
|
||||||
|
| 1 1 1 1 1 1 1 0 | red | green | blue |
|
||||||
|
`-------------------------------------------------------`
|
||||||
|
8-bit tag b11111110
|
||||||
|
8-bit red channel value
|
||||||
|
8-bit green channel value
|
||||||
|
8-bit blue channel value
|
||||||
|
|
||||||
|
The alpha value remains unchanged from the previous pixel.
|
||||||
|
|
||||||
|
|
||||||
|
.- QOI_OP_RGBA ---------------------------------------------------.
|
||||||
|
| Byte[0] | Byte[1] | Byte[2] | Byte[3] | Byte[4] |
|
||||||
|
| 7 6 5 4 3 2 1 0 | 7 .. 0 | 7 .. 0 | 7 .. 0 | 7 .. 0 |
|
||||||
|
|-------------------------+---------+---------+---------+---------|
|
||||||
|
| 1 1 1 1 1 1 1 1 | red | green | blue | alpha |
|
||||||
|
`-----------------------------------------------------------------`
|
||||||
|
8-bit tag b11111111
|
||||||
|
8-bit red channel value
|
||||||
|
8-bit green channel value
|
||||||
|
8-bit blue channel value
|
||||||
|
8-bit alpha channel value
|
||||||
|
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
/* -----------------------------------------------------------------------------
|
||||||
|
Header - Public functions */
|
||||||
|
|
||||||
|
#ifndef QOI_H
|
||||||
|
#define QOI_H
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* A pointer to a qoi_desc struct has to be supplied to all of qoi's functions.
|
||||||
|
It describes either the input format (for qoi_write and qoi_encode), or is
|
||||||
|
filled with the description read from the file header (for qoi_read and
|
||||||
|
qoi_decode).
|
||||||
|
|
||||||
|
The colorspace in this qoi_desc is an enum where
|
||||||
|
0 = sRGB, i.e. gamma scaled RGB channels and a linear alpha channel
|
||||||
|
1 = all channels are linear
|
||||||
|
You may use the constants QOI_SRGB or QOI_LINEAR. The colorspace is purely
|
||||||
|
informative. It will be saved to the file header, but does not affect
|
||||||
|
how chunks are en-/decoded. */
|
||||||
|
|
||||||
|
#define QOI_SRGB 0
|
||||||
|
#define QOI_LINEAR 1
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
unsigned int width;
|
||||||
|
unsigned int height;
|
||||||
|
unsigned char channels;
|
||||||
|
unsigned char colorspace;
|
||||||
|
} qoi_desc;
|
||||||
|
|
||||||
|
#ifndef QOI_NO_STDIO
|
||||||
|
|
||||||
|
/* Encode raw RGB or RGBA pixels into a QOI image and write it to the file
|
||||||
|
system. The qoi_desc struct must be filled with the image width, height,
|
||||||
|
number of channels (3 = RGB, 4 = RGBA) and the colorspace.
|
||||||
|
|
||||||
|
The function returns 0 on failure (invalid parameters, or fopen or malloc
|
||||||
|
failed) or the number of bytes written on success. */
|
||||||
|
|
||||||
|
int qoi_write(const char *filename, const void *data, const qoi_desc *desc);
|
||||||
|
|
||||||
|
|
||||||
|
/* Read and decode a QOI image from the file system. If channels is 0, the
|
||||||
|
number of channels from the file header is used. If channels is 3 or 4 the
|
||||||
|
output format will be forced into this number of channels.
|
||||||
|
|
||||||
|
The function either returns NULL on failure (invalid data, or malloc or fopen
|
||||||
|
failed) or a pointer to the decoded pixels. On success, the qoi_desc struct
|
||||||
|
will be filled with the description from the file header.
|
||||||
|
|
||||||
|
The returned pixel data should be free()d after use. */
|
||||||
|
|
||||||
|
void *qoi_read(const char *filename, qoi_desc *desc, int channels);
|
||||||
|
|
||||||
|
#endif /* QOI_NO_STDIO */
|
||||||
|
|
||||||
|
|
||||||
|
/* Encode raw RGB or RGBA pixels into a QOI image in memory.
|
||||||
|
|
||||||
|
The function either returns NULL on failure (invalid parameters or malloc
|
||||||
|
failed) or a pointer to the encoded data on success. On success the out_len
|
||||||
|
is set to the size in bytes of the encoded data.
|
||||||
|
|
||||||
|
The returned qoi data should be free()d after use. */
|
||||||
|
|
||||||
|
void *qoi_encode(const void *data, const qoi_desc *desc, int *out_len);
|
||||||
|
|
||||||
|
|
||||||
|
/* Decode a QOI image from memory.
|
||||||
|
|
||||||
|
The function either returns NULL on failure (invalid parameters or malloc
|
||||||
|
failed) or a pointer to the decoded pixels. On success, the qoi_desc struct
|
||||||
|
is filled with the description from the file header.
|
||||||
|
|
||||||
|
The returned pixel data should be free()d after use. */
|
||||||
|
|
||||||
|
void *qoi_decode(const void *data, int size, qoi_desc *desc, int channels);
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
#endif /* QOI_H */
|
||||||
|
|
||||||
|
|
||||||
|
/* -----------------------------------------------------------------------------
|
||||||
|
Implementation */
|
||||||
|
|
||||||
|
#ifdef QOI_IMPLEMENTATION
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
#ifndef QOI_MALLOC
|
||||||
|
#define QOI_MALLOC(sz) malloc(sz)
|
||||||
|
#define QOI_FREE(p) free(p)
|
||||||
|
#endif
|
||||||
|
#ifndef QOI_ZEROARR
|
||||||
|
#define QOI_ZEROARR(a) memset((a),0,sizeof(a))
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define QOI_OP_INDEX 0x00 /* 00xxxxxx */
|
||||||
|
#define QOI_OP_DIFF 0x40 /* 01xxxxxx */
|
||||||
|
#define QOI_OP_LUMA 0x80 /* 10xxxxxx */
|
||||||
|
#define QOI_OP_RUN 0xc0 /* 11xxxxxx */
|
||||||
|
#define QOI_OP_RGB 0xfe /* 11111110 */
|
||||||
|
#define QOI_OP_RGBA 0xff /* 11111111 */
|
||||||
|
|
||||||
|
#define QOI_MASK_2 0xc0 /* 11000000 */
|
||||||
|
|
||||||
|
#define QOI_COLOR_HASH(C) (C.rgba.r*3 + C.rgba.g*5 + C.rgba.b*7 + C.rgba.a*11)
|
||||||
|
#define QOI_MAGIC \
|
||||||
|
(((unsigned int)'q') << 24 | ((unsigned int)'o') << 16 | \
|
||||||
|
((unsigned int)'i') << 8 | ((unsigned int)'f'))
|
||||||
|
#define QOI_HEADER_SIZE 14
|
||||||
|
|
||||||
|
/* 2GB is the max file size that this implementation can safely handle. We guard
|
||||||
|
against anything larger than that, assuming the worst case with 5 bytes per
|
||||||
|
pixel, rounded down to a nice clean value. 400 million pixels ought to be
|
||||||
|
enough for anybody. */
|
||||||
|
#define QOI_PIXELS_MAX ((unsigned int)400000000)
|
||||||
|
|
||||||
|
typedef union {
|
||||||
|
struct { unsigned char r, g, b, a; } rgba;
|
||||||
|
unsigned int v;
|
||||||
|
} qoi_rgba_t;
|
||||||
|
|
||||||
|
static const unsigned char qoi_padding[8] = {0,0,0,0,0,0,0,1};
|
||||||
|
|
||||||
|
static void qoi_write_32(unsigned char *bytes, int *p, unsigned int v) {
|
||||||
|
bytes[(*p)++] = (0xff000000 & v) >> 24;
|
||||||
|
bytes[(*p)++] = (0x00ff0000 & v) >> 16;
|
||||||
|
bytes[(*p)++] = (0x0000ff00 & v) >> 8;
|
||||||
|
bytes[(*p)++] = (0x000000ff & v);
|
||||||
|
}
|
||||||
|
|
||||||
|
static unsigned int qoi_read_32(const unsigned char *bytes, int *p) {
|
||||||
|
unsigned int a = bytes[(*p)++];
|
||||||
|
unsigned int b = bytes[(*p)++];
|
||||||
|
unsigned int c = bytes[(*p)++];
|
||||||
|
unsigned int d = bytes[(*p)++];
|
||||||
|
return a << 24 | b << 16 | c << 8 | d;
|
||||||
|
}
|
||||||
|
|
||||||
|
void *qoi_encode(const void *data, const qoi_desc *desc, int *out_len) {
|
||||||
|
int i, max_size, p, run;
|
||||||
|
int px_len, px_end, px_pos, channels;
|
||||||
|
unsigned char *bytes;
|
||||||
|
const unsigned char *pixels;
|
||||||
|
qoi_rgba_t index[64];
|
||||||
|
qoi_rgba_t px, px_prev;
|
||||||
|
|
||||||
|
if (
|
||||||
|
data == NULL || out_len == NULL || desc == NULL ||
|
||||||
|
desc->width == 0 || desc->height == 0 ||
|
||||||
|
desc->channels < 3 || desc->channels > 4 ||
|
||||||
|
desc->colorspace > 1 ||
|
||||||
|
desc->height >= QOI_PIXELS_MAX / desc->width
|
||||||
|
) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
max_size =
|
||||||
|
desc->width * desc->height * (desc->channels + 1) +
|
||||||
|
QOI_HEADER_SIZE + sizeof(qoi_padding);
|
||||||
|
|
||||||
|
p = 0;
|
||||||
|
bytes = (unsigned char *) QOI_MALLOC(max_size);
|
||||||
|
if (!bytes) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
qoi_write_32(bytes, &p, QOI_MAGIC);
|
||||||
|
qoi_write_32(bytes, &p, desc->width);
|
||||||
|
qoi_write_32(bytes, &p, desc->height);
|
||||||
|
bytes[p++] = desc->channels;
|
||||||
|
bytes[p++] = desc->colorspace;
|
||||||
|
|
||||||
|
|
||||||
|
pixels = (const unsigned char *)data;
|
||||||
|
|
||||||
|
QOI_ZEROARR(index);
|
||||||
|
|
||||||
|
run = 0;
|
||||||
|
px_prev.rgba.r = 0;
|
||||||
|
px_prev.rgba.g = 0;
|
||||||
|
px_prev.rgba.b = 0;
|
||||||
|
px_prev.rgba.a = 255;
|
||||||
|
px = px_prev;
|
||||||
|
|
||||||
|
px_len = desc->width * desc->height * desc->channels;
|
||||||
|
px_end = px_len - desc->channels;
|
||||||
|
channels = desc->channels;
|
||||||
|
|
||||||
|
for (px_pos = 0; px_pos < px_len; px_pos += channels) {
|
||||||
|
if (channels == 4) {
|
||||||
|
px = *(qoi_rgba_t *)(pixels + px_pos);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
px.rgba.r = pixels[px_pos + 0];
|
||||||
|
px.rgba.g = pixels[px_pos + 1];
|
||||||
|
px.rgba.b = pixels[px_pos + 2];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (px.v == px_prev.v) {
|
||||||
|
run++;
|
||||||
|
if (run == 62 || px_pos == px_end) {
|
||||||
|
bytes[p++] = QOI_OP_RUN | (run - 1);
|
||||||
|
run = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
int index_pos;
|
||||||
|
|
||||||
|
if (run > 0) {
|
||||||
|
bytes[p++] = QOI_OP_RUN | (run - 1);
|
||||||
|
run = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
index_pos = QOI_COLOR_HASH(px) % 64;
|
||||||
|
|
||||||
|
if (index[index_pos].v == px.v) {
|
||||||
|
bytes[p++] = QOI_OP_INDEX | index_pos;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
index[index_pos] = px;
|
||||||
|
|
||||||
|
if (px.rgba.a == px_prev.rgba.a) {
|
||||||
|
signed char vr = px.rgba.r - px_prev.rgba.r;
|
||||||
|
signed char vg = px.rgba.g - px_prev.rgba.g;
|
||||||
|
signed char vb = px.rgba.b - px_prev.rgba.b;
|
||||||
|
|
||||||
|
signed char vg_r = vr - vg;
|
||||||
|
signed char vg_b = vb - vg;
|
||||||
|
|
||||||
|
if (
|
||||||
|
vr > -3 && vr < 2 &&
|
||||||
|
vg > -3 && vg < 2 &&
|
||||||
|
vb > -3 && vb < 2
|
||||||
|
) {
|
||||||
|
bytes[p++] = QOI_OP_DIFF | (vr + 2) << 4 | (vg + 2) << 2 | (vb + 2);
|
||||||
|
}
|
||||||
|
else if (
|
||||||
|
vg_r > -9 && vg_r < 8 &&
|
||||||
|
vg > -33 && vg < 32 &&
|
||||||
|
vg_b > -9 && vg_b < 8
|
||||||
|
) {
|
||||||
|
bytes[p++] = QOI_OP_LUMA | (vg + 32);
|
||||||
|
bytes[p++] = (vg_r + 8) << 4 | (vg_b + 8);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
bytes[p++] = QOI_OP_RGB;
|
||||||
|
bytes[p++] = px.rgba.r;
|
||||||
|
bytes[p++] = px.rgba.g;
|
||||||
|
bytes[p++] = px.rgba.b;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
bytes[p++] = QOI_OP_RGBA;
|
||||||
|
bytes[p++] = px.rgba.r;
|
||||||
|
bytes[p++] = px.rgba.g;
|
||||||
|
bytes[p++] = px.rgba.b;
|
||||||
|
bytes[p++] = px.rgba.a;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
px_prev = px;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (i = 0; i < (int)sizeof(qoi_padding); i++) {
|
||||||
|
bytes[p++] = qoi_padding[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
*out_len = p;
|
||||||
|
return bytes;
|
||||||
|
}
|
||||||
|
|
||||||
|
void *qoi_decode(const void *data, int size, qoi_desc *desc, int channels) {
|
||||||
|
const unsigned char *bytes;
|
||||||
|
unsigned int header_magic;
|
||||||
|
unsigned char *pixels;
|
||||||
|
qoi_rgba_t index[64];
|
||||||
|
qoi_rgba_t px;
|
||||||
|
int px_len, chunks_len, px_pos;
|
||||||
|
int p = 0, run = 0;
|
||||||
|
|
||||||
|
if (
|
||||||
|
data == NULL || desc == NULL ||
|
||||||
|
(channels != 0 && channels != 3 && channels != 4) ||
|
||||||
|
size < QOI_HEADER_SIZE + (int)sizeof(qoi_padding)
|
||||||
|
) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
bytes = (const unsigned char *)data;
|
||||||
|
|
||||||
|
header_magic = qoi_read_32(bytes, &p);
|
||||||
|
desc->width = qoi_read_32(bytes, &p);
|
||||||
|
desc->height = qoi_read_32(bytes, &p);
|
||||||
|
desc->channels = bytes[p++];
|
||||||
|
desc->colorspace = bytes[p++];
|
||||||
|
|
||||||
|
if (
|
||||||
|
desc->width == 0 || desc->height == 0 ||
|
||||||
|
desc->channels < 3 || desc->channels > 4 ||
|
||||||
|
desc->colorspace > 1 ||
|
||||||
|
header_magic != QOI_MAGIC ||
|
||||||
|
desc->height >= QOI_PIXELS_MAX / desc->width
|
||||||
|
) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (channels == 0) {
|
||||||
|
channels = desc->channels;
|
||||||
|
}
|
||||||
|
|
||||||
|
px_len = desc->width * desc->height * channels;
|
||||||
|
pixels = (unsigned char *) QOI_MALLOC(px_len);
|
||||||
|
if (!pixels) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
QOI_ZEROARR(index);
|
||||||
|
px.rgba.r = 0;
|
||||||
|
px.rgba.g = 0;
|
||||||
|
px.rgba.b = 0;
|
||||||
|
px.rgba.a = 255;
|
||||||
|
|
||||||
|
chunks_len = size - (int)sizeof(qoi_padding);
|
||||||
|
for (px_pos = 0; px_pos < px_len; px_pos += channels) {
|
||||||
|
if (run > 0) {
|
||||||
|
run--;
|
||||||
|
}
|
||||||
|
else if (p < chunks_len) {
|
||||||
|
int b1 = bytes[p++];
|
||||||
|
|
||||||
|
if (b1 == QOI_OP_RGB) {
|
||||||
|
px.rgba.r = bytes[p++];
|
||||||
|
px.rgba.g = bytes[p++];
|
||||||
|
px.rgba.b = bytes[p++];
|
||||||
|
}
|
||||||
|
else if (b1 == QOI_OP_RGBA) {
|
||||||
|
px.rgba.r = bytes[p++];
|
||||||
|
px.rgba.g = bytes[p++];
|
||||||
|
px.rgba.b = bytes[p++];
|
||||||
|
px.rgba.a = bytes[p++];
|
||||||
|
}
|
||||||
|
else if ((b1 & QOI_MASK_2) == QOI_OP_INDEX) {
|
||||||
|
px = index[b1];
|
||||||
|
}
|
||||||
|
else if ((b1 & QOI_MASK_2) == QOI_OP_DIFF) {
|
||||||
|
px.rgba.r += ((b1 >> 4) & 0x03) - 2;
|
||||||
|
px.rgba.g += ((b1 >> 2) & 0x03) - 2;
|
||||||
|
px.rgba.b += ( b1 & 0x03) - 2;
|
||||||
|
}
|
||||||
|
else if ((b1 & QOI_MASK_2) == QOI_OP_LUMA) {
|
||||||
|
int b2 = bytes[p++];
|
||||||
|
int vg = (b1 & 0x3f) - 32;
|
||||||
|
px.rgba.r += vg - 8 + ((b2 >> 4) & 0x0f);
|
||||||
|
px.rgba.g += vg;
|
||||||
|
px.rgba.b += vg - 8 + (b2 & 0x0f);
|
||||||
|
}
|
||||||
|
else if ((b1 & QOI_MASK_2) == QOI_OP_RUN) {
|
||||||
|
run = (b1 & 0x3f);
|
||||||
|
}
|
||||||
|
|
||||||
|
index[QOI_COLOR_HASH(px) % 64] = px;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (channels == 4) {
|
||||||
|
*(qoi_rgba_t*)(pixels + px_pos) = px;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
pixels[px_pos + 0] = px.rgba.r;
|
||||||
|
pixels[px_pos + 1] = px.rgba.g;
|
||||||
|
pixels[px_pos + 2] = px.rgba.b;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return pixels;
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifndef QOI_NO_STDIO
|
||||||
|
#include <stdio.h>
|
||||||
|
|
||||||
|
int qoi_write(const char *filename, const void *data, const qoi_desc *desc) {
|
||||||
|
FILE *f = fopen(filename, "wb");
|
||||||
|
int size;
|
||||||
|
void *encoded;
|
||||||
|
|
||||||
|
if (!f) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
encoded = qoi_encode(data, desc, &size);
|
||||||
|
if (!encoded) {
|
||||||
|
fclose(f);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
fwrite(encoded, 1, size, f);
|
||||||
|
fclose(f);
|
||||||
|
|
||||||
|
QOI_FREE(encoded);
|
||||||
|
return size;
|
||||||
|
}
|
||||||
|
|
||||||
|
void *qoi_read(const char *filename, qoi_desc *desc, int channels) {
|
||||||
|
FILE *f = fopen(filename, "rb");
|
||||||
|
int size, bytes_read;
|
||||||
|
void *pixels, *data;
|
||||||
|
|
||||||
|
if (!f) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
fseek(f, 0, SEEK_END);
|
||||||
|
size = ftell(f);
|
||||||
|
if (size <= 0) {
|
||||||
|
fclose(f);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
fseek(f, 0, SEEK_SET);
|
||||||
|
|
||||||
|
data = QOI_MALLOC(size);
|
||||||
|
if (!data) {
|
||||||
|
fclose(f);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
bytes_read = fread(data, 1, size, f);
|
||||||
|
fclose(f);
|
||||||
|
|
||||||
|
pixels = qoi_decode(data, bytes_read, desc, channels);
|
||||||
|
QOI_FREE(data);
|
||||||
|
return pixels;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif /* QOI_NO_STDIO */
|
||||||
|
#endif /* QOI_IMPLEMENTATION */
|
6
src/qoi/qoilib.c
Normal file
6
src/qoi/qoilib.c
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
// PrusaSlicer specific:
|
||||||
|
// Include and compile QOI library.
|
||||||
|
|
||||||
|
#define QOI_IMPLEMENTATION
|
||||||
|
#define QOI_NO_STDIO
|
||||||
|
#include "qoi.h"
|
@ -2324,6 +2324,7 @@ void TabPrinter::build_fff()
|
|||||||
option = optgroup->get_option("thumbnails");
|
option = optgroup->get_option("thumbnails");
|
||||||
option.opt.full_width = true;
|
option.opt.full_width = true;
|
||||||
optgroup->append_single_option_line(option);
|
optgroup->append_single_option_line(option);
|
||||||
|
optgroup->append_single_option_line("thumbnails_format");
|
||||||
|
|
||||||
optgroup->append_single_option_line("silent_mode");
|
optgroup->append_single_option_line("silent_mode");
|
||||||
optgroup->append_single_option_line("remaining_times");
|
optgroup->append_single_option_line("remaining_times");
|
||||||
|
Loading…
Reference in New Issue
Block a user