sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use std::move

Browse source
This commit is contained in:
artemp 2014-12-15 14:54:59 +01:00
parent 0d2eb9cb5f
commit 89a84150ee
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/mapnik/image_data.hpp
View file

@ -109,8 +109,8 @@ public:
{} {}
image_data(image_data<pixel_type> && rhs) noexcept image_data(image_data<pixel_type> && rhs) noexcept
: width_(rhs.width_), : width_(std::move(rhs.width_)),
height_(rhs.height_), height_(std::move(rhs.height_)),
buffer_(std::move(rhs.buffer_)), buffer_(std::move(rhs.buffer_)),
pData_(reinterpret_cast<pixel_type*>(buffer_.data())) pData_(reinterpret_cast<pixel_type*>(buffer_.data()))
{ {

2
include/mapnik/renderer_common/process_raster_symbolizer.hpp
View file

@ -154,7 +154,7 @@ void render_raster_symbolizer(raster_symbolizer const& sym,
double offset_x = ext.minx() - start_x; double offset_x = ext.minx() - start_x;
double offset_y = ext.miny() - start_y; double offset_y = ext.miny() - start_y;
image_data_rgba8 data(raster_width, raster_height); image_data_rgba8 data(raster_width, raster_height);
raster target(target_ext, data, source->get_filter_factor()); raster target(target_ext, std::move(data), source->get_filter_factor());
unsigned mesh_size = static_cast<unsigned>(get<value_integer>(sym,keys::mesh_size,feature, common.vars_, 16)); unsigned mesh_size = static_cast<unsigned>(get<value_integer>(sym,keys::mesh_size,feature, common.vars_, 16));
reproject_and_scale_raster(target, reproject_and_scale_raster(target,
*source, *source,