Return figure number from figure function

alexdewar · Benno Evers · commit dcb23221b2be · 2019-01-11T19:42:26.000+01:00
diff --git a/matplotlibcpp.h b/matplotlibcpp.h
@@ -816,12 +816,20 @@ void text(Numeric x, Numeric y, const std::string& s = "")
 }
 
 
-inline void figure()
+inline long figure()
 {
     PyObject* res = PyObject_CallObject(detail::_interpreter::get().s_python_function_figure, detail::_interpreter::get().s_python_empty_tuple);
     if(!res) throw std::runtime_error("Call to figure() failed.");
 
+    PyObject* num = PyObject_GetAttrString(res, "number");
+    if (!num) throw std::runtime_error("Could not get number attribute of figure object");
+
+    const long figureNumber = PyLong_AsLong(num);
+
+    Py_DECREF(num);
     Py_DECREF(res);
+
+    return figureNumber;
 }
 
 inline void figure_size(size_t w, size_t h)

Original file line number	Diff line number	Diff line change
`@@ -816,12 +816,20 @@ void text(Numeric x, Numeric y, const std::string& s = "")`
`816`	`816`	`}`
`817`	`817`
`818`	`818`
`819`		`-inline void figure()`
	`819`	`+inline long figure()`
`820`	`820`	`{`
`821`	`821`	`PyObject* res = PyObject_CallObject(detail::_interpreter::get().s_python_function_figure, detail::_interpreter::get().s_python_empty_tuple);`
`822`	`822`	`if(!res) throw std::runtime_error("Call to figure() failed.");`
`823`	`823`
	`824`	`+ PyObject* num = PyObject_GetAttrString(res, "number");`
	`825`	`+ if (!num) throw std::runtime_error("Could not get number attribute of figure object");`
	`826`	`+`
	`827`	`+ const long figureNumber = PyLong_AsLong(num);`
	`828`	`+`
	`829`	`+ Py_DECREF(num);`
`824`	`830`	`Py_DECREF(res);`
	`831`	`+`
	`832`	`+ return figureNumber;`
`825`	`833`	`}`
`826`	`834`
`827`	`835`	`inline void figure_size(size_t w, size_t h)`