merged all the latest changes from 2.4 to trunk

2012-04-13 21:50:59 +00:00
parent 020f9a6047
commit 2fd1e2ea57
416 changed files with 12852 additions and 6070 deletions
--- a/modules/imgproc/perf/perf_cornerHarris.cpp
+++ b/modules/imgproc/perf/perf_cornerHarris.cpp
@@ -35,5 +35,5 @@ PERF_TEST_P(Img_BlockSize_ApertureSize_k_BorderType, cornerHarris,

    TEST_CYCLE() cornerHarris(src, dst, blockSize, apertureSize, k, borderType);

-    SANITY_CHECK(dst);
+    SANITY_CHECK(dst, 2e-6);
 }