lessen header interdependence between placement_finder.hpp and symbolizer_helpers.hpp

include/mapnik/placement_finder.hpp

@@ -27,8 +27,7 @@
 #include <mapnik/geometry.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/text_properties.hpp>
-//#include <mapnik/text_placements/base.hpp>
-#include <mapnik/symbolizer_helpers.hpp>
+#include <mapnik/text_path.hpp>
 #include <mapnik/label_collision_detector.hpp>
 #include <mapnik/ctrans.hpp>
 #include <mapnik/noncopyable.hpp>

include/mapnik/symbolizer_helpers.hpp

@@ -28,6 +28,7 @@
 #include <mapnik/feature.hpp>
 #include <mapnik/marker_cache.hpp>
 #include <mapnik/processed_text.hpp>
+#include <mapnik/text_path.hpp>
 
 //boost
 #include <boost/scoped_ptr.hpp>
@@ -47,10 +48,7 @@ namespace mapnik {
 
 namespace mapnik {
 
-typedef boost::ptr_vector<text_path> placements_type;
-template <typename DetectorT> class placement_finder;
-
-/** Helper object that does all the TextSymbolizer placment finding
+/** Helper object that does all the TextSymbolizer placement finding
  * work except actually rendering the object. */
 template <typename FaceManagerT, typename DetectorT>
 class text_symbolizer_helper

include/mapnik/text_path.hpp

@@ -34,6 +34,8 @@
 
 // boost
 #include <boost/shared_ptr.hpp>
+#include <boost/ptr_container/ptr_vector.hpp>
+
 
 namespace mapnik
 {
@@ -196,6 +198,8 @@ public:
 };
 
 typedef boost::shared_ptr<text_path> text_path_ptr;
+typedef boost::ptr_vector<text_path> placements_type;
+
 }
 
 #endif // MAPNIK_TEXT_PATH_HPP

src/placement_finder.cpp

@@ -34,7 +34,6 @@
 
 // boost
 #include <boost/shared_ptr.hpp>
-#include <boost/ptr_container/ptr_vector.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/foreach.hpp>