From: Hamdi Sahloul <hamdisahloul@hotmail.com>
Date: Fri, 10 Mar 2017 13:09:31 +0000 (+0900)
Subject: Accept default argument of FLANN index parameters
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~1146^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=db5284154456c03943575376a41538300a382715;p=platform%2Fupstream%2Fopencv.git

Accept default argument of FLANN index parameters
---

diff --git a/modules/flann/misc/python/pyopencv_flann.hpp b/modules/flann/misc/python/pyopencv_flann.hpp
index a9da8d0..6591b90 100644
--- 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) ) {