From 2d7c7fed9bafca3532d01c5c66b0aca8d66c4856 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Fri, 4 Jan 2013 09:17:58 -0800
Subject: [PATCH] use more forward declares in renderer headers to speed up
 compiles of process cpp files

---
 include/mapnik/agg_renderer.hpp            | 36 +++++++++++-----------
 include/mapnik/grid/grid_renderer.hpp      | 30 +++++++++---------
 include/mapnik/svg/output/svg_renderer.hpp | 24 ++++++++++++++-
 3 files changed, 57 insertions(+), 33 deletions(-)

diff --git a/include/mapnik/agg_renderer.hpp b/include/mapnik/agg_renderer.hpp
index 5f6d36e0f..27e5be3b1 100644
--- a/include/mapnik/agg_renderer.hpp
+++ b/include/mapnik/agg_renderer.hpp
@@ -24,33 +24,33 @@
 #define MAPNIK_AGG_RENDERER_HPP
 
 // mapnik
-#include <mapnik/config.hpp>
+#include <mapnik/config.hpp>            // for MAPNIK_DECL
 #include <mapnik/feature_style_processor.hpp>
-#include <mapnik/font_engine_freetype.hpp>
-#include <mapnik/label_collision_detector.hpp>
-#include <mapnik/map.hpp>
-#include <mapnik/rule.hpp> // for all symbolizers
-#include <mapnik/noncopyable.hpp>
+#include <mapnik/font_engine_freetype.hpp>  // for face_manager, etc
+#include <mapnik/noncopyable.hpp>       // for noncopyable
+#include <mapnik/rule.hpp>              // for rule, symbolizers
+#include <mapnik/box2d.hpp>     // for box2d
+#include <mapnik/color.hpp>     // for color
+#include <mapnik/ctrans.hpp>    // for CoordTransform
+#include <mapnik/image_compositing.hpp>  // for composite_mode_e
 
 // boost
 #include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/optional.hpp>
 
-// FIXME
-// forward declare so that
-// apps using mapnik do not
-// need agg headers
-namespace agg {
-struct trans_affine;
-}
+namespace agg { struct trans_affine; }
+namespace mapnik { class Map; }
+namespace mapnik { class feature_impl; }
+namespace mapnik { class feature_type_style; }
+namespace mapnik { class label_collision_detector4; }
+namespace mapnik { class layer; }
+namespace mapnik { class marker; }
+namespace mapnik { class proj_transform; }
+namespace mapnik { struct rasterizer; }
+struct pixel_position;
 
 namespace mapnik {
 
-class marker;
-
-struct rasterizer;
-
 template <typename T>
 class MAPNIK_DECL agg_renderer : public feature_style_processor<agg_renderer<T> >,
                                  private mapnik::noncopyable
diff --git a/include/mapnik/grid/grid_renderer.hpp b/include/mapnik/grid/grid_renderer.hpp
index bc9c03885..4e23b18d1 100644
--- a/include/mapnik/grid/grid_renderer.hpp
+++ b/include/mapnik/grid/grid_renderer.hpp
@@ -27,29 +27,31 @@
 #include <mapnik/config.hpp>
 #include <mapnik/feature_style_processor.hpp>
 #include <mapnik/font_engine_freetype.hpp>
-#include <mapnik/label_collision_detector.hpp>
-#include <mapnik/map.hpp>
-#include <mapnik/rule.hpp> // for all symbolizers
 #include <mapnik/grid/grid.hpp>
 #include <mapnik/noncopyable.hpp>
+#include <mapnik/rule.hpp>              // for rule, symbolizers
+#include <mapnik/box2d.hpp>     // for box2d
+#include <mapnik/color.hpp>     // for color
+#include <mapnik/ctrans.hpp>    // for CoordTransform
+#include <mapnik/image_compositing.hpp>  // for composite_mode_e
 
 // boost
 #include <boost/scoped_ptr.hpp>
+#include <boost/shared_ptr.hpp>
 
-// FIXME
-// forward declare so that
-// apps using mapnik do not
-// need agg headers
-namespace agg {
-struct trans_affine;
-}
+namespace agg { struct trans_affine; }
+namespace mapnik { class Map; }
+namespace mapnik { class feature_impl; }
+namespace mapnik { class feature_type_style; }
+namespace mapnik { class label_collision_detector4; }
+namespace mapnik { class layer; }
+namespace mapnik { class marker; }
+namespace mapnik { class proj_transform; }
+namespace mapnik { struct grid_rasterizer; }
+struct pixel_position;
 
 namespace mapnik {
 
-class marker;
-
-struct grid_rasterizer;
-
 template <typename T>
 class MAPNIK_DECL grid_renderer : public feature_style_processor<grid_renderer<T> >,
                                   private mapnik::noncopyable
diff --git a/include/mapnik/svg/output/svg_renderer.hpp b/include/mapnik/svg/output/svg_renderer.hpp
index 0461fb909..d2d82b12d 100644
--- a/include/mapnik/svg/output/svg_renderer.hpp
+++ b/include/mapnik/svg/output/svg_renderer.hpp
@@ -24,15 +24,37 @@
 #define MAPNIK_SVG_RENDERER_HPP
 
 // mapnik
+#include <mapnik/config.hpp>
 #include <mapnik/feature_style_processor.hpp>
-#include <mapnik/map.hpp>
+#include <mapnik/font_engine_freetype.hpp>
 #include <mapnik/svg/output/svg_generator.hpp>
 #include <mapnik/svg/output/svg_output_attributes.hpp>
 #include <mapnik/noncopyable.hpp>
+#include <mapnik/rule.hpp>              // for rule, symbolizers
+#include <mapnik/box2d.hpp>     // for box2d
+#include <mapnik/color.hpp>     // for color
+#include <mapnik/ctrans.hpp>    // for CoordTransform
+#include <mapnik/image_compositing.hpp>  // for composite_mode_e
+
+// boost
+#include <boost/scoped_ptr.hpp>
+#include <boost/shared_ptr.hpp>
 
 // stl
 #include <string>
 
+namespace agg { struct trans_affine; }
+namespace mapnik { class Map; }
+namespace mapnik { class feature_impl; }
+namespace mapnik { class feature_type_style; }
+namespace mapnik { class label_collision_detector4; }
+namespace mapnik { class layer; }
+namespace mapnik { class marker; }
+namespace mapnik { class proj_transform; }
+namespace mapnik { struct grid_rasterizer; }
+struct pixel_position;
+
+
 namespace mapnik
 {
 // parameterized with the type of output iterator it will use for output.