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

Merge pull request #3100 from mapycz/use_move

Browse source 
use move semantics instead of shared_ptr
This commit is contained in:
Jiri Drbalek 2015-10-02 09:49:55 +02:00
commit d6978c29b2
2 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mapnik/feature_style_processor.hpp
View file

@ -110,7 +110,7 @@ private:
/*! /*!
* \brief render features list queued when they are available. * \brief render features list queued when they are available.
*/ */
void render_material(layer_rendering_material & mat, Processor & p ); void render_material(layer_rendering_material const & mat, Processor & p );
Map const& m_; Map const& m_;
}; };

31
include/mapnik/feature_style_processor_impl.hpp
View file

@ -69,11 +69,10 @@ struct layer_rendering_material
lay_(lay), lay_(lay),
proj0_(dest), proj0_(dest),
proj1_(lay.srs(),true) {} 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> template <typename Processor>
feature_style_processor<Processor>::feature_style_processor(Map const& m, double scale_factor) feature_style_processor<Processor>::feature_style_processor(Map const& m, double scale_factor)
: m_(m) : m_(m)
@ -102,7 +101,7 @@ void feature_style_processor<Processor>::apply(double scale_denom)
// in a second time, we fetch the results and // in a second time, we fetch the results and
// do the actual rendering // 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 // Define processing context map used by datasources
// implementing asynchronous queries // implementing asynchronous queries
@ -113,9 +112,9 @@ void feature_style_processor<Processor>::apply(double scale_denom)
if (lyr.visible(scale_denom)) if (lyr.visible(scale_denom))
{ {
std::set<std::string> names; 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, ctx_map,
p, p,
m_.scale(), m_.scale(),
@ -127,18 +126,18 @@ void feature_style_processor<Processor>::apply(double scale_denom)
names); names);
// Store active material // 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 const & mat : mat_list )
{ {
if (!mat->active_styles_.empty()) if (!mat.active_styles_.empty())
{ {
render_material(*mat,p); render_material(mat, p);
} }
} }
@ -443,11 +442,11 @@ void feature_style_processor<Processor>::prepare_layer(layer_rendering_material
template <typename Processor> template <typename Processor>
void feature_style_processor<Processor>::render_material(layer_rendering_material & mat, void feature_style_processor<Processor>::render_material(layer_rendering_material const & mat,
Processor & p ) Processor & p )
{ {
std::vector<feature_type_style const*> & active_styles = mat.active_styles_; std::vector<feature_type_style const*> const & active_styles = mat.active_styles_;
std::vector<featureset_ptr> & featureset_ptr_list = mat.featureset_ptr_list_; std::vector<featureset_ptr> const & featureset_ptr_list = mat.featureset_ptr_list_;
if (featureset_ptr_list.empty()) if (featureset_ptr_list.empty())
{ {
// The datasource wasn't queried because of early return // The datasource wasn't queried because of early return
@ -464,7 +463,7 @@ void feature_style_processor<Processor>::render_material(layer_rendering_materia
layer const& lay = mat.lay_; layer const& lay = mat.lay_;
std::vector<rule_cache> & rule_caches = mat.rule_caches_; std::vector<rule_cache> const & rule_caches = mat.rule_caches_;
proj_transform prj_trans(mat.proj0_,mat.proj1_); proj_transform prj_trans(mat.proj0_,mat.proj1_);
@ -544,7 +543,7 @@ void feature_style_processor<Processor>::render_material(layer_rendering_materia
else else
{ {
std::size_t i = 0; std::size_t i = 0;
std::vector<featureset_ptr>::iterator featuresets = featureset_ptr_list.begin(); std::vector<featureset_ptr>::const_iterator featuresets = featureset_ptr_list.cbegin();
for (feature_type_style const* style : active_styles) for (feature_type_style const* style : active_styles)
{ {
featureset_ptr features = *featuresets++; featureset_ptr features = *featuresets++;