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

Merge pull request #3181 from akarsakov:ocl_mul_scale_test_fix

Browse Source
This commit is contained in:
Alexander Alekhin 2014-09-02 13:46:46 +00:00
commit 7dd666e444
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/core/test/ocl/test_arithm.cpp
View File

@ -175,9 +175,12 @@ PARAM_TEST_CASE(ArithmTestBase, MatDepth, Channels, bool)
UMAT_UPLOAD_OUTPUT_PARAMETER(dst2); UMAT_UPLOAD_OUTPUT_PARAMETER(dst2);
} }
void Near(double threshold = 0.) void Near(double threshold = 0., bool relative = false)
{ {
OCL_EXPECT_MATS_NEAR(dst1, threshold); if (!relative)
OCL_EXPECT_MATS_NEAR(dst1, threshold);
else
OCL_EXPECT_MATS_NEAR_RELATIVE(dst1, threshold);
} }
void Near1(double threshold = 0.) void Near1(double threshold = 0.)
@ -341,7 +344,10 @@ OCL_TEST_P(Mul, Mat_Scalar_Scale)
OCL_OFF(cv::multiply(src1_roi, val, dst1_roi, val[0])); OCL_OFF(cv::multiply(src1_roi, val, dst1_roi, val[0]));
OCL_ON(cv::multiply(usrc1_roi, val, udst1_roi, val[0])); OCL_ON(cv::multiply(usrc1_roi, val, udst1_roi, val[0]));
Near(udst1_roi.depth() >= CV_32F ? 1e-2 : 1); if (udst1_roi.depth() >= CV_32F)
Near(1e-6, true);
else
Near(1);
} }
} }