generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3104 from dkanafeev:new_ipp_func_master

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-08-19 09:06:45 +00:00
commit 8658aef3bf
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/imgproc/src/color.cpp
View File

@ -4208,7 +4208,12 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
Size dstSz(sz.width, sz.height * 2 / 3); Size dstSz(sz.width, sz.height * 2 / 3);
_dst.create(dstSz, CV_MAKETYPE(depth, dcn)); _dst.create(dstSz, CV_MAKETYPE(depth, dcn));
dst = _dst.getMat(); dst = _dst.getMat();
#if defined HAVE_IPP
if (ippStsNoErr == ippiCopy_8u_C1R(src.data, (int)src.step, dst.data, (int)dst.step,
ippiSize(dstSz.width, dstSz.height)))
return;
setIppErrorStatus();
#endif
src(Range(0, dstSz.height), Range::all()).copyTo(dst); src(Range(0, dstSz.height), Range::all()).copyTo(dst);
} }
break; break;