From d5c9fea7b642e3a61c71d430e322e3185bbb38fd Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Thu, 16 May 2013 20:31:28 +0100
Subject: [PATCH 1/2] + remove redundant work-around

---
 bindings/python/mapnik_markers_symbolizer.cpp | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/bindings/python/mapnik_markers_symbolizer.cpp b/bindings/python/mapnik_markers_symbolizer.cpp
index cfe06efce..200c44959 100644
--- a/bindings/python/mapnik_markers_symbolizer.cpp
+++ b/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;

From b6a937e93db57c4fec9190ae6d30ff6476905927 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Thu, 16 May 2013 12:47:36 -0700
Subject: [PATCH 2/2] iwyu

---
 bindings/python/python_optional.hpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bindings/python/python_optional.hpp b/bindings/python/python_optional.hpp
index 4af5db7e5..348006949 100644
--- a/bindings/python/python_optional.hpp
+++ b/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>