Merge pull request #14983 from tomoaki0705:fixOclCvtColorMRGBA

5 years ago · 39a975cb29
parent 57fae4a6a1 594a95839c
commit 39a975cb29
1 changed files with 2 additions and 2 deletions
--- a/modules/imgproc/test/ocl/test_color.cpp
+++ b/modules/imgproc/test/ocl/test_color.cpp
@ -294,14 +294,14 @@ OCL_TEST_P(CvtColor8u, GRAY2BGR555) { performTest(1, 2, CVTCODE(GRAY2BGR555)); }

 // RGBA <-> mRGBA

-#ifdef HAVE_IPP
+#if defined(HAVE_IPP) || defined(__arm__)
 #define IPP_EPS depth <= CV_32S ? 1 : 1e-3
 #else
 #define IPP_EPS 1e-3
 #endif

 OCL_TEST_P(CvtColor8u, RGBA2mRGBA) { performTest(4, 4, CVTCODE(RGBA2mRGBA), IPP_EPS); }
-OCL_TEST_P(CvtColor8u, mRGBA2RGBA) { performTest(4, 4, CVTCODE(mRGBA2RGBA)); }
+OCL_TEST_P(CvtColor8u, mRGBA2RGBA) { performTest(4, 4, CVTCODE(mRGBA2RGBA), IPP_EPS); }

 // RGB <-> Lab