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

Merge pull request #1259 from pengx17:2.4_fix_cvtcolor

Browse Source
This commit is contained in:
Roman Donchenko 2013-08-13 16:34:18 +04:00 committed by OpenCV Buildbot
commit 43c7a8ae93
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/ocl/src/color.cpp
View File

@ -213,7 +213,7 @@ void cvtColor_caller(const oclMat &src, oclMat &dst, int code, int dcn)
case CV_RGB2YUV: case CV_RGB2YUV:
{ {
CV_Assert(scn == 3 || scn == 4); CV_Assert(scn == 3 || scn == 4);
bidx = code == CV_BGR2YUV ? 0 : 2; bidx = code == CV_RGB2YUV ? 0 : 2;
dst.create(sz, CV_MAKETYPE(depth, 3)); dst.create(sz, CV_MAKETYPE(depth, 3));
RGB2YUV_caller(src, dst, bidx); RGB2YUV_caller(src, dst, bidx);
break; break;
@ -222,7 +222,7 @@ void cvtColor_caller(const oclMat &src, oclMat &dst, int code, int dcn)
case CV_YUV2RGB: case CV_YUV2RGB:
{ {
CV_Assert(scn == 3 || scn == 4); CV_Assert(scn == 3 || scn == 4);
bidx = code == CV_YUV2BGR ? 0 : 2; bidx = code == CV_YUV2RGB ? 0 : 2;
dst.create(sz, CV_MAKETYPE(depth, 3)); dst.create(sz, CV_MAKETYPE(depth, 3));
YUV2RGB_caller(src, dst, bidx); YUV2RGB_caller(src, dst, bidx);
break; break;