From 9486901b93f4dfeaf84f2db05b4f25769bbe9b82 Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Tue, 4 Aug 2020 12:54:21 +0200 Subject: [PATCH] Minor change to SLAPrinter interface --- src/libslic3r/Format/SL1.cpp | 4 ++-- src/libslic3r/Format/SL1.hpp | 2 +- src/libslic3r/SLAPrint.hpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libslic3r/Format/SL1.cpp b/src/libslic3r/Format/SL1.cpp index ba5e89330..5c402ef5b 100644 --- a/src/libslic3r/Format/SL1.cpp +++ b/src/libslic3r/Format/SL1.cpp @@ -126,9 +126,9 @@ uqptr SL1Archive::create_raster() const return sla::create_raster_grayscale_aa(res, pxdim, gamma, tr); } -sla::EncodedRaster SL1Archive::encode_raster(const sla::RasterBase &rst) const +sla::RasterEncoder SL1Archive::get_encoder() const { - return rst.encode(sla::PNGRasterEncoder()); + return sla::PNGRasterEncoder{}; } void SL1Archive::export_print(Zipper& zipper, diff --git a/src/libslic3r/Format/SL1.hpp b/src/libslic3r/Format/SL1.hpp index 1b9e95392..fbb6d6160 100644 --- a/src/libslic3r/Format/SL1.hpp +++ b/src/libslic3r/Format/SL1.hpp @@ -13,7 +13,7 @@ class SL1Archive: public SLAPrinter { protected: uqptr create_raster() const override; - sla::EncodedRaster encode_raster(const sla::RasterBase &rst) const override; + sla::RasterEncoder get_encoder() const override; public: diff --git a/src/libslic3r/SLAPrint.hpp b/src/libslic3r/SLAPrint.hpp index f4b220c58..0ad544baa 100644 --- a/src/libslic3r/SLAPrint.hpp +++ b/src/libslic3r/SLAPrint.hpp @@ -374,7 +374,7 @@ protected: std::vector m_layers; virtual uqptr create_raster() const = 0; - virtual sla::EncodedRaster encode_raster(const sla::RasterBase &rst) const = 0; + virtual sla::RasterEncoder get_encoder() const = 0; public: virtual ~SLAPrinter() = default; @@ -389,7 +389,7 @@ public: [this, &drawfn](sla::EncodedRaster& enc, size_t idx) { auto rst = create_raster(); drawfn(*rst, idx); - enc = encode_raster(*rst); + enc = rst->encode(get_encoder()); }); } };