From d0b67d37259f0b0639eac6c19d8178a739f2382a Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Thu, 12 Jan 2012 13:43:35 +0000 Subject: [PATCH] fixed Tegra stubs in cvtColor --- modules/imgproc/src/color.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/imgproc/src/color.cpp b/modules/imgproc/src/color.cpp index 2dde5df..f54c68a 100644 --- a/modules/imgproc/src/color.cpp +++ b/modules/imgproc/src/color.cpp @@ -2847,7 +2847,7 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn ) if( depth == CV_8U ) { #ifdef HAVE_TEGRA_OPTIMIZATION - if( code != CV_RGBA2GRAY || !tegra::Rgba2Gray(src, dst) ) + if(!tegra::cvtRGB2Gray(src, dst, bidx)) #endif CvtColorLoop(src, dst, RGB2Gray(scn, bidx, 0)); } @@ -2874,7 +2874,7 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn ) if( depth == CV_8U ) { #ifdef HAVE_TEGRA_OPTIMIZATION - if(code != CV_GRAY2RGBA || !tegra::Gray2Rgba(src, dst)) + if(!tegra::cvtGray2RGB(src, dst)) #endif CvtColorLoop(src, dst, Gray2RGB(dcn)); } @@ -2908,7 +2908,7 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn ) if( depth == CV_8U ) { #ifdef HAVE_TEGRA_OPTIMIZATION - if((code == CV_RGB2YCrCb || code == CV_BGR2YCrCb) && tegra::RGB2YCrCb(src, dst, bidx)) + if((code == CV_RGB2YCrCb || code == CV_BGR2YCrCb) && tegra::cvtRGB2YCrCb(src, dst, bidx)) break; #endif CvtColorLoop(src, dst, RGB2YCrCb_i(scn, bidx, coeffs_i)); @@ -3150,7 +3150,7 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn ) const uchar* uv = y + dstSz.area(); #ifdef HAVE_TEGRA_OPTIMIZATION - if (!tegra::YUV420i2BGR(y, uv, dst, CV_YUV420sp2RGB == code || CV_YUV420sp2RGBA == code)) + if (!tegra::cvtYUV420i2BGR(y, uv, dst, CV_YUV420sp2RGB == code || CV_YUV420sp2RGBA == code)) #endif { if (CV_YUV420sp2RGB == code || CV_YUV420sp2RGBA == code) -- 2.7.4