Merge branch 'master' of https://github.com/mapnik/mapnik

bindings/python/mapnik_markers_symbolizer.cpp

@@ -72,16 +72,6 @@ void set_marker_type(mapnik::markers_symbolizer & symbolizer, std::string const&
 
 }
 
-
-// https://github.com/mapnik/mapnik/issues/1367
-PyObject* get_fill_opacity_impl(markers_symbolizer & sym)
-{
-    boost::optional<float> fill_opacity = sym.get_fill_opacity();
-    if (fill_opacity)
-        return ::PyFloat_FromDouble(*fill_opacity);
-    Py_RETURN_NONE;
-}
-
 void export_markers_symbolizer()
 {
     using namespace boost::python;

bindings/python/python_optional.hpp

@@ -23,6 +23,8 @@
 #include <boost/optional/optional.hpp>
 #include <boost/python.hpp>
 
+#include <mapnik/noncopyable.hpp>
+
 // boost::optional<T> to/from converter from John Wiegley
 
 template <typename T, typename TfromPy>