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

simplify render_style further after 6bbbe155fe

Browse source
This commit is contained in:
Dane Springmeyer 2013-07-19 19:33:11 -04:00
parent 032e33cc9f
commit a4efd6b73e
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/mapnik/feature_style_processor.hpp
View file

@ -88,7 +88,6 @@ private:
void render_style(Processor & p,
feature_type_style const* style,
rule_cache const& rules,
std::string const& style_name,
featureset_ptr features,
proj_transform const& prj_trans);

13
include/mapnik/feature_style_processor_impl.hpp
View file

@ -434,8 +434,7 @@ void feature_style_processor<Processor>::apply_to_layer(layer const& lay, Proces
BOOST_FOREACH (feature_type_style const* style, active_styles)
{
cache->prepare();
render_style(p, style, rule_caches[i], style_names[i],
cache, prj_trans);
render_style(p, style, rule_caches[i], cache, prj_trans);
i++;
}
cache->clear();
@ -448,8 +447,7 @@ void feature_style_processor<Processor>::apply_to_layer(layer const& lay, Proces
BOOST_FOREACH (feature_type_style const* style, active_styles)
{
cache->prepare();
render_style(p, style, rule_caches[i], style_names[i],
cache, prj_trans);
render_style(p, style, rule_caches[i], cache, prj_trans);
i++;
}
}
@ -471,8 +469,7 @@ void feature_style_processor<Processor>::apply_to_layer(layer const& lay, Proces
BOOST_FOREACH (feature_type_style const* style, active_styles)
{
cache->prepare();
render_style(p, style, rule_caches[i], style_names[i],
cache, prj_trans);
render_style(p, style, rule_caches[i], cache, prj_trans);
i++;
}
cache->clear();
@ -483,8 +480,7 @@ void feature_style_processor<Processor>::apply_to_layer(layer const& lay, Proces
int i = 0;
BOOST_FOREACH (feature_type_style const* style, active_styles)
{
render_style(p, style, rule_caches[i], style_names[i],
ds->features(q), prj_trans);
render_style(p, style, rule_caches[i], ds->features(q), prj_trans);
i++;
}
}
@ -498,7 +494,6 @@ void feature_style_processor<Processor>::render_style(
Processor & p,
feature_type_style const* style,
rule_cache const& rc,
std::string const& style_name,
featureset_ptr features,
proj_transform const& prj_trans)
{