mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-19 06:53:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3122 from akarsakov:cvtcolor_perf_test_fix

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-08-19 09:01:35 +00:00
commit 24163eb929
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/imgproc/perf/perf_cvt_color.cpp
View File

@ -155,14 +155,14 @@ ChPair getConversionInfo(int cvtMode)
case COLOR_BGR5552BGR: case COLOR_BGR5552RGB: case COLOR_BGR5552BGR: case COLOR_BGR5552RGB:
case COLOR_BGR5652BGR: case COLOR_BGR5652RGB: case COLOR_BGR5652BGR: case COLOR_BGR5652RGB:
case COLOR_YUV2RGB_UYVY: case COLOR_YUV2BGR_UYVY: case COLOR_YUV2RGB_UYVY: case COLOR_YUV2BGR_UYVY:
case COLOR_YUV2RGBA_UYVY: case COLOR_YUV2BGRA_UYVY:
case COLOR_YUV2RGB_YUY2: case COLOR_YUV2BGR_YUY2: case COLOR_YUV2RGB_YUY2: case COLOR_YUV2BGR_YUY2:
case COLOR_YUV2RGB_YVYU: case COLOR_YUV2BGR_YVYU: case COLOR_YUV2RGB_YVYU: case COLOR_YUV2BGR_YVYU:
case COLOR_YUV2RGBA_YUY2: case COLOR_YUV2BGRA_YUY2:
case COLOR_YUV2RGBA_YVYU: case COLOR_YUV2BGRA_YVYU:
return ChPair(2,3); return ChPair(2,3);
case COLOR_BGR5552BGRA: case COLOR_BGR5552RGBA: case COLOR_BGR5552BGRA: case COLOR_BGR5552RGBA:
case COLOR_BGR5652BGRA: case COLOR_BGR5652RGBA: case COLOR_BGR5652BGRA: case COLOR_BGR5652RGBA:
case COLOR_YUV2RGBA_UYVY: case COLOR_YUV2BGRA_UYVY:
case COLOR_YUV2RGBA_YUY2: case COLOR_YUV2BGRA_YUY2:
case COLOR_YUV2RGBA_YVYU: case COLOR_YUV2BGRA_YVYU:
return ChPair(2,4); return ChPair(2,4);
case COLOR_BGR2GRAY: case COLOR_RGB2GRAY: case COLOR_BGR2GRAY: case COLOR_RGB2GRAY:
case COLOR_RGB2YUV_IYUV: case COLOR_RGB2YUV_YV12: case COLOR_RGB2YUV_IYUV: case COLOR_RGB2YUV_YV12: