Merge pull request #3028 from vbystricky:ocl_MergeAccurTestFix

11dd36f3 · Alexander Alekhin · b33a0938 · 184c5917 · 11dd36f3
Commit 11dd36f3 authored Aug 01, 2014 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

test_channels.cpp modules/core/test/ocl/test_channels.cpp +1 -0

No files found.
--- a/modules/core/test/ocl/test_channels.cpp
+++ b/modules/core/test/ocl/test_channels.cpp
@@ -105,6 +105,7 @@ PARAM_TEST_CASE(Merge, MatDepth, int, bool)
        UMAT_UPLOAD_INPUT_PARAMETER(src3);
        UMAT_UPLOAD_INPUT_PARAMETER(src4);

+        src_roi.clear(); usrc_roi.clear(); // for test_loop_times > 1
        src_roi.push_back(src1_roi), usrc_roi.push_back(usrc1_roi);
        if (nsrc >= 2)
            src_roi.push_back(src2_roi), usrc_roi.push_back(usrc2_roi);