Merge pull request #1318 from SpecLad:wow

2013-08-22 11:49:43 +04:00
parent 9c60a2c24c 3c137f7a04
commit 43aec5ad4a
628 changed files with 2623 additions and 3042 deletions
--- a/modules/core/perf/perf_abs.cpp
+++ b/modules/core/perf/perf_abs.cpp
@@ -24,4 +24,3 @@ PERF_TEST_P(Size_MatType, abs, TYPICAL_MATS_ABS)

    SANITY_CHECK(c);
 }
-
--- a/modules/core/perf/perf_bitwise.cpp
+++ b/modules/core/perf/perf_bitwise.cpp
@@ -73,4 +73,3 @@ PERF_TEST_P(Size_MatType, bitwise_xor, TYPICAL_MATS_BITW_ARITHM)

    SANITY_CHECK(c);
 }
-
--- a/modules/core/perf/perf_merge.cpp
+++ b/modules/core/perf/perf_merge.cpp
@@ -34,4 +34,4 @@ PERF_TEST_P( Size_SrcDepth_DstChannels, merge,
    TEST_CYCLE_MULTIRUN(runs) merge( (vector<Mat> &)mv, dst );

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