features2d: workaround for 'utrainDescCollection' issue (PR #2142)

89e3e448 · Alexander Alekhin · Andrey Pavlenko · 1d9808e5 · 89e3e448
Commit 89e3e448 authored Mar 12, 2014 by Alexander Alekhin Committed by Andrey Pavlenko Apr 11, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

matchers.cpp modules/features2d/src/matchers.cpp +7 -0

No files found.
--- a/modules/features2d/src/matchers.cpp
+++ b/modules/features2d/src/matchers.cpp
@@ -1232,6 +1232,13 @@ void FlannBasedMatcher::train()
 {
    if( !flannIndex || mergedDescriptors.size() < addedDescCount )
    {
+        // FIXIT: Workaround for 'utrainDescCollection' issue (PR #2142)
+        if (!utrainDescCollection.empty())
+        {
+            CV_Assert(trainDescCollection.size() == 0);
+            for (size_t i = 0; i < utrainDescCollection.size(); ++i)
+                trainDescCollection.push_back(utrainDescCollection[i].getMat(ACCESS_READ));
+        }
        mergedDescriptors.set( trainDescCollection );
        flannIndex = makePtr<flann::Index>( mergedDescriptors.getDescriptors(), *indexParams );
    }