From 7cfdfde247ed9555d2a6ff08382249189f36cda8 Mon Sep 17 00:00:00 2001 From: artemp Date: Tue, 7 Aug 2012 15:43:40 +0100 Subject: [PATCH] + call Py_RETURN_NONE macro to properly handle returning Py_None (http://docs.python.org/c-api/none.html) - thanks, @lightmare! --- bindings/python/mapnik_geometry.cpp | 4 ++-- bindings/python/mapnik_markers_symbolizer.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bindings/python/mapnik_geometry.cpp b/bindings/python/mapnik_geometry.cpp index dd8bad47c..9369af058 100644 --- a/bindings/python/mapnik_geometry.cpp +++ b/bindings/python/mapnik_geometry.cpp @@ -105,7 +105,7 @@ PyObject* to_wkb( geometry_type const& geom, mapnik::util::wkbByteOrder byte_ord } else { - return Py_None; + Py_RETURN_NONE; } } #else @@ -133,7 +133,7 @@ PyObject* to_wkb2( path_type const& p, mapnik::util::wkbByteOrder byte_order) } else { - return Py_None; + Py_RETURN_NONE; } } #else diff --git a/bindings/python/mapnik_markers_symbolizer.cpp b/bindings/python/mapnik_markers_symbolizer.cpp index e661714df..9eefef2d7 100644 --- a/bindings/python/mapnik_markers_symbolizer.cpp +++ b/bindings/python/mapnik_markers_symbolizer.cpp @@ -91,7 +91,7 @@ PyObject* get_fill_opacity_impl(markers_symbolizer & sym) boost::optional fill_opacity = sym.get_fill_opacity(); if (fill_opacity) return ::PyFloat_FromDouble(*fill_opacity); - return Py_None; + Py_RETURN_NONE; } void export_markers_symbolizer()