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

Merge commit 'ba6f3cf2caf46d967b49ac4a301b985d2a5761e9' into harfbuzz

Browse source 
Conflicts:
	include/mapnik/symbolizer_helpers.hpp
	src/symbolizer_helpers.cpp
This commit is contained in:
Hermann Kraus 2013-03-16 16:12:19 +01:00
commit c3de3398ca
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/mapnik/symbolizer.hpp
View file

@ -30,9 +30,12 @@
#include <mapnik/simplify.hpp> #include <mapnik/simplify.hpp>
// boost // boost
#include <boost/array.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
// stl
#include <vector>
#include <string>
namespace agg { struct trans_affine; } namespace agg { struct trans_affine; }
namespace mapnik namespace mapnik
@ -44,7 +47,6 @@ namespace detail { struct transform_node; }
typedef std::vector<detail::transform_node> transform_list; typedef std::vector<detail::transform_node> transform_list;
typedef boost::shared_ptr<transform_list> transform_list_ptr; typedef boost::shared_ptr<transform_list> transform_list_ptr;
typedef transform_list_ptr transform_type; typedef transform_list_ptr transform_type;
class Map;
class feature_impl; class feature_impl;
MAPNIK_DECL void evaluate_transform(agg::trans_affine& tr, feature_impl const& feature, MAPNIK_DECL void evaluate_transform(agg::trans_affine& tr, feature_impl const& feature,

1
src/symbolizer.cpp
View file

@ -23,7 +23,6 @@
//mapnik //mapnik
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>
#include <mapnik/symbolizer.hpp> #include <mapnik/symbolizer.hpp>
#include <mapnik/map.hpp>
#include <mapnik/transform_processor.hpp> #include <mapnik/transform_processor.hpp>
#include <mapnik/metawriter.hpp> #include <mapnik/metawriter.hpp>