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

fix svg_renderer ctor

Browse source
This commit is contained in:
Dane Springmeyer 2014-05-15 18:35:27 -07:00
parent 7fa6747a29
commit 03bb19dc3a
2 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/mapnik/svg/output/svg_renderer.hpp
View file

@ -73,9 +73,8 @@ class MAPNIK_DECL svg_renderer : public feature_style_processor<svg_renderer<Out
{
public:
typedef svg_renderer<OutputIterator> 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);

13
src/svg/output/svg_renderer.cpp
View file

@ -36,15 +36,6 @@
namespace mapnik
{
template <typename T>
svg_renderer<T>::svg_renderer(Map const& m, T & output_iterator, attributes const& vars, double scale_factor, unsigned offset_x, unsigned offset_y) :
feature_style_processor<svg_renderer>(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 <typename T>
svg_renderer<T>::svg_renderer(Map const& m, T & output_iterator, double scale_factor, unsigned offset_x, unsigned offset_y) :
feature_style_processor<svg_renderer>(m, scale_factor),
@ -55,12 +46,12 @@ svg_renderer<T>::svg_renderer(Map const& m, T & output_iterator, double scale_fa
{}
template <typename T>
svg_renderer<T>::svg_renderer(Map const& m, request const& req, T & output_iterator, double scale_factor, unsigned offset_x, unsigned offset_y) :
svg_renderer<T>::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<svg_renderer>(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 <typename T>