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

fixup multi-symbolizer processing function

Browse source
This commit is contained in:
Dane Springmeyer 2012-02-20 22:53:54 -08:00
parent 0759d1b0dc
commit 9213dd5426
4 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mapnik/agg_renderer.hpp
View file

@ -102,7 +102,7 @@ public:
mapnik::feature_ptr const& feature, mapnik::feature_ptr const& feature,
proj_transform const& prj_trans); proj_transform const& prj_trans);
inline bool process(rule::symbolizers const& /*syms*/, inline bool process(rule::symbolizers const& /*syms*/,
Feature const& /*feature*/, mapnik::feature_ptr const& /*feature*/,
proj_transform const& /*prj_trans*/) proj_transform const& /*prj_trans*/)
{ {
// agg renderer doesn't support processing of multiple symbolizers. // agg renderer doesn't support processing of multiple symbolizers.

2
include/mapnik/cairo_renderer.hpp
View file

@ -111,7 +111,7 @@ public:
mapnik::feature_ptr const& feature, mapnik::feature_ptr const& feature,
proj_transform const& prj_trans); proj_transform const& prj_trans);
inline bool process(rule::symbolizers const& /*syms*/, inline bool process(rule::symbolizers const& /*syms*/,
Feature const& /*feature*/, mapnik::feature_ptr const& /*feature*/,
proj_transform const& /*prj_trans*/) proj_transform const& /*prj_trans*/)
{ {
// cairo renderer doesn't support processing of multiple symbolizers. // cairo renderer doesn't support processing of multiple symbolizers.

2
include/mapnik/grid/grid_renderer.hpp
View file

@ -98,7 +98,7 @@ public:
mapnik::feature_ptr const& feature, mapnik::feature_ptr const& feature,
proj_transform const& prj_trans); proj_transform const& prj_trans);
inline bool process(rule::symbolizers const& /*syms*/, inline bool process(rule::symbolizers const& /*syms*/,
Feature const& /*feature*/, mapnik::feature_ptr const& /*feature*/,
proj_transform const& /*prj_trans*/) proj_transform const& /*prj_trans*/)
{ {
// grid renderer doesn't support processing of multiple symbolizers. // grid renderer doesn't support processing of multiple symbolizers.

6
src/feature_style_processor.cpp
View file

@ -475,9 +475,7 @@ void feature_style_processor<Processor>::render_style(
// if the underlying renderer is not able to process the complete set of symbolizers, // if the underlying renderer is not able to process the complete set of symbolizers,
// process one by one. // process one by one.
#if defined(SVG_RENDERER)
if(!p.process(symbols,feature,prj_trans)) if(!p.process(symbols,feature,prj_trans))
#endif
{ {
BOOST_FOREACH (symbolizer const& sym, symbols) BOOST_FOREACH (symbolizer const& sym, symbols)
@ -505,9 +503,7 @@ void feature_style_processor<Processor>::render_style(
rule::symbolizers const& symbols = r->get_symbolizers(); rule::symbolizers const& symbols = r->get_symbolizers();
// if the underlying renderer is not able to process the complete set of symbolizers, // if the underlying renderer is not able to process the complete set of symbolizers,
// process one by one. // process one by one.
#if defined(SVG_RENDERER)
if(!p.process(symbols,feature,prj_trans)) if(!p.process(symbols,feature,prj_trans))
#endif
{ {
BOOST_FOREACH (symbolizer const& sym, symbols) BOOST_FOREACH (symbolizer const& sym, symbols)
{ {
@ -529,9 +525,7 @@ void feature_style_processor<Processor>::render_style(
rule::symbolizers const& symbols = r->get_symbolizers(); rule::symbolizers const& symbols = r->get_symbolizers();
// if the underlying renderer is not able to process the complete set of symbolizers, // if the underlying renderer is not able to process the complete set of symbolizers,
// process one by one. // process one by one.
#if defined(SVG_RENDERER)
if(!p.process(symbols,feature,prj_trans)) if(!p.process(symbols,feature,prj_trans))
#endif
{ {
BOOST_FOREACH (symbolizer const& sym, symbols) BOOST_FOREACH (symbolizer const& sym, symbols)
{ {