Merged the trunk r8324:8345

2012-05-18 12:59:40 +00:00
parent aebed446b1
commit 70166820ea
9 changed files with 65 additions and 23 deletions
--- a/modules/core/perf/perf_convertTo.cpp
+++ b/modules/core/perf/perf_convertTo.cpp
@@ -32,5 +32,5 @@ PERF_TEST_P( Size_DepthSrc_DepthDst_Channels_alpha, convertTo,

    TEST_CYCLE() src.convertTo(dst, depthDst, alpha);

-    SANITY_CHECK(dst, 1e-12);
+    SANITY_CHECK(dst, alpha == 1.0 ? 1e-12 : 1e-7);
 }