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/core/perf/perf_merge.cpp
+++ b/modules/core/perf/perf_merge.cpp
@@ -32,5 +32,5 @@ PERF_TEST_P( Size_SrcDepth_DstChannels, merge,
    Mat dst;
    TEST_CYCLE() merge( (vector<Mat> &)mv, dst );

-    SANITY_CHECK(dst);
+    SANITY_CHECK(dst, 1e-12);
 }