Merge commit '70ef017f8ccbd2120b02fc7556808e541bc479a5' into harfbuzz

include/mapnik/attribute_collector.hpp

@@ -37,6 +37,7 @@
 #include <mapnik/shield_symbolizer.hpp>
 #include <mapnik/text_symbolizer.hpp>
 #include <mapnik/markers_symbolizer.hpp>
+#include <mapnik/rule.hpp> // for rule::symbolizers
 #include <mapnik/expression.hpp>  // for expression_ptr, etc
 #include <mapnik/expression_node.hpp>
 #include <mapnik/parse_path.hpp>  // for path_processor_type

include/mapnik/image_filter_types.hpp

@@ -26,9 +26,10 @@
 // boost
 #include <boost/variant.hpp>
 #include <boost/config/warning_disable.hpp>
-#include <boost/spirit/include/karma.hpp>
+
 // stl
 #include <iostream>
+#include <vector>
 
 namespace mapnik { namespace filter {
 
@@ -121,36 +122,9 @@ inline std::ostream& operator<< (std::ostream& os, invert)
     return os;
 }
 
-template <typename Out>
-struct to_string_visitor : boost::static_visitor<void>
-{
-    to_string_visitor(Out & out)
-    : out_(out) {}
+inline std::ostream& operator<< (std::ostream& os, filter_type const& filter);
 
-    template <typename T>
-    void operator () (T const& filter_tag)
-    {
-        out_ << filter_tag;
-    }
-
-    Out & out_;
-};
-
-inline std::ostream& operator<< (std::ostream& os, filter_type const& filter)
-{
-    to_string_visitor<std::ostream> visitor(os);
-    boost::apply_visitor(visitor, filter);
-    return os;
-}
-
-template <typename OutputIterator, typename Container>
-bool generate_image_filters(OutputIterator& sink, Container const& v)
-{
-    using boost::spirit::karma::stream;
-    using boost::spirit::karma::generate;
-    bool r = generate(sink, stream % ' ', v);
-    return r;
-}
+bool generate_image_filters(std::back_insert_iterator<std::string> & sink, std::vector<filter_type> const& v);
 
 }}
 

src/build.py

@@ -100,6 +100,7 @@ else: # unix, non-macos
 
 source = Split(
     """
+    image_filter_types.cpp
     miniz_png.cpp
     color.cpp
     css_color_grammar.cpp

src/image_filter_types.cpp

@@ -0,0 +1,66 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2012 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+// mapnik
+#include <mapnik/image_filter_types.hpp>
+
+// boost
+#include <boost/spirit/include/karma.hpp>
+#include <boost/variant.hpp>
+
+// stl
+#include <vector>
+
+namespace mapnik {
+
+namespace filter {
+
+template <typename Out>
+struct to_string_visitor : boost::static_visitor<void>
+{
+    to_string_visitor(Out & out)
+    : out_(out) {}
+
+    template <typename T>
+    void operator () (T const& filter_tag)
+    {
+        out_ << filter_tag;
+    }
+
+    Out & out_;
+};
+
+inline std::ostream& operator<< (std::ostream& os, filter_type const& filter)
+{
+    to_string_visitor<std::ostream> visitor(os);
+    boost::apply_visitor(visitor, filter);
+    return os;
+}
+
+bool generate_image_filters(std::back_insert_iterator<std::string>& sink, std::vector<filter_type> const& filters)
+{
+    using boost::spirit::karma::stream;
+    using boost::spirit::karma::generate;
+    bool r = generate(sink, stream % ' ', filters);
+    return r;
+}
+
+}}

tests/cpp_tests/svg_renderer_tests/path_element_test.cpp

@@ -11,6 +11,8 @@
 
 // mapnik
 #include <mapnik/map.hpp>
+#include <mapnik/rule.hpp>
+#include <mapnik/feature_type_style.hpp>
 #include <mapnik/svg/output/svg_renderer.hpp>
 #include <mapnik/datasource_cache.hpp>
 #include <mapnik/font_engine_freetype.hpp>