Merged the trunk r8408:8457 (inclusive)

2012-05-30 08:47:34 +00:00
parent 7b5a45eac4
commit 949c4edf41
42 changed files with 828 additions and 266 deletions
--- a/modules/imgproc/perf/perf_goodFeaturesToTrack.cpp
+++ b/modules/imgproc/perf/perf_goodFeaturesToTrack.cpp
@@ -29,10 +29,10 @@ PERF_TEST_P(Image_MaxCorners_QualityLevel_MinDistance_BlockSize_UseHarris, goodF
    if (image.empty())
        FAIL() << "Unable to load source image" << filename;
    
-    Mat corners;
+    std::vector<Point2f> corners;

    double minDistance = 1;
    TEST_CYCLE() goodFeaturesToTrack(image, corners, maxCorners, qualityLevel, minDistance, noArray(), blockSize, useHarrisDetector);

-    SANITY_CHECK(corners);
+    //SANITY_CHECK(corners);
 }