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

Merge commit '7aab2bca4f6b6d9293181c5d3224284b802617c6' into harfbuzz

Browse source 
Conflicts:
	include/mapnik/processed_text.hpp
	include/mapnik/symbolizer_helpers.hpp
This commit is contained in:
Hermann Kraus 2013-03-16 15:44:42 +01:00
commit 3709747329
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/processed_text.cpp
View file

@ -22,6 +22,7 @@
#include <mapnik/processed_text.hpp> #include <mapnik/processed_text.hpp>
#include <mapnik/config_error.hpp> #include <mapnik/config_error.hpp>
#include <mapnik/font_engine_freetype.hpp>
namespace mapnik namespace mapnik
{ {

3
src/text/formatting/text.cpp
View file

@ -33,13 +33,14 @@
// boost // boost
#include <boost/property_tree/ptree.hpp> #include <boost/property_tree/ptree.hpp>
#include <boost/make_shared.hpp>
namespace mapnik namespace mapnik
{ {
namespace formatting namespace formatting
{ {
using boost::property_tree::ptree;
using boost::property_tree::ptree;
void text_node::to_xml(ptree &xml) const void text_node::to_xml(ptree &xml) const
{ {