merged 2.4 into trunk

2012-04-30 14:33:52 +00:00
parent 3f1c6d7357
commit d5a0088bbe
194 changed files with 10158 additions and 8225 deletions
--- a/modules/imgproc/perf/perf_cornerEigenValsAndVecs.cpp
+++ b/modules/imgproc/perf/perf_cornerEigenValsAndVecs.cpp
@@ -33,5 +33,5 @@ PERF_TEST_P(Img_BlockSize_ApertureSize_BorderType, cornerEigenValsAndVecs,

    TEST_CYCLE() cornerEigenValsAndVecs(src, dst, blockSize, apertureSize, borderType);

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