Modification of the related tests in core/tests/ocl

philippefoubert · philippefoubert · commit b668d3f69307 · 2015-08-22T13:39:34.000+02:00
diff --git a/modules/core/test/ocl/test_matrix_operation.cpp b/modules/core/test/ocl/test_matrix_operation.cpp
@@ -85,7 +85,7 @@ PARAM_TEST_CASE(ConvertTo, MatDepth, MatDepth, Channels, bool)
     }
 };
 
-OCL_TEST_P(ConvertTo, Accuracy)
+OCL_TEST_P(ConvertTo, WithScale_Accuracy)
 {
     for (int j = 0; j < test_loop_times; j++)
     {
@@ -101,6 +101,20 @@ OCL_TEST_P(ConvertTo, Accuracy)
     }
 }
 
+OCL_TEST_P(ConvertTo, NoScale_Accuracy)
+{
+    for (int j = 0; j < test_loop_times; j++)
+    {
+        generateTestData();
+
+        OCL_OFF(src_roi.convertTo(dst_roi, dstType, 1, 0));
+        OCL_ON(usrc_roi.convertTo(udst_roi, dstType, 1, 0));
+
+        double eps = CV_MAT_DEPTH(dstType) >= CV_32F ? 2e-4 : 1;
+        OCL_EXPECT_MATS_NEAR(dst, eps);
+    }
+}
+
 //////////////////////////////// CopyTo /////////////////////////////////////////////////
 
 PARAM_TEST_CASE(CopyTo, MatDepth, Channels, bool, bool)

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ PARAM_TEST_CASE(ConvertTo, MatDepth, MatDepth, Channels, bool)`
`85`	`85`	`}`
`86`	`86`	`};`
`87`	`87`
`88`		`-OCL_TEST_P(ConvertTo, Accuracy)`
	`88`	`+OCL_TEST_P(ConvertTo, WithScale_Accuracy)`
`89`	`89`	`{`
`90`	`90`	`for (int j = 0; j < test_loop_times; j++)`
`91`	`91`	`{`
`@@ -101,6 +101,20 @@ OCL_TEST_P(ConvertTo, Accuracy)`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`
	`104`	`+OCL_TEST_P(ConvertTo, NoScale_Accuracy)`
	`105`	`+{`
	`106`	`+ for (int j = 0; j < test_loop_times; j++)`
	`107`	`+ {`
	`108`	`+ generateTestData();`
	`109`	`+`
	`110`	`+ OCL_OFF(src_roi.convertTo(dst_roi, dstType, 1, 0));`
	`111`	`+ OCL_ON(usrc_roi.convertTo(udst_roi, dstType, 1, 0));`
	`112`	`+`
	`113`	`+ double eps = CV_MAT_DEPTH(dstType) >= CV_32F ? 2e-4 : 1;`
	`114`	`+ OCL_EXPECT_MATS_NEAR(dst, eps);`
	`115`	`+ }`
	`116`	`+}`
	`117`	`+`
`104`	`118`	`//////////////////////////////// CopyTo /////////////////////////////////////////////////`
`105`	`119`
`106`	`120`	`PARAM_TEST_CASE(CopyTo, MatDepth, Channels, bool, bool)`