Merge pull request #6882 from ilya-lavrenov:flann

2016-07-12 10:49:17 +00:00 · 2016-07-12 10:49:17 +00:00 · 3590c3c48e
commit 3590c3c48e
parent 6c6badb6a6 bcc9010630
1 changed files with 13 additions and 1 deletions
--- a/modules/flann/src/miniflann.cpp
+++ b/modules/flann/src/miniflann.cpp
@ -318,7 +318,19 @@ buildIndex_(void*& index, const Mat& data, const IndexParams& params, const Dist

    ::cvflann::Matrix<ElementType> dataset((ElementType*)data.data, data.rows, data.cols);
    IndexType* _index = new IndexType(dataset, get_params(params), dist);
+
+    try
+    {
        _index->buildIndex();
+    }
+    catch (...)
+    {
+        delete _index;
+        _index = NULL;
+
+        throw;
+    }
+
    index = _index;
 }