mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-22 09:36:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2325 from alalek:perf_fix

Browse Source
This commit is contained in:
Roman Donchenko 2014-02-20 13:39:54 +04:00 committed by OpenCV Buildbot
commit 61976b8461
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/perf/opencl/perf_channels.cpp
View File

@ -85,7 +85,7 @@ OCL_PERF_TEST_P(MergeFixture, Merge,
typedef MergeParams SplitParams; typedef MergeParams SplitParams;
typedef TestBaseWithParam<SplitParams> SplitFixture; typedef TestBaseWithParam<SplitParams> SplitFixture;
OCL_PERF_TEST_P(SplitFixture, DISABLED_Split, OCL_PERF_TEST_P(SplitFixture, Split,
::testing::Combine(OCL_TEST_SIZES, OCL_PERF_ENUM(CV_8U, CV_32F), Values(2, 3))) ::testing::Combine(OCL_TEST_SIZES, OCL_PERF_ENUM(CV_8U, CV_32F), Values(2, 3)))
{ {
const SplitParams params = GetParam(); const SplitParams params = GetParam();

6
modules/ts/src/ts_perf.cpp
View File

@ -876,7 +876,9 @@ void TestBase::warmup(cv::InputOutputArray a, WarmUpType wtype)
{ {
if (a.empty()) if (a.empty())
return; return;
else if (a.isUMat() && wtype != WARMUP_READ) else if (a.isUMat())
{
if (wtype == WARMUP_RNG || wtype == WARMUP_WRITE)
{ {
int depth = a.depth(); int depth = a.depth();
if (depth == CV_8U) if (depth == CV_8U)
@ -891,7 +893,7 @@ void TestBase::warmup(cv::InputOutputArray a, WarmUpType wtype)
cv::randu(a, -4096, 4096); cv::randu(a, -4096, 4096);
else else
CV_Error(cv::Error::StsUnsupportedFormat, "Unsupported format"); CV_Error(cv::Error::StsUnsupportedFormat, "Unsupported format");
}
return; return;
} }
else if (a.kind() != cv::_InputArray::STD_VECTOR_MAT && a.kind() != cv::_InputArray::STD_VECTOR_VECTOR) else if (a.kind() != cv::_InputArray::STD_VECTOR_MAT && a.kind() != cv::_InputArray::STD_VECTOR_VECTOR)