Merge pull request opencv#15061 from AsyaPronina:dev/fix_merge_issue

wendykoko · Jul 16, 2019 · f6ec0cd · f6ec0cd
2 parents 65d148d + add1df4
commit f6ec0cd
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 6 deletions.
diff --git a/modules/gapi/test/cpu/gapi_core_tests_cpu.cpp b/modules/gapi/test/cpu/gapi_core_tests_cpu.cpp
@@ -440,14 +440,12 @@ INSTANTIATE_TEST_CASE_P(BackendOutputAllocationTestCPU, BackendOutputAllocationT
                         Combine(Values(CV_8UC3, CV_16SC2, CV_32FC1),
                                 Values(cv::Size(50, 50)),
                                 Values(-1),
-                                Values(false),
                                 Values(CORE_CPU)));
 
 INSTANTIATE_TEST_CASE_P(BackendOutputAllocationLargeSizeWithCorrectSubmatrixTestCPU,
                         BackendOutputAllocationLargeSizeWithCorrectSubmatrixTest,
                         Combine(Values(CV_8UC3, CV_16SC2, CV_32FC1),
                                 Values(cv::Size(50, 50)),
                                 Values(-1),
-                                Values(false),
                                 Values(CORE_CPU)));
 }
diff --git a/modules/gapi/test/cpu/gapi_core_tests_fluid.cpp b/modules/gapi/test/cpu/gapi_core_tests_fluid.cpp
@@ -258,15 +258,13 @@ INSTANTIATE_TEST_CASE_P(BackendOutputAllocationTestFluid, BackendOutputAllocatio
                         Combine(Values(CV_8UC3, CV_16SC2, CV_32FC1),
                                 Values(cv::Size(50, 50)),
                                 Values(-1),
-                                Values(false),
                                 Values(CORE_FLUID)));
 
 INSTANTIATE_TEST_CASE_P(BackendOutputAllocationLargeSizeWithCorrectSubmatrixTestFluid,
                         BackendOutputAllocationLargeSizeWithCorrectSubmatrixTest,
                         Combine(Values(CV_8UC3, CV_16SC2, CV_32FC1),
                                 Values(cv::Size(50, 50)),
                                 Values(-1),
-                                Values(false),
                                 Values(CORE_FLUID)));
 
 //----------------------------------------------------------------------

diff --git a/modules/gapi/test/gpu/gapi_core_tests_gpu.cpp b/modules/gapi/test/gpu/gapi_core_tests_gpu.cpp
@@ -383,7 +383,6 @@ INSTANTIATE_TEST_CASE_P(BackendOutputAllocationTestGPU, BackendOutputAllocationT
                         Combine(Values(CV_8UC3, CV_16SC2, CV_32FC1),
                                 Values(cv::Size(50, 50)),
                                 Values(-1),
-                                Values(false),
                                 Values(CORE_GPU)));
 
 // FIXME: there's an issue in OCL backend with matrix reallocation that shouldn't happen
@@ -392,7 +391,6 @@ INSTANTIATE_TEST_CASE_P(DISABLED_BackendOutputAllocationLargeSizeWithCorrectSubm
                         Combine(Values(CV_8UC3, CV_16SC2, CV_32FC1),
                                 Values(cv::Size(50, 50)),
                                 Values(-1),
-                                Values(false),
                                 Values(CORE_GPU)));
 
 //TODO: fix this backend to allow ConcatVertVec ConcatHorVec