Merge pull request #1259 from pengx17:2.4_fix_cvtcolor

12 years ago · 43c7a8ae93
parent fae7b20815 2fb2ac8836
commit 43c7a8ae93
1 changed files with 2 additions and 2 deletions
--- a/modules/ocl/src/color.cpp
+++ b/modules/ocl/src/color.cpp
@ -213,7 +213,7 @@ void cvtColor_caller(const oclMat &src, oclMat &dst, int code, int dcn)
    case CV_RGB2YUV:
    {
        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));
        RGB2YUV_caller(src, dst, bidx);
        break;
@ -222,7 +222,7 @@ void cvtColor_caller(const oclMat &src, oclMat &dst, int code, int dcn)
    case CV_YUV2RGB:
    {
        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));
        YUV2RGB_caller(src, dst, bidx);
        break;