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

Merge commit 'e5d1418417ee9c7549865e2018f12f4138f48414' into harfbuzz

Browse source 
Conflicts:
	include/mapnik/processed_text.hpp
This commit is contained in:
Hermann Kraus 2013-03-16 17:41:56 +01:00
commit f9f01a4c5c
8 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/mapnik/parse_path.hpp
View file

@ -41,14 +41,14 @@ MAPNIK_DECL path_expression_ptr parse_path(std::string const & str);
MAPNIK_DECL path_expression_ptr parse_path(std::string const & str, MAPNIK_DECL path_expression_ptr parse_path(std::string const & str,
path_expression_grammar<std::string::const_iterator> const& g); path_expression_grammar<std::string::const_iterator> const& g);
struct path_processor struct MAPNIK_DECL path_processor
{ {
static std::string evaluate(path_expression const& path, feature_impl const& f); static std::string evaluate(path_expression const& path, feature_impl const& f);
static std::string to_string(path_expression const& path); static std::string to_string(path_expression const& path);
static void collect_attributes(path_expression const& path, std::set<std::string>& names); static void collect_attributes(path_expression const& path, std::set<std::string>& names);
}; };
typedef mapnik::path_processor path_processor_type; typedef MAPNIK_DECL mapnik::path_processor path_processor_type;
} }

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

@ -40,7 +40,7 @@ namespace formatting {
class node; class node;
typedef boost::shared_ptr<node> node_ptr; typedef boost::shared_ptr<node> node_ptr;
class node class MAPNIK_DECL node
{ {
public: public:
virtual ~node() {} virtual ~node() {}

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

@ -37,7 +37,7 @@ class xml_node;
struct char_properties; struct char_properties;
namespace formatting { namespace formatting {
class expression_format: public node { class MAPNIK_DECL expression_format: public node {
public: public:
void to_xml(boost::property_tree::ptree &xml) const; void to_xml(boost::property_tree::ptree &xml) const;
static node_ptr from_xml(xml_node const& xml); static node_ptr from_xml(xml_node const& xml);

2
include/mapnik/text/formatting/format.hpp
View file

@ -32,7 +32,7 @@
namespace mapnik { namespace mapnik {
namespace formatting { namespace formatting {
class format_node: public node { class MAPNIK_DECL format_node: public node {
public: public:
void to_xml(boost::property_tree::ptree &xml) const; void to_xml(boost::property_tree::ptree &xml) const;
static node_ptr from_xml(xml_node const& xml); static node_ptr from_xml(xml_node const& xml);

2
include/mapnik/text/formatting/list.hpp
View file

@ -31,7 +31,7 @@
namespace mapnik { namespace mapnik {
namespace formatting { namespace formatting {
class list_node: public node { class MAPNIK_DECL list_node: public node {
public: public:
list_node() : node(), children_() {} list_node() : node(), children_() {}
virtual void to_xml(boost::property_tree::ptree &xml) const; virtual void to_xml(boost::property_tree::ptree &xml) const;

2
include/mapnik/text/formatting/text.hpp
View file

@ -30,7 +30,7 @@
namespace mapnik { namespace mapnik {
namespace formatting { namespace formatting {
class text_node: public node { class MAPNIK_DECL text_node: public node {
public: public:
text_node(expression_ptr text): node(), text_(text) {} text_node(expression_ptr text): node(), text_(text) {}
text_node(std::string text): node(), text_(parse_expression(text)) {} text_node(std::string text): node(), text_(parse_expression(text)) {}

4
include/mapnik/text/placements/base.hpp
View file

@ -37,7 +37,7 @@ class MAPNIK_DECL text_placements;
* This placement has first to be tested by placement_finder to verify it * This placement has first to be tested by placement_finder to verify it
* can actually be used. * can actually be used.
*/ */
class text_placement_info : mapnik::noncopyable class MAPNIK_DECL text_placement_info : mapnik::noncopyable
{ {
public: public:
/** Constructor. Takes the parent text_placements object as a parameter /** Constructor. Takes the parent text_placements object as a parameter
@ -68,7 +68,7 @@ typedef boost::shared_ptr<text_placement_info> text_placement_info_ptr;
* semantics. Basically this class just makes sure a pointer of the right * semantics. Basically this class just makes sure a pointer of the right
* class is returned by the get_placement_info call. * class is returned by the get_placement_info call.
*/ */
class text_placements class MAPNIK_DECL text_placements
{ {
public: public:
text_placements(); text_placements();

4
include/mapnik/text/text_properties.hpp
View file

@ -57,7 +57,7 @@ DEFINE_ENUM(text_transform_e, text_transform);
typedef std::map<std::string, font_set> fontset_map; typedef std::map<std::string, font_set> fontset_map;
struct char_properties struct MAPNIK_DECL char_properties
{ {
char_properties(); char_properties();
/** Construct object from XML. */ /** Construct object from XML. */
@ -135,7 +135,7 @@ class text_layout;
/** Contains all text symbolizer properties which are not directly related to text formatting. */ /** Contains all text symbolizer properties which are not directly related to text formatting. */
struct text_symbolizer_properties struct MAPNIK_DECL text_symbolizer_properties
{ {
text_symbolizer_properties(); text_symbolizer_properties();
/** Load all values from XML ptree. */ /** Load all values from XML ptree. */