projects
/
profile
/
ivi
/
opencv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3104 from dkanafeev:new_ipp_func_master
[profile/ivi/opencv.git]
/
modules
/
imgproc
/
src
/
color.cpp
diff --git
a/modules/imgproc/src/color.cpp
b/modules/imgproc/src/color.cpp
index
1f8f734
..
4ae00eb
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();
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;
src(Range(0, dstSz.height), Range::all()).copyTo(dst);
}
break;