3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-14 10:17:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Further fixes and some refactor.

Browse source
This commit is contained in:
tamasmeszaros 2019-03-25 14:53:25 +01:00
parent c1186340d2
commit b21133d16b
3 changed files with 43 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/libslic3r/Rasterizer/Rasterizer.cpp
View file

@ -213,7 +213,7 @@ RawBytes Raster::save(Raster::Compression comp)
{
assert(m_impl);
RawBytes ret;
std::uint8_t *ptr = nullptr; size_t s = 0;
switch(comp) {
case Compression::PNG: {
@ -221,11 +221,11 @@ RawBytes Raster::save(Raster::Compression comp)
void *rawdata = tdefl_write_image_to_png_file_in_memory(
m_impl->buffer().data(),
int(resolution().width_px),
int(resolution().height_px), 1, &ret.size);
int(resolution().height_px), 1, &s);
if(rawdata == nullptr) break;
ret.buffer.reset(static_cast<std::uint8_t*>(rawdata));
ptr = static_cast<std::uint8_t*>(rawdata);
break;
}
@ -236,14 +236,15 @@ RawBytes Raster::save(Raster::Compression comp)
auto sz = m_impl->buffer().size()*sizeof(Impl::TBuffer::value_type);
ret.buffer.reset(new std::uint8_t[sz + header.size()]);
s = sz + header.size();
ptr = static_cast<std::uint8_t*>(MZ_MALLOC(s));
auto buff = reinterpret_cast<std::uint8_t*>(m_impl->buffer().data());
std::copy(buff, buff+sz, ret.buffer.get() + header.size());
std::copy(buff, buff+sz, ptr + header.size());
}
}
return std::move(ret);
return {ptr, s};
}
void RawBytes::MinzDeleter::operator()(uint8_t *rawptr)

26
src/libslic3r/Rasterizer/Rasterizer.hpp
View file

@ -12,27 +12,39 @@ class ExPolygon;
// Raw byte buffer paired with its size. Suitable for compressed PNG data.
class RawBytes {
class MinzDeleter {
public:
void operator()(std::uint8_t *rawptr);
};
std::unique_ptr<std::uint8_t, MinzDeleter> m_buffer = nullptr;
size_t m_size = 0;
public:
std::unique_ptr<std::uint8_t, MinzDeleter> buffer = nullptr;
size_t size = 0;
// FIXME: the following is needed for MSVC2013 compatibility
RawBytes() = default;
RawBytes(std::uint8_t *rawptr, size_t s): m_buffer(rawptr), m_size(s) {}
size_t size() const { return m_size; }
const uint8_t * data() { return m_buffer.get(); }
// /////////////////////////////////////////////////////////////////////////
// FIXME: the following is needed for MSVC2013 compatibility
// /////////////////////////////////////////////////////////////////////////
RawBytes(const RawBytes&) = delete;
RawBytes(RawBytes&& mv): buffer(std::move(mv.buffer)), size(mv.size) {}
RawBytes(RawBytes&& mv):
m_buffer(std::move(mv.m_buffer)), m_size(mv.m_size) {}
RawBytes& operator=(const RawBytes&) = delete;
RawBytes& operator=(RawBytes&& mv) {
buffer.swap(mv.buffer);
size = mv.size;
m_buffer.swap(mv.m_buffer);
m_size = mv.m_size;
return *this;
}
// /////////////////////////////////////////////////////////////////////////
};
/**