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

fixed Tegra stubs in cvtColor

Browse Source
This commit is contained in:
Andrey Kamaev 2012-01-12 13:43:35 +00:00
parent 8e48dd5cbd
commit d0b67d3725
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2847,7 +2847,7 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
if( depth == CV_8U ) if( depth == CV_8U )
{ {
#ifdef HAVE_TEGRA_OPTIMIZATION #ifdef HAVE_TEGRA_OPTIMIZATION
if( code != CV_RGBA2GRAY || !tegra::Rgba2Gray(src, dst) ) if(!tegra::cvtRGB2Gray(src, dst, bidx))
#endif #endif
CvtColorLoop(src, dst, RGB2Gray<uchar>(scn, bidx, 0)); CvtColorLoop(src, dst, RGB2Gray<uchar>(scn, bidx, 0));
} }
@ -2874,7 +2874,7 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
if( depth == CV_8U ) if( depth == CV_8U )
{ {
#ifdef HAVE_TEGRA_OPTIMIZATION #ifdef HAVE_TEGRA_OPTIMIZATION
if(code != CV_GRAY2RGBA || !tegra::Gray2Rgba(src, dst)) if(!tegra::cvtGray2RGB(src, dst))
#endif #endif
CvtColorLoop(src, dst, Gray2RGB<uchar>(dcn)); CvtColorLoop(src, dst, Gray2RGB<uchar>(dcn));
} }
@ -2908,7 +2908,7 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
if( depth == CV_8U ) if( depth == CV_8U )
{ {
#ifdef HAVE_TEGRA_OPTIMIZATION #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; break;
#endif #endif
CvtColorLoop(src, dst, RGB2YCrCb_i<uchar>(scn, bidx, coeffs_i)); CvtColorLoop(src, dst, RGB2YCrCb_i<uchar>(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(); const uchar* uv = y + dstSz.area();
#ifdef HAVE_TEGRA_OPTIMIZATION #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 #endif
{ {
if (CV_YUV420sp2RGB == code || CV_YUV420sp2RGBA == code) if (CV_YUV420sp2RGB == code || CV_YUV420sp2RGBA == code)