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

Merge commit '3149c8db3d4fa0e536d18b8c189d7d6d96e1f1f7' into harfbuzz

Browse source 
Conflicts:
	include/mapnik/text/formatting/base.hpp
	src/text/formatting/expression.cpp
This commit is contained in:
Hermann Kraus 2013-03-16 16:15:42 +01:00
commit 495bad25b6
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/mapnik/text/formatting/base.hpp
View file

@ -23,10 +23,8 @@
#define FORMATTING_BASE_HPP
// mapnik
#include <mapnik/feature.hpp>
#include <mapnik/expression.hpp>
#include <mapnik/text/char_properties_ptr.hpp>
#include <mapnik/feature.hpp>
// boost
#include <boost/property_tree/ptree_fwd.hpp>
@ -34,6 +32,7 @@
namespace mapnik {
class text_layout;
class feature_impl;
class xml_node;
namespace formatting {

7
include/mapnik/text/formatting/expression_format.hpp
View file

@ -25,12 +25,17 @@
#include <mapnik/text/formatting/base.hpp>
#include <mapnik/expression.hpp>
#include <mapnik/feature.hpp>
// boost
#include <boost/property_tree/ptree_fwd.hpp>
namespace mapnik {
class feature_impl;
class processed_text;
class xml_node;
struct char_properties;
namespace formatting {
class expression_format: public node {
public:

2
src/text/formatting/expression.cpp
View file

@ -82,7 +82,7 @@ expression_ptr expression_format::get_expression(xml_node const& xml, std::strin
}
void expression_format::apply(char_properties_ptr p, const feature_impl &feature, text_layout &output) const
void expression_format::apply(char_properties_ptr p, feature_impl const& feature, text_layout &output) const
{
char_properties_ptr new_properties = boost::make_shared<char_properties>(*p);
if (face_name) new_properties->face_name =