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

Merge commit '4b885e206' into merge-2.4

Browse Source
This commit is contained in:
Roman Donchenko
2013-12-30 16:48:45 +04:00
parent d611509842 4b885e2067
commit 9dfb96389c
8 changed files with 18 additions and 515 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3151,7 +3151,7 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
CV_Assert( scn == 3 || scn == 4 );
_dst.create(sz, CV_MAKETYPE(depth, 1));
dst = _dst.getMat();
/*
#if defined (HAVE_IPP) && (IPP_VERSION_MAJOR >= 7)
if( code == CV_BGR2GRAY )
{
@@ -3174,7 +3174,7 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
return;
}
#endif
*/
bidx = code == CV_BGR2GRAY || code == CV_BGRA2GRAY ? 0 : 2;
if( depth == CV_8U )