Merge commit '20fcdc80348f4f44944a1eeeabacd021aa051288' into harfbuzz

Conflicts:
	include/mapnik/font_engine_freetype.hpp
	src/agg/process_shield_symbolizer.cpp
	src/font_engine_freetype.cpp
	src/grid/process_shield_symbolizer.cpp
	src/symbolizer_helpers.cpp

include/mapnik/cairo_renderer.hpp

@@ -36,6 +36,7 @@
 #include <mapnik/rule.hpp> // for all symbolizers
 #include <mapnik/noncopyable.hpp>
 #include <mapnik/cairo_context.hpp>
+#include <mapnik/pixel_position.hpp>
 
 // cairo
 #include <cairo.h>

include/mapnik/font_engine_freetype.hpp

@@ -25,11 +25,13 @@
 
 // mapnik
 #include <mapnik/config.hpp>
+#include <mapnik/box2d.hpp>
 #include <mapnik/font_set.hpp>
 #include <mapnik/text/face.hpp>
 #include <mapnik/text_symbolizer.hpp>
 #include <mapnik/noncopyable.hpp>
 #include <mapnik/value_types.hpp>
+#include <mapnik/pixel_position.hpp>
 
 // freetype2
 extern "C"
@@ -53,6 +55,7 @@ extern "C"
 
 namespace mapnik
 {
+struct char_properties;
     typedef std::vector<face_ptr> container_type;
     typedef container_type::size_type size_type;
 

src/agg/agg_renderer.cpp

@@ -40,6 +40,7 @@
 #include <mapnik/svg/svg_converter.hpp>
 #include <mapnik/svg/svg_renderer_agg.hpp>
 #include <mapnik/svg/svg_path_adapter.hpp>
+#include <mapnik/pixel_position.hpp>
 
 #include <mapnik/image_compositing.hpp>
 #include <mapnik/image_filter.hpp>

src/agg/process_point_symbolizer.cpp

@@ -32,6 +32,8 @@
 #include <mapnik/marker_cache.hpp>
 #include <mapnik/label_collision_detector.hpp>
 #include <mapnik/parse_path.hpp>
+#include <mapnik/pixel_position.hpp>
+
 
 // agg
 #include "agg_trans_affine.h"

src/agg/process_shield_symbolizer.cpp

@@ -26,6 +26,7 @@
 #include <mapnik/graphics.hpp>
 #include <mapnik/text/symbolizer_helpers.hpp>
 #include <mapnik/text/renderer.hpp>
+#include <mapnik/pixel_position.hpp>
 
 namespace mapnik {
 

src/cairo_renderer.cpp

@@ -52,6 +52,7 @@
 #include <mapnik/vertex_converters.hpp>
 #include <mapnik/marker_helpers.hpp>
 #include <mapnik/noncopyable.hpp>
+#include <mapnik/pixel_position.hpp>
 
 // cairo
 #include <cairo.h>

src/font_engine_freetype.cpp

@@ -23,6 +23,8 @@
 // mapnik
 #include <mapnik/debug.hpp>
 #include <mapnik/font_engine_freetype.hpp>
+#include <mapnik/pixel_position.hpp>
+
 
 // boost
 #include <boost/algorithm/string.hpp>

src/grid/grid_renderer.cpp

@@ -43,6 +43,7 @@
 #include <mapnik/svg/svg_converter.hpp>
 #include <mapnik/svg/svg_renderer_agg.hpp>
 #include <mapnik/svg/svg_path_adapter.hpp>
+#include <mapnik/pixel_position.hpp>
 
 // boost
 #include <boost/utility.hpp>

src/grid/process_point_symbolizer.cpp

@@ -33,6 +33,7 @@
 #include <mapnik/marker.hpp>
 #include <mapnik/marker_cache.hpp>
 #include <mapnik/parse_path.hpp>
+#include <mapnik/pixel_position.hpp>
 
 // agg
 #include "agg_trans_affine.h"

src/grid/process_shield_symbolizer.cpp

@@ -27,6 +27,7 @@
 #include <mapnik/grid/grid_renderer_base.hpp>
 #include <mapnik/text/symbolizer_helpers.hpp>
 #include <mapnik/text/renderer.hpp>
+#include <mapnik/pixel_position.hpp>
 
 // agg
 #include "agg_trans_affine.h"