Merge pull request #1889 from alalek:ocl_core_dynamic_runtime

2013-12-12 17:27:33 +04:00
parent ac1c6dac93 3bbf51fbfb
commit b0a9220de8
57 changed files with 5149 additions and 3523 deletions
--- a/modules/core/test/ocl/test_split_merge.cpp
+++ b/modules/core/test/ocl/test_split_merge.cpp
@@ -197,7 +197,7 @@ PARAM_TEST_CASE(SplitTestBase, MatType, Channels, bool)

 typedef SplitTestBase Split;

-OCL_TEST_P(Split, Accuracy)
+OCL_TEST_P(Split, DISABLED_Accuracy)
 {
    for (int j = 0; j < test_loop_times; j++)
    {