potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2018-04-23 17:54:04 +03:00
parent 4b2d1aaeea e82af627ed
commit 4d7d630e92
93 changed files with 4203 additions and 4647 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/arithm.cpp
+2
View File
@@ -1699,6 +1699,8 @@ void cv::inRange(InputArray _src, InputArray _lowerb,
{
CV_INSTRUMENT_REGION()
CV_Assert(! _src.empty());
CV_OCL_RUN(_src.dims() <= 2 && _lowerb.dims() <= 2 &&
_upperb.dims() <= 2 && OCL_PERFORMANCE_CHECK(_dst.isUMat()),
ocl_inRange(_src, _lowerb, _upperb, _dst))