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_split.cpp
+++ b/modules/core/perf/perf_split.cpp
@@ -29,5 +29,5 @@ PERF_TEST_P( Size_Depth_Channels, split,

    TEST_CYCLE() split(m, (vector<Mat>&)mv);

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