1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00

Merge pull request #7210 from mshabunin:fix-warnings

This commit is contained in:
Alexander Alekhin
2016-09-02 12:50:45 +00:00
7 changed files with 121 additions and 153 deletions
@@ -1022,7 +1022,7 @@ protected:
/** @brief Flann-based descriptor matcher.
This matcher trains flann::Index_ on a train descriptor collection and calls its nearest search
This matcher trains cv::flann::Index on a train descriptor collection and calls its nearest search
methods to find the best matches. So, this matcher may be faster when matching a large train
collection than the brute force matcher. FlannBasedMatcher does not support masking permissible
matches of descriptor sets because flann::Index does not support this. :