3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 01:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Next try to fix build on msvc2013

Browse source
This commit is contained in:
tamasmeszaros 2019-03-25 13:45:28 +01:00
parent ea6e6023f9
commit 70fa85d024
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,8 +1,6 @@
#include "Rasterizer.hpp" #include "Rasterizer.hpp"
#include <ExPolygon.hpp> #include <ExPolygon.hpp>
#include <cstdint>
// For rasterizing // For rasterizing
#include <agg/agg_basics.h> #include <agg/agg_basics.h>
#include <agg/agg_rendering_buffer.h> #include <agg/agg_rendering_buffer.h>
@ -18,8 +16,6 @@
// Experimental minz image write: // Experimental minz image write:
#include <miniz/miniz_tdef.h> #include <miniz/miniz_tdef.h>
#include <miniz/miniz_tdef.h>
namespace Slic3r { namespace Slic3r {
class Raster::Impl { class Raster::Impl {

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

@ -4,6 +4,7 @@
#include <ostream> #include <ostream>
#include <memory> #include <memory>
#include <vector> #include <vector>
#include <cstdint>
namespace Slic3r { namespace Slic3r {
@ -13,6 +14,19 @@ class ExPolygon;
struct RawBytes { struct RawBytes {
std::unique_ptr<std::uint8_t> buffer = nullptr; std::unique_ptr<std::uint8_t> buffer = nullptr;
size_t size = 0; size_t size = 0;
// FIXME: the following is needed for MSVC2013 compatibility
RawBytes() = default;
RawBytes(const RawBytes&) = delete;
RawBytes(RawBytes&& mv): buffer(std::move(mv.buffer)), size(mv.size) {}
RawBytes& operator=(const RawBytes&) = delete;
RawBytes& operator=(RawBytes&& mv) {
buffer.swap(mv.buffer);
size = mv.size;
return *this;
}
}; };
/** /**