From c3213307772adc72dbc59e27f38acafd8f8e8930 Mon Sep 17 00:00:00 2001 From: vbystricky Date: Thu, 3 Apr 2014 10:47:06 +0400 Subject: [PATCH] Comment ipp version of CV_BGR2GRAY color convertion, by problems in BRIEF accuracy test and Path_Idx_Cn_NPoints_WSize perfomance test --- modules/imgproc/src/color.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/imgproc/src/color.cpp b/modules/imgproc/src/color.cpp index 4cc2382..b105ee3 100644 --- a/modules/imgproc/src/color.cpp +++ b/modules/imgproc/src/color.cpp @@ -3313,12 +3313,15 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn ) dst = _dst.getMat(); /**/ #if defined (HAVE_IPP) && (IPP_VERSION_MAJOR >= 7) +/* if( code == CV_BGR2GRAY ) { if( CvtColorIPPLoop(src, dst, IPPColor2GrayFunctor(ippicviColor2GrayC3Tab[depth])) ) return; } - else if( code == CV_RGB2GRAY ) + else +*/ + if( code == CV_RGB2GRAY ) { if( CvtColorIPPLoop(src, dst, IPPGeneralFunctor(ippicviRGB2GrayC3Tab[depth])) ) return; -- 2.7.4