Merge branch '2.4'

2013-01-30 15:12:50 +04:00
parent 78a338159d 52b32ba8f0
commit 7572b4d400
31 changed files with 816 additions and 421 deletions
--- a/samples/cpp/descriptor_extractor_matcher.cpp
+++ b/samples/cpp/descriptor_extractor_matcher.cpp
@@ -221,6 +221,8 @@ static void doIteration( const Mat& img1, Mat& img2, bool isWarpPerspective,
        drawMatches( img1, keypoints1, img2, keypoints2, filteredMatches, drawImg, CV_RGB(0, 0, 255), CV_RGB(255, 0, 0), matchesMask,
                     DrawMatchesFlags::DRAW_OVER_OUTIMG | DrawMatchesFlags::NOT_DRAW_SINGLE_POINTS );
 #endif
+
+        cout << "Number of inliers: " << countNonZero(matchesMask) << endl;
    }
    else
        drawMatches( img1, keypoints1, img2, keypoints2, filteredMatches, drawImg );