Changeset 874 for trunk/src/cairo_renderer.cpp

Timestamp:

02/05/09 19:46:29 (18 months ago)

Author:

tom

Message:

Revert the patch to add a show_page flag to the cairo renderer and
replace it with support for rendering to a cairo context rather than
a cairo surface.

When rendering to a surface a show_page is done, when rendering to a
context it is not so that multiple renders can be done, possibly with
modified scaling and/or translation.

Files:

• trunk/src/cairo_renderer.cpp (modified) (14 diffs)

trunk/src/cairo_renderer.cpp

@@ -466 +466 @@
    };
 
-   template <typename T>
-   cairo_renderer<T>::cairo_renderer(Map const& m, Cairo::RefPtr<Cairo::Surface> const& surface, unsigned offset_x, unsigned offset_y, bool show_page)
-      : feature_style_processor<cairo_renderer>(m),
-        m_(m),
-        surface_(surface),
-        context_(Cairo::Context::create(surface)),
+   cairo_renderer_base::cairo_renderer_base(Map const& m, Cairo::RefPtr<Cairo::Context> const& context, unsigned offset_x, unsigned offset_y)
+      : m_(m),
+        context_(context),
         t_(m.getWidth(),m.getHeight(),m.getCurrentExtent(),offset_x,offset_y),
         font_engine_(new freetype_engine()),
@@ -481 +478 @@
       std::clog << "scale=" << m.scale() << "\n";
 #endif
-        this->show_page = show_page;
-   }
-
-   template <typename T>
-   cairo_renderer<T>::~cairo_renderer() {}
-
-   template <typename T>
-   void cairo_renderer<T>::start_map_processing(Map const& map)
+   }
+
+   template <>
+   cairo_renderer<Cairo::Context>::cairo_renderer(Map const& m, Cairo::RefPtr<Cairo::Context> const& context, unsigned offset_x, unsigned offset_y)
+      : feature_style_processor<cairo_renderer>(m),
+        cairo_renderer_base(m,context,offset_x,offset_y)
+   {
+   }
+
+   template <>
+   cairo_renderer<Cairo::Surface>::cairo_renderer(Map const& m, Cairo::RefPtr<Cairo::Surface> const& surface, unsigned offset_x, unsigned offset_y)
+      : feature_style_processor<cairo_renderer>(m),
+        cairo_renderer_base(m,Cairo::Context::create(surface),offset_x,offset_y)
+   {
+   }
+
+   cairo_renderer_base::~cairo_renderer_base() {}
+
+   void cairo_renderer_base::start_map_processing(Map const& map)
    {
 #ifdef MAPNIK_DEBUG
@@ -510 +518 @@
    }
 
-   template <typename T>
-   void cairo_renderer<T>::end_map_processing(Map const& )
+   template <>
+   void cairo_renderer<Cairo::Context>::end_map_processing(Map const& )
    {
 #ifdef MAPNIK_DEBUG
       std::clog << "end map processing\n";
 #endif
-      if (show_page)
-         context_->show_page();
-   }
-
-   template <typename T>
-   void cairo_renderer<T>::start_layer_processing(Layer const& lay)
+   }
+
+   template <>
+   void cairo_renderer<Cairo::Surface>::end_map_processing(Map const& )
+   {
+#ifdef MAPNIK_DEBUG
+      std::clog << "end map processing\n";
+#endif
+      context_->show_page();
+   }
+
+   void cairo_renderer_base::start_layer_processing(Layer const& lay)
    {
 #ifdef MAPNIK_DEBUG
@@ -533 +547 @@
    }
 
-   template <typename T>
-   void cairo_renderer<T>::end_layer_processing(Layer const&)
+   void cairo_renderer_base::end_layer_processing(Layer const&)
    {
 #ifdef MAPNIK_DEBUG
@@ -541 +554 @@
    }
 
-   template <typename T>
-   void cairo_renderer<T>::process(polygon_symbolizer const& sym,
-                                   Feature const& feature,
-                                   proj_transform const& prj_trans)
+   void cairo_renderer_base::process(polygon_symbolizer const& sym,
+                                     Feature const& feature,
+                                     proj_transform const& prj_trans)
    {
       typedef coord_transform2<CoordTransform,geometry2d> path_type;
@@ -574 +586 @@
    }
 
