diff --git a/include/mapnik/svg/output/svg_renderer.hpp b/include/mapnik/svg/output/svg_renderer.hpp index 0851ce088..171907c97 100644 --- a/include/mapnik/svg/output/svg_renderer.hpp +++ b/include/mapnik/svg/output/svg_renderer.hpp @@ -73,9 +73,8 @@ class MAPNIK_DECL svg_renderer : public feature_style_processor processor_impl_type; - svg_renderer(Map const& m, OutputIterator& output_iterator, attributes const& vars, double scale_factor=1.0, unsigned offset_x=0, unsigned offset_y=0); svg_renderer(Map const& m, OutputIterator& output_iterator, double scale_factor=1.0, unsigned offset_x=0, unsigned offset_y=0); - svg_renderer(Map const& m, request const& req, OutputIterator& output_iterator, double scale_factor=1.0, unsigned offset_x=0, unsigned offset_y=0); + svg_renderer(Map const& m, request const& req, attributes const& vars, OutputIterator& output_iterator, double scale_factor=1.0, unsigned offset_x=0, unsigned offset_y=0); ~svg_renderer(); void start_map_processing(Map const& map); diff --git a/src/svg/output/svg_renderer.cpp b/src/svg/output/svg_renderer.cpp index 075173af4..68ba930dc 100644 --- a/src/svg/output/svg_renderer.cpp +++ b/src/svg/output/svg_renderer.cpp @@ -36,15 +36,6 @@ namespace mapnik { -template -svg_renderer::svg_renderer(Map const& m, T & output_iterator, attributes const& vars, double scale_factor, unsigned offset_x, unsigned offset_y) : - feature_style_processor(m, scale_factor), - output_iterator_(output_iterator), - generator_(output_iterator), - painted_(false), - common_(m, vars, offset_x, offset_y, m.width(), m.height(), scale_factor) -{} - template svg_renderer::svg_renderer(Map const& m, T & output_iterator, double scale_factor, unsigned offset_x, unsigned offset_y) : feature_style_processor(m, scale_factor), @@ -55,12 +46,12 @@ svg_renderer::svg_renderer(Map const& m, T & output_iterator, double scale_fa {} template -svg_renderer::svg_renderer(Map const& m, request const& req, T & output_iterator, double scale_factor, unsigned offset_x, unsigned offset_y) : +svg_renderer::svg_renderer(Map const& m, request const& req, attributes const& vars, T & output_iterator, double scale_factor, unsigned offset_x, unsigned offset_y) : feature_style_processor(m, scale_factor), output_iterator_(output_iterator), generator_(output_iterator), painted_(false), - common_(req, attributes(), offset_x, offset_y, req.width(), req.height(), scale_factor) + common_(req, vars, offset_x, offset_y, req.width(), req.height(), scale_factor) {} template