From: vbystricky Date: Fri, 4 Apr 2014 09:12:37 +0000 (+0400) Subject: Check 8.1 ipp version for color convertion functions, which not exists in versions... X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~3336^2~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=23e1b508379ce84951052cf68c61f210f8cb9d92;p=platform%2Fupstream%2Fopencv.git Check 8.1 ipp version for color convertion functions, which not exists in versions before this. --- diff --git a/modules/imgproc/src/color.cpp b/modules/imgproc/src/color.cpp index 4c9abe1..9d203ff 100644 --- a/modules/imgproc/src/color.cpp +++ b/modules/imgproc/src/color.cpp @@ -298,11 +298,13 @@ static ippiReorderFunc ippiSwapChannelsC3RTab[] = 0, (ippiReorderFunc)ippiSwapChannels_32f_C3R, 0, 0 }; +#if (IPP_VERSION_MAJOR >= 8) && (IPP_VERSION_MAJOR >= 1) static ippiReorderFunc ippiSwapChannelsC4RTab[] = { (ippiReorderFunc)ippiSwapChannels_8u_C4R, 0, (ippiReorderFunc)ippiSwapChannels_16u_C4R, 0, 0, (ippiReorderFunc)ippiSwapChannels_32f_C4R, 0, 0 }; +#endif static ippiColor2GrayFunc ippiColor2GrayC3Tab[] = { @@ -3252,12 +3254,14 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn ) if( CvtColorIPPLoopCopy(src, dst, IPPReorderFunctor(ippiSwapChannelsC3RTab[depth], 2, 1, 0)) ) return; } +#if (IPP_VERSION_MAJOR >= 8) && (IPP_VERSION_MAJOR >= 1) else if( code == CV_RGBA2BGRA ) { if( CvtColorIPPLoopCopy(src, dst, IPPReorderFunctor(ippiSwapChannelsC4RTab[depth], 2, 1, 0)) ) return; } #endif +#endif if( depth == CV_8U ) {