From 835e89f8c1359e28002730f8aaa35c22eb540ab8 Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Tue, 22 May 2018 17:37:39 +0200 Subject: [PATCH] Delete copy constructor of Raster, we dont want to use that. Getting rid of AGG warnings. --- xs/src/agg/agg_rasterizer_cells_aa.h | 16 ++++++++-------- xs/src/libslic3r/Rasterizer/Rasterizer.cpp | 5 +---- xs/src/libslic3r/Rasterizer/Rasterizer.hpp | 3 ++- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/xs/src/agg/agg_rasterizer_cells_aa.h b/xs/src/agg/agg_rasterizer_cells_aa.h index 79050c7bad..1147148fa7 100644 --- a/xs/src/agg/agg_rasterizer_cells_aa.h +++ b/xs/src/agg/agg_rasterizer_cells_aa.h @@ -260,7 +260,7 @@ namespace agg if(mod < 0) { delta--; - mod += dx; + mod += static_cast(dx); } m_curr_cell.cover += delta; @@ -279,10 +279,10 @@ namespace agg if (rem < 0) { lift--; - rem += dx; + rem += static_cast(dx); } - mod -= dx; + mod -= static_cast(dx); while (ex1 != ex2) { @@ -290,7 +290,7 @@ namespace agg mod += rem; if(mod >= 0) { - mod -= dx; + mod -= static_cast(dx); delta++; } @@ -422,7 +422,7 @@ namespace agg if(mod < 0) { delta--; - mod += dy; + mod += static_cast(dy); } x_from = x1 + delta; @@ -440,9 +440,9 @@ namespace agg if(rem < 0) { lift--; - rem += dy; + rem += static_cast(dy); } - mod -= dy; + mod -= static_cast(dy); while(ey1 != ey2) { @@ -450,7 +450,7 @@ namespace agg mod += rem; if (mod >= 0) { - mod -= dy; + mod -= static_cast(dy); delta++; } diff --git a/xs/src/libslic3r/Rasterizer/Rasterizer.cpp b/xs/src/libslic3r/Rasterizer/Rasterizer.cpp index ff5b95c352..f57c657b9f 100644 --- a/xs/src/libslic3r/Rasterizer/Rasterizer.cpp +++ b/xs/src/libslic3r/Rasterizer/Rasterizer.cpp @@ -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(impl_->buffer().data()), impl_->buffer().size()*sizeof(Impl::TBuffer::value_type)); } diff --git a/xs/src/libslic3r/Rasterizer/Rasterizer.hpp b/xs/src/libslic3r/Rasterizer/Rasterizer.hpp index 5fc927d517..1b7a22f418 100644 --- a/xs/src/libslic3r/Rasterizer/Rasterizer.hpp +++ b/xs/src/libslic3r/Rasterizer/Rasterizer.hpp @@ -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();