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

Disabled some IPP calls of cvtColor since it breaks OCL accuracy tests

Browse Source 
with test_loop_times=30
This commit is contained in:
Alexander Karsakov 2014-08-11 15:46:27 +04:00
parent 835b5e2179
commit 498da24b8b
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3381,18 +3381,16 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
_dst.create(sz, CV_8UC2); _dst.create(sz, CV_8UC2);
dst = _dst.getMat(); dst = _dst.getMat();
#ifdef HAVE_IPP #if defined(HAVE_IPP) && 0 // breaks OCL accuracy tests
CV_SUPPRESS_DEPRECATED_START CV_SUPPRESS_DEPRECATED_START
#if 0
if (code == CV_BGR2BGR565 && scn == 3) if (code == CV_BGR2BGR565 && scn == 3)
{ {
if (CvtColorIPPLoop(src, dst, IPPGeneralFunctor((ippiGeneralFunc)ippiBGRToBGR565_8u16u_C3R))) if (CvtColorIPPLoop(src, dst, IPPGeneralFunctor((ippiGeneralFunc)ippiBGRToBGR565_8u16u_C3R)))
return; return;
setIppErrorStatus(); setIppErrorStatus();
} }
else else if (code == CV_BGRA2BGR565 && scn == 4)
#endif
if (code == CV_BGRA2BGR565 && scn == 4)
{ {
if (CvtColorIPPLoopCopy(src, dst, if (CvtColorIPPLoopCopy(src, dst,
IPPReorderGeneralFunctor(ippiSwapChannelsC4C3RTab[depth], IPPReorderGeneralFunctor(ippiSwapChannelsC4C3RTab[depth],
@ -3787,6 +3785,7 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
#if defined (HAVE_IPP) && (IPP_VERSION_MAJOR >= 7) #if defined (HAVE_IPP) && (IPP_VERSION_MAJOR >= 7)
if( depth == CV_8U || depth == CV_16U ) if( depth == CV_8U || depth == CV_16U )
{ {
#if 0 // breaks OCL accuracy tests
if( code == CV_BGR2HSV_FULL && scn == 3 ) if( code == CV_BGR2HSV_FULL && scn == 3 )
{ {
if( CvtColorIPPLoopCopy(src, dst, IPPReorderGeneralFunctor(ippiSwapChannelsC3RTab[depth], ippiRGB2HSVTab[depth], 2, 1, 0, depth)) ) if( CvtColorIPPLoopCopy(src, dst, IPPReorderGeneralFunctor(ippiSwapChannelsC3RTab[depth], ippiRGB2HSVTab[depth], 2, 1, 0, depth)) )
@ -3799,17 +3798,18 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
return; return;
setIppErrorStatus(); setIppErrorStatus();
} }
else if( code == CV_RGB2HSV_FULL && scn == 3 && depth == CV_16U )
{
if( CvtColorIPPLoopCopy(src, dst, IPPGeneralFunctor(ippiRGB2HSVTab[depth])) )
return;
setIppErrorStatus();
}
else if( code == CV_RGB2HSV_FULL && scn == 4 ) else if( code == CV_RGB2HSV_FULL && scn == 4 )
{ {
if( CvtColorIPPLoop(src, dst, IPPReorderGeneralFunctor(ippiSwapChannelsC4C3RTab[depth], ippiRGB2HSVTab[depth], 0, 1, 2, depth)) ) if( CvtColorIPPLoop(src, dst, IPPReorderGeneralFunctor(ippiSwapChannelsC4C3RTab[depth], ippiRGB2HSVTab[depth], 0, 1, 2, depth)) )
return; return;
setIppErrorStatus(); setIppErrorStatus();
} else
#endif
if( code == CV_RGB2HSV_FULL && scn == 3 && depth == CV_16U )
{
if( CvtColorIPPLoopCopy(src, dst, IPPGeneralFunctor(ippiRGB2HSVTab[depth])) )
return;
setIppErrorStatus();
} }
else if( code == CV_BGR2HLS_FULL && scn == 3 ) else if( code == CV_BGR2HLS_FULL && scn == 3 )
{ {