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

ensure the experimental svg_renderer compiles

Browse source
This commit is contained in:
Dane Springmeyer 2011-09-16 16:18:10 +00:00
parent 36dcffd2de
commit 00e8f06f13
3 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/mapnik/svg_renderer.hpp
View file

@ -27,6 +27,8 @@
// mapnik
#include <mapnik/feature_style_processor.hpp>
#include <mapnik/map.hpp>
#include <mapnik/svg/svg_generator.hpp>
#include <mapnik/svg/svg_output_attributes.hpp>
@ -96,6 +98,11 @@ namespace mapnik
Feature const& feature,
proj_transform const& prj_trans);
void painted(bool painted)
{
// nothing to do
}
inline OutputIterator& get_output_iterator()
{
return output_iterator_;
@ -113,6 +120,7 @@ namespace mapnik
CoordTransform t_;
svg::svg_generator<OutputIterator> generator_;
svg::path_output_attributes path_attributes_;
bool painted_;
/*!
* @brief Visitor that makes the calls to process each symbolizer when stored in a boost::variant.

14
src/feature_style_processor.cpp
View file

@ -46,6 +46,10 @@
#include <mapnik/cairo_renderer.hpp>
#endif
#if defined(SVG_RENDERER)
#include <mapnik/svg_renderer.hpp>
#endif
#if defined(RENDERING_STATS)
#include <mapnik/timer.hpp>
#include <iomanip>
@ -428,7 +432,7 @@ void feature_style_processor<Processor>::apply_to_layer(layer const& lay, Proces
// if the underlying renderer is not able to process the complete set of symbolizers,
// process one by one.
#ifdef SVG_RENDERER
#if defined(SVG_RENDERER)
if(!p.process(symbols,*feature,prj_trans))
#endif
{
@ -458,7 +462,7 @@ void feature_style_processor<Processor>::apply_to_layer(layer const& lay, Proces
rule::symbolizers const& symbols = r->get_symbolizers();
// if the underlying renderer is not able to process the complete set of symbolizers,
// process one by one.
#ifdef SVG_RENDERER
#if defined(SVG_RENDERER)
if(!p.process(symbols,*feature,prj_trans))
#endif
{
@ -482,7 +486,7 @@ void feature_style_processor<Processor>::apply_to_layer(layer const& lay, Proces
rule::symbolizers const& symbols = r->get_symbolizers();
// if the underlying renderer is not able to process the complete set of symbolizers,
// process one by one.
#ifdef SVG_RENDERER
#if defined(SVG_RENDERER)
if(!p.process(symbols,*feature,prj_trans))
#endif
{
@ -540,6 +544,10 @@ template class feature_style_processor<cairo_renderer<Cairo::Context> >;
template class feature_style_processor<cairo_renderer<Cairo::Surface> >;
#endif
#if defined(SVG_RENDERER)
template class feature_style_processor<svg_renderer<std::ostream_iterator<char> > >;
#endif
template class feature_style_processor<grid_renderer<grid> >;
template class feature_style_processor<agg_renderer<image_32> >;

1
src/svg/svg_renderer.cpp
View file

@ -23,6 +23,7 @@
// mapnik
#include <mapnik/svg_renderer.hpp>
#include <mapnik/map.hpp>
// stl
#ifdef MAPNIK_DEBUG