From e5d1418417ee9c7549865e2018f12f4138f48414 Mon Sep 17 00:00:00 2001 From: XinGang Li Date: Mon, 18 Feb 2013 23:10:36 +0800 Subject: [PATCH] Add missing class declaration for python bindings. --- include/mapnik/formatting/base.hpp | 2 +- include/mapnik/formatting/expression_format.hpp | 2 +- include/mapnik/formatting/format.hpp | 2 +- include/mapnik/formatting/list.hpp | 2 +- include/mapnik/formatting/text.hpp | 2 +- include/mapnik/parse_path.hpp | 4 ++-- include/mapnik/processed_text.hpp | 2 +- include/mapnik/text_placements/base.hpp | 4 ++-- include/mapnik/text_properties.hpp | 4 ++-- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/mapnik/formatting/base.hpp b/include/mapnik/formatting/base.hpp index 327304345..023917326 100644 --- a/include/mapnik/formatting/base.hpp +++ b/include/mapnik/formatting/base.hpp @@ -40,7 +40,7 @@ namespace formatting { class node; typedef boost::shared_ptr node_ptr; -class node +class MAPNIK_DECL node { public: virtual ~node() {} diff --git a/include/mapnik/formatting/expression_format.hpp b/include/mapnik/formatting/expression_format.hpp index cf99747ff..da5f718cf 100644 --- a/include/mapnik/formatting/expression_format.hpp +++ b/include/mapnik/formatting/expression_format.hpp @@ -37,7 +37,7 @@ class xml_node; struct char_properties; namespace formatting { -class expression_format: public node { +class MAPNIK_DECL expression_format: public node { public: void to_xml(boost::property_tree::ptree &xml) const; static node_ptr from_xml(xml_node const& xml); diff --git a/include/mapnik/formatting/format.hpp b/include/mapnik/formatting/format.hpp index 6e634bd87..b22ea6398 100644 --- a/include/mapnik/formatting/format.hpp +++ b/include/mapnik/formatting/format.hpp @@ -32,7 +32,7 @@ namespace mapnik { namespace formatting { -class format_node: public node { +class MAPNIK_DECL format_node: public node { public: void to_xml(boost::property_tree::ptree &xml) const; static node_ptr from_xml(xml_node const& xml); diff --git a/include/mapnik/formatting/list.hpp b/include/mapnik/formatting/list.hpp index 96a49b262..56ab455a1 100644 --- a/include/mapnik/formatting/list.hpp +++ b/include/mapnik/formatting/list.hpp @@ -31,7 +31,7 @@ namespace mapnik { namespace formatting { -class list_node: public node { +class MAPNIK_DECL list_node: public node { public: list_node() : node(), children_() {} virtual void to_xml(boost::property_tree::ptree &xml) const; diff --git a/include/mapnik/formatting/text.hpp b/include/mapnik/formatting/text.hpp index fc5600675..bc63fe102 100644 --- a/include/mapnik/formatting/text.hpp +++ b/include/mapnik/formatting/text.hpp @@ -30,7 +30,7 @@ namespace mapnik { namespace formatting { -class text_node: public node { +class MAPNIK_DECL text_node: public node { public: text_node(expression_ptr text): node(), text_(text) {} text_node(std::string text): node(), text_(parse_expression(text)) {} diff --git a/include/mapnik/parse_path.hpp b/include/mapnik/parse_path.hpp index d260bbf2c..f295d8c77 100644 --- a/include/mapnik/parse_path.hpp +++ b/include/mapnik/parse_path.hpp @@ -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, path_expression_grammar 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 to_string(path_expression const& path); static void collect_attributes(path_expression const& path, std::set& names); }; -typedef mapnik::path_processor path_processor_type; +typedef MAPNIK_DECL mapnik::path_processor path_processor_type; } diff --git a/include/mapnik/processed_text.hpp b/include/mapnik/processed_text.hpp index 5e2c7dc5a..581742520 100644 --- a/include/mapnik/processed_text.hpp +++ b/include/mapnik/processed_text.hpp @@ -37,7 +37,7 @@ namespace mapnik class freetype_engine; template class face_manager; -class processed_text : mapnik::noncopyable +class MAPNIK_DECL processed_text : mapnik::noncopyable { public: class processed_expression diff --git a/include/mapnik/text_placements/base.hpp b/include/mapnik/text_placements/base.hpp index 5fbc5c8fe..99a7f1cd1 100644 --- a/include/mapnik/text_placements/base.hpp +++ b/include/mapnik/text_placements/base.hpp @@ -37,7 +37,7 @@ class MAPNIK_DECL text_placements; * This placement has first to be tested by placement_finder to verify it * can actually be used. */ -class text_placement_info : mapnik::noncopyable +class MAPNIK_DECL text_placement_info : mapnik::noncopyable { public: /** Constructor. Takes the parent text_placements object as a parameter @@ -77,7 +77,7 @@ typedef boost::shared_ptr text_placement_info_ptr; * semantics. Basically this class just makes sure a pointer of the right * class is returned by the get_placement_info call. */ -class text_placements +class MAPNIK_DECL text_placements { public: text_placements(); diff --git a/include/mapnik/text_properties.hpp b/include/mapnik/text_properties.hpp index c21f0654e..bbd7a6e85 100644 --- a/include/mapnik/text_properties.hpp +++ b/include/mapnik/text_properties.hpp @@ -54,7 +54,7 @@ DEFINE_ENUM(text_transform_e, text_transform); typedef std::map fontset_map; -struct char_properties +struct MAPNIK_DECL char_properties { char_properties(); /** Construct object from XML. */ @@ -125,7 +125,7 @@ class processed_text; /** 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(); /** Load all values from XML ptree. */