potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

Merge branch 4.x

Browse Source
This commit is contained in:
Alexander Smorkalov
2024-09-10 10:15:22 +03:00
parent 99bc88c259 79faf857d9
commit b574db2cff
26 changed files with 237 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/perf/opencl/perf_arithm.cpp
+5 -2
View File
@@ -358,7 +358,8 @@ typedef TestBaseWithParam<FlipParams> FlipFixture;
OCL_PERF_TEST_P(FlipFixture, Flip,
::testing::Combine(OCL_TEST_SIZES,
OCL_TEST_TYPES, FlipType::all()))
::testing::Values(CV_8UC1, CV_8UC3, CV_8UC4, CV_16UC1, CV_32FC1, CV_32FC4),
FlipType::all()))
{
const FlipParams params = GetParam();
const Size srcSize = get<0>(params);
@@ -388,7 +389,9 @@ typedef tuple<Size, MatType, RotateType> RotateParams;
typedef TestBaseWithParam<RotateParams> RotateFixture;
OCL_PERF_TEST_P(RotateFixture, rotate,
::testing::Combine(OCL_TEST_SIZES, OCL_TEST_TYPES, RotateType::all()))
::testing::Combine(OCL_TEST_SIZES,
::testing::Values(CV_8UC1, CV_8UC2, CV_8UC4, CV_32FC1, CV_32FC4),
RotateType::all()))
{
const RotateParams params = GetParam();
const Size srcSize = get<0>(params);