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

Comment ipp version of CV_BGR2GRAY color convertion, by problems in BRIEF accuracy test and Path_Idx_Cn_NPoints_WSize perfomance test

Browse Source
This commit is contained in:
vbystricky 2014-04-03 10:47:06 +04:00
parent ad23ef2a42
commit c321330777
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3313,12 +3313,15 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
dst = _dst.getMat(); dst = _dst.getMat();
/**/ /**/
#if defined (HAVE_IPP) && (IPP_VERSION_MAJOR >= 7) #if defined (HAVE_IPP) && (IPP_VERSION_MAJOR >= 7)
/*
if( code == CV_BGR2GRAY ) if( code == CV_BGR2GRAY )
{ {
if( CvtColorIPPLoop(src, dst, IPPColor2GrayFunctor(ippicviColor2GrayC3Tab[depth])) ) if( CvtColorIPPLoop(src, dst, IPPColor2GrayFunctor(ippicviColor2GrayC3Tab[depth])) )
return; return;
} }
else if( code == CV_RGB2GRAY ) else
*/
if( code == CV_RGB2GRAY )
{ {
if( CvtColorIPPLoop(src, dst, IPPGeneralFunctor(ippicviRGB2GrayC3Tab[depth])) ) if( CvtColorIPPLoop(src, dst, IPPGeneralFunctor(ippicviRGB2GrayC3Tab[depth])) )
return; return;