-   template <typename T>
-   void cairo_renderer<T>::process(building_symbolizer const& sym,
-                                   Feature const& feature,
-                                   proj_transform const& prj_trans)
+   void cairo_renderer_base::process(building_symbolizer const& sym,
+                                     Feature const& feature,
+                                     proj_transform const& prj_trans)
    {
       typedef coord_transform2<CoordTransform,geometry2d> path_type;
@@ -678 +689 @@
     }
 
-   template <typename T>
-   void cairo_renderer<T>::process(line_symbolizer const& sym,
-                                   Feature const& feature,
-                                   proj_transform const& prj_trans)
+   void cairo_renderer_base::process(line_symbolizer const& sym,
+                                     Feature const& feature,
+                                     proj_transform const& prj_trans)
    {
       typedef coord_transform2<CoordTransform,geometry2d> path_type;
@@ -714 +724 @@
    }
 
-   template <typename T>
-   void cairo_renderer<T>::process(point_symbolizer const& sym,
-                                   Feature const& feature,
-                                   proj_transform const& prj_trans)
+   void cairo_renderer_base::process(point_symbolizer const& sym,
+                                     Feature const& feature,
+                                     proj_transform const& prj_trans)
    {
       boost::shared_ptr<ImageData32> const& data = sym.get_image();
@@ -756 +765 @@
    }
 
-   template <typename T>
-   void  cairo_renderer<T>::process(shield_symbolizer const& sym,
-                                    Feature const& feature,
-                                    proj_transform const& prj_trans)
+   void cairo_renderer_base::process(shield_symbolizer const& sym,
+                                     Feature const& feature,
+                                     proj_transform const& prj_trans)
    {
       typedef coord_transform2<CoordTransform,geometry2d> path_type;
@@ -862 +870 @@
    }
 
-   template <typename T>
-   void  cairo_renderer<T>::process(line_pattern_symbolizer const& sym,
-                                    Feature const& feature,
-                                    proj_transform const& prj_trans)
+   void cairo_renderer_base::process(line_pattern_symbolizer const& sym,
+                                     Feature const& feature,
+                                     proj_transform const& prj_trans)
    {
       typedef coord_transform2<CoordTransform,geometry2d> path_type;
@@ -929 +936 @@
    }
 
-   template <typename T>
-   void cairo_renderer<T>::process(polygon_pattern_symbolizer const& sym,
-                                   Feature const& feature,
-                                   proj_transform const& prj_trans)
+   void cairo_renderer_base::process(polygon_pattern_symbolizer const& sym,
+                                     Feature const& feature,
+                                     proj_transform const& prj_trans)
    {
       typedef coord_transform2<CoordTransform,geometry2d> path_type;
@@ -956 +962 @@
    }
 
-   template <typename T>
-   void cairo_renderer<T>::process(raster_symbolizer const&,
-                                   Feature const& feature,
-                                   proj_transform const& prj_trans)
+   void cairo_renderer_base::process(raster_symbolizer const&,
+                                     Feature const& feature,
+                                     proj_transform const& prj_trans)
    {
       // TODO -- at the moment raster_symbolizer is an empty class
@@ -976 +981 @@
    }
 
-   template <typename T>
-   void cairo_renderer<T>::process(markers_symbolizer const& sym,
-                                   Feature const& feature,
-                                   proj_transform const& prj_trans)
-   {
-   }
-
-   template <typename T>
-   void cairo_renderer<T>::process(text_symbolizer const& sym,
-                                   Feature const& feature,
-                                   proj_transform const& prj_trans)
+   void cairo_renderer_base::process(markers_symbolizer const& sym,
+                                     Feature const& feature,
+                                     proj_transform const& prj_trans)
+   {
+   }
+
+   void cairo_renderer_base::process(text_symbolizer const& sym,
+                                     Feature const& feature,
+                                     proj_transform const& prj_trans)
    {
       typedef coord_transform2<CoordTransform,geometry2d> path_type;
@@ -1052 +1055 @@
       }
    }
+
    template class cairo_renderer<Cairo::Surface>;
+   template class cairo_renderer<Cairo::Context>;
 }