Merge pull request #8346 from Sahloul:fixes/python_wrapper/flann

8 years ago · 08c6ffaa8d
parent da0188acc0 db52841544
commit 08c6ffaa8d
1 changed files with 3 additions and 0 deletions
--- a/modules/flann/misc/python/pyopencv_flann.hpp
+++ b/modules/flann/misc/python/pyopencv_flann.hpp
@ -23,6 +23,9 @@ bool pyopencv_to(PyObject *o, cv::flann::IndexParams& p, const char *name)
    PyObject* item = NULL;
    Py_ssize_t pos = 0;

+    if (!o || o == Py_None)
+        return true;
+
    if(PyDict_Check(o)) {
        while(PyDict_Next(o, &pos, &key, &item)) {
            if( !PyString_Check(key) ) {