Added clf function and fixed mistakes due to the way PyTuple_SetItem steals references.

tustvold · tustvold · commit 9bb5a53c7ed9 · 2017-01-20T11:30:54.000Z
diff --git a/matplotlibcpp.h b/matplotlibcpp.h
@@ -32,6 +32,7 @@ namespace matplotlibcpp {
             PyObject *s_python_function_xlabel;
             PyObject *s_python_function_ylabel;
             PyObject *s_python_function_grid;
+            PyObject *s_python_function_clf;
             PyObject *s_python_empty_tuple;
             PyObject *s_python_function_annotate;
 
@@ -79,6 +80,7 @@ namespace matplotlibcpp {
                 s_python_function_xlim = PyObject_GetAttrString(pymod, "xlim");
                 s_python_function_save = PyObject_GetAttrString(pylabmod, "savefig");
                 s_python_function_annotate = PyObject_GetAttrString(pymod, "annotate");
+                s_python_function_clf = PyObject_GetAttrString(pymod, "clf");
 
                 if (!s_python_function_show
                     || !s_python_function_figure
@@ -93,6 +95,7 @@ namespace matplotlibcpp {
                     || !s_python_function_grid
                     || !s_python_function_xlim
                     || !s_python_function_save
+                    || !s_python_function_clf
                     || !s_python_function_annotate
                         ) { throw std::runtime_error("Couldn't find required function!"); }
 
@@ -110,6 +113,7 @@ namespace matplotlibcpp {
                     || !PyFunction_Check(s_python_function_grid)
                     || !PyFunction_Check(s_python_function_xlim)
                     || !PyFunction_Check(s_python_function_save)
+                    || !PyFunction_Check(s_python_function_clf)
                         ) { throw std::runtime_error("Python object is unexpectedly not a PyFunction."); }
 
                 s_python_empty_tuple = PyTuple_New(0);
@@ -163,9 +167,6 @@ namespace matplotlibcpp {
         PyTuple_SetItem(args, 0, xlist);
         PyTuple_SetItem(args, 1, ylist);
 
-        Py_DECREF(xlist);
-        Py_DECREF(ylist);
-
         // construct keyword args
         PyObject *kwargs = PyDict_New();
         for (std::map<std::string, std::string>::const_iterator it = keywords.begin(); it != keywords.end(); ++it) {
@@ -492,11 +493,18 @@ namespace matplotlibcpp {
         PyObject *res = PyObject_CallObject(detail::_interpreter::get().s_python_function_save, args);
         if (!res) throw std::runtime_error("Call to save() failed.");
 
-        Py_DECREF(pyfilename);
         Py_DECREF(args);
         Py_DECREF(res);
     }
 
+    inline void clf() {
+        PyObject *res = PyObject_CallObject(detail::_interpreter::get().s_python_function_clf,
+                                            detail::_interpreter::get().s_python_empty_tuple);
+        if (!res) throw std::runtime_error("Call to clf() failed.");
+
+        Py_DECREF(res);
+    }
+
 #if __cplusplus > 199711L
     // C++11-exclusive content starts here (variadic plot() and initializer list support)
 
@@ -577,8 +585,6 @@ namespace matplotlibcpp {
 
                 PyObject *res = PyObject_CallObject(detail::_interpreter::get().s_python_function_plot, plot_args);
 
-                Py_DECREF(xlist);
-                Py_DECREF(ylist);
                 Py_DECREF(plot_args);
                 if (res) Py_DECREF(res);
 
