sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lessen header interdependence between placement_finder.hpp and symbolizer_helpers.hpp

Browse source
This commit is contained in:
Dane Springmeyer 2013-09-23 11:42:47 -07:00
parent a1bf65210d
commit 63f97fa4aa
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/mapnik/placement_finder.hpp
View file

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

6
include/mapnik/symbolizer_helpers.hpp
View file

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

4
include/mapnik/text_path.hpp
View file

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

1
src/placement_finder.cpp
View file

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