projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
28f3a44
)
Intel Summer School 2014
author
dkanafeev
<domir332@live.ru>
Thu, 14 Aug 2014 11:36:28 +0000
(15:36 +0400)
committer
dkanafeev
<domir332@live.ru>
Fri, 15 Aug 2014 08:54:31 +0000
(12:54 +0400)
Switch branch to master.
New IPP func - ippiCopy
Conv: YUV2GRAY_420
modules/imgproc/src/color.cpp
patch
|
blob
|
history
diff --git
a/modules/imgproc/src/color.cpp
b/modules/imgproc/src/color.cpp
index
71f163b
..
b4c144b
100644
(file)
--- 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;