archive-gh-me/mapnik
1
0
Fork 0
mirror of https://github.com/mapnik/mapnik.git synced 2026-02-01 17:36:36 +00:00
Code Issues Projects Releases Wiki Activity

use move semantics instead of shared_ptr

Browse Source
This commit is contained in:
Jiri Drbalek 2015-10-01 15:14:47 +00:00
parent 101be82281
commit da678406b1
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/mapnik/feature_style_processor_impl.hpp
View File

@ -69,11 +69,10 @@ struct layer_rendering_material
lay_(lay),
proj0_(dest),
proj1_(lay.srs(),true) {}
layer_rendering_material(layer_rendering_material && rhs) = default;
};
using layer_rendering_material_ptr = std::shared_ptr<layer_rendering_material>;
template <typename Processor>
feature_style_processor<Processor>::feature_style_processor(Map const& m, double scale_factor)
: m_(m)
@ -102,7 +101,7 @@ void feature_style_processor<Processor>::apply(double scale_denom)
// in a second time, we fetch the results and
// do the actual rendering
std::vector<layer_rendering_material_ptr> mat_list;
std::vector<layer_rendering_material> mat_list;
// Define processing context map used by datasources
// implementing asynchronous queries
@ -113,9 +112,9 @@ void feature_style_processor<Processor>::apply(double scale_denom)
if (lyr.visible(scale_denom))
{
std::set<std::string> names;
layer_rendering_material_ptr mat = std::make_shared<layer_rendering_material>(lyr, proj);
layer_rendering_material mat(lyr, proj);
prepare_layer(*mat,
prepare_layer(mat,
ctx_map,
p,
m_.scale(),
@ -127,18 +126,18 @@ void feature_style_processor<Processor>::apply(double scale_denom)
names);
// Store active material
if (!mat->active_styles_.empty())
if (!mat.active_styles_.empty())
{
mat_list.push_back(mat);
mat_list.emplace_back(std::move(mat));
}
}
}
for ( layer_rendering_material_ptr mat : mat_list )
for ( layer_rendering_material & mat : mat_list )
{
if (!mat->active_styles_.empty())
if (!mat.active_styles_.empty())
{
render_material(*mat,p);
render_material(mat, p);
}
}