From 1b0f0d7ead8e3be6f0f6a30a02ead07a776eba5c Mon Sep 17 00:00:00 2001 From: dkanafeev Date: Thu, 14 Aug 2014 15:36:28 +0400 Subject: [PATCH] Intel Summer School 2014 Switch branch to master. New IPP func - ippiCopy Conv: YUV2GRAY_420 --- modules/imgproc/src/color.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/imgproc/src/color.cpp b/modules/imgproc/src/color.cpp index 71f163b..b4c144b 100644 --- a/modules/imgproc/src/color.cpp +++ b/modules/imgproc/src/color.cpp @@ -4208,7 +4208,12 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn ) Size dstSz(sz.width, sz.height * 2 / 3); _dst.create(dstSz, CV_MAKETYPE(depth, dcn)); 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); } break; -- 2.7.4