From 21d05444f72ef538ffb2cdc80350ec85493e3ee8 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 1 Feb 2012 17:48:56 -0800 Subject: [PATCH] manual whitespace fix --- src/agg/agg_renderer.cpp | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/agg/agg_renderer.cpp b/src/agg/agg_renderer.cpp index 6309758b8..13a777f4e 100644 --- a/src/agg/agg_renderer.cpp +++ b/src/agg/agg_renderer.cpp @@ -125,7 +125,7 @@ agg_renderer::agg_renderer(Map const& m, T & pixmap, double scale_factor, uns detector_(boost::make_shared(box2d(-m.buffer_size(), -m.buffer_size(), m.width() + m.buffer_size() ,m.height() + m.buffer_size()))), ras_ptr(new rasterizer) { - setup(m); + setup(m); } template @@ -142,15 +142,15 @@ agg_renderer::agg_renderer(Map const& m, T & pixmap, boost::shared_ptr -void agg_renderer::setup(Map const &m) +void agg_renderer::setup(Map const &m) { boost::optional const& bg = m.background(); if (bg) pixmap_.set_background(*bg); - + boost::optional const& image_filename = m.background_image(); if (image_filename) { @@ -184,16 +184,13 @@ template agg_renderer::~agg_renderer() {} template -#ifdef MAPNIK_DEBUG void agg_renderer::start_map_processing(Map const& map) { +#ifdef MAPNIK_DEBUG std::clog << "start map processing bbox=" << map.get_current_extent() << "\n"; -#else -void agg_renderer::start_map_processing(Map const& /*map*/) -{ -#endif ras_ptr->clip_box(0,0,width_,height_); +#endif } template @@ -254,10 +251,10 @@ void agg_renderer::render_marker(const int x, const int y, marker &marker, co vertex_stl_adapter stl_storage((*marker.get_vector_data())->source()); svg_path_adapter svg_path(stl_storage); svg_renderer, - renderer_solid, - agg::pixfmt_rgba32_plain> svg_renderer(svg_path, - (*marker.get_vector_data())->attributes()); + agg::pod_bvector, + renderer_solid, + agg::pixfmt_rgba32_plain> svg_renderer(svg_path, + (*marker.get_vector_data())->attributes()); svg_renderer.render(*ras_ptr, sl, renb, mtx, opacity, bbox);