mirror of
https://github.com/opencv/opencv.git
synced 2026-07-31 08:13:04 +04:00
Merge pull request #10223 from vpisarev:ocl_mac_fixes
* fixed OpenCL functions on Mac, so that the tests pass * fixed compile warnings; temporarily disabled OCL branch of TV L1 optical flow on mac * fixed other few warnings on macos
This commit is contained in:
committed by
Alexander Alekhin
parent
a3ec2ac3c5
commit
5ce38e516e
@@ -392,9 +392,11 @@ void OpticalFlowDual_TVL1::calc(InputArray _I0, InputArray _I1, InputOutputArray
|
||||
{
|
||||
CV_INSTRUMENT_REGION()
|
||||
|
||||
#ifndef __APPLE__
|
||||
CV_OCL_RUN(_flow.isUMat() &&
|
||||
ocl::Image2D::isFormatSupported(CV_32F, 1, false),
|
||||
calc_ocl(_I0, _I1, _flow))
|
||||
#endif
|
||||
|
||||
Mat I0 = _I0.getMat();
|
||||
Mat I1 = _I1.getMat();
|
||||
|
||||
Reference in New Issue
Block a user