generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1672 from ilya-lavrenov:ocl_arithm

Browse Source
This commit is contained in:
Andrey Pavlenko 2013-10-24 11:23:18 +04:00 committed by OpenCV Buildbot
commit e7f39eb46e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/ocl/test/test_arithm.cpp
View File

@ -181,9 +181,6 @@ PARAM_TEST_CASE(ArithmTestBase, MatDepth, Channels, bool)
depth = GET_PARAM(0);
cn = GET_PARAM(1);
use_roi = GET_PARAM(2);
val = cv::Scalar(rng.uniform(-100.0, 100.0), rng.uniform(-100.0, 100.0),
rng.uniform(-100.0, 100.0), rng.uniform(-100.0, 100.0));
}
void random_roi()
@ -213,6 +210,9 @@ PARAM_TEST_CASE(ArithmTestBase, MatDepth, Channels, bool)
generateOclMat(gdst1_whole, gdst1_roi, dst1, roiSize, dst1Border);
generateOclMat(gdst2_whole, gdst2_roi, dst2, roiSize, dst2Border);
generateOclMat(gmask_whole, gmask_roi, mask, roiSize, maskBorder);
val = cv::Scalar(rng.uniform(-100.0, 100.0), rng.uniform(-100.0, 100.0),
rng.uniform(-100.0, 100.0), rng.uniform(-100.0, 100.0));
}
void Near(double threshold = 0.)
@ -389,7 +389,7 @@ OCL_TEST_P(Mul, Scalar)
{
random_roi();
cv::multiply(val[0], src1_roi, dst1_roi);
cv::multiply(Scalar::all(val[0]), src1_roi, dst1_roi);
cv::ocl::multiply(val[0], gsrc1_roi, gdst1_roi);
Near(gdst1_roi.depth() >= CV_32F ? 1e-3 : 1);