3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Delete copy constructor of Raster, we dont want to use that. Getting rid of AGG warnings.

Browse source
This commit is contained in:
tamasmeszaros 2018-05-22 17:37:39 +02:00
parent 2eddacfb7e
commit 835e89f8c1
3 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
xs/src/agg/agg_rasterizer_cells_aa.h
View file

@ -260,7 +260,7 @@ namespace agg
if(mod < 0)
{
delta--;
mod += dx;
mod += static_cast<int>(dx);
}
m_curr_cell.cover += delta;
@ -279,10 +279,10 @@ namespace agg
if (rem < 0)
{
lift--;
rem += dx;
rem += static_cast<int>(dx);
}
mod -= dx;
mod -= static_cast<int>(dx);
while (ex1 != ex2)
{
@ -290,7 +290,7 @@ namespace agg
mod += rem;
if(mod >= 0)
{
mod -= dx;
mod -= static_cast<int>(dx);
delta++;
}
@ -422,7 +422,7 @@ namespace agg
if(mod < 0)
{
delta--;
mod += dy;
mod += static_cast<int>(dy);
}
x_from = x1 + delta;
@ -440,9 +440,9 @@ namespace agg
if(rem < 0)
{
lift--;
rem += dy;
rem += static_cast<int>(dy);
}
mod -= dy;
mod -= static_cast<int>(dy);
while(ey1 != ey2)
{
@ -450,7 +450,7 @@ namespace agg
mod += rem;
if (mod >= 0)
{
mod -= dy;
mod -= static_cast<int>(dy);
delta++;
}

5
xs/src/libslic3r/Rasterizer/Rasterizer.cpp
View file

@ -116,10 +116,6 @@ Raster::Raster() {}
Raster::~Raster() {}
Raster::Raster(const Raster &cpy) {
*impl_ = *(cpy.impl_);
}
Raster::Raster(Raster &&m):
impl_(std::move(m.impl_)) {}
@ -188,6 +184,7 @@ void Raster::save(std::ostream& stream, Compression comp)
<< impl_->resolution().width_px << " "
<< impl_->resolution().height_px << " "
<< "255 ";
stream.write(reinterpret_cast<const char*>(impl_->buffer().data()),
impl_->buffer().size()*sizeof(Impl::TBuffer::value_type));
}

3
xs/src/libslic3r/Rasterizer/Rasterizer.hpp
View file

@ -48,7 +48,8 @@ public:
/// Constructor taking the resolution and the pixel dimension.
explicit Raster(const Resolution& r, const PixelDim& pd );
Raster();
Raster(const Raster& cpy);
Raster(const Raster& cpy) = delete;
Raster& operator=(const Raster& cpy) = delete;
Raster(Raster&& m);
~Raster();