Merge pull request #16608 from vpisarev:fix_mac_ocl_tests
* fixed several problems when running tests on Mac: * OCL_pyrUp * OCL_flip * some basic UMat tests * histogram badarg test (out of range access) * retained the storepix fix in ocl_flip only for 16U/16S datatype, where the OpenCL compiler on Mac generates incorrect code * moved deletion of ACCESS_FAST flag to non-SVM branch (where SVM is shared virtual memory (in OpenCL 2.x), not support vector machine) * force OpenCL to use read/write for GPU<=>CPU memory transfers on machines with discrete video only on Macs. On Windows/Linux the drivers are seemingly smart enough to implement map/unmap properly (and maybe more efficiently than explicit read/write)
This commit is contained in:
@@ -1966,7 +1966,7 @@ TEST(Imgproc_Hist_Calc, badarg)
|
||||
Mat img = cv::Mat::zeros(10, 10, CV_8UC1);
|
||||
Mat imgInt = cv::Mat::zeros(10, 10, CV_32SC1);
|
||||
Mat hist;
|
||||
const int hist_size[] = { 100 };
|
||||
const int hist_size[] = { 100, 100 };
|
||||
// base run
|
||||
EXPECT_NO_THROW(cv::calcHist(&img, 1, channels, noArray(), hist, 1, hist_size, ranges, true));
|
||||
// bad parameters
|
||||
|
||||
Reference in New Issue
Block a user