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

Fixing build on Win and OSX

Browse source
This commit is contained in:
tamasmeszaros 2019-05-20 11:19:43 +02:00
parent 38d54d779a
commit 4e2ef09a50
5 changed files with 65 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/libslic3r/SLA/SLARaster.cpp
View file

@ -1,6 +1,8 @@
#ifndef SLARASTER_CPP
#define SLARASTER_CPP
#include <functional>
#include "SLARaster.hpp"
#include "libslic3r/ExPolygon.hpp"
#include <libnest2d/backends/clipper/clipper_polygon.hpp>
@ -179,10 +181,17 @@ private:
const Raster::Impl::TPixel Raster::Impl::ColorWhite = Raster::Impl::TPixel(255);
const Raster::Impl::TPixel Raster::Impl::ColorBlack = Raster::Impl::TPixel(0);
Raster::Raster() = default;
template<> Raster::Raster() { reset(); };
Raster::~Raster() = default;
Raster::Raster(Raster &&m) = default;
Raster& Raster::operator=(Raster&&) = default;
// Raster::Raster(Raster &&m) = default;
// Raster& Raster::operator=(Raster&&) = default;
// FIXME: remove after migrating to higher version of windows compiler
Raster::Raster(Raster &&m): m_impl(std::move(m.m_impl)) {}
Raster& Raster::operator=(Raster &&m) {
m_impl = std::move(m.m_impl); return *this;
}
void Raster::reset(const Raster::Resolution &r, const Raster::PixelDim &pd,
Format fmt, double gamma)