From cf1ae3513ff8b531e417d9d0164f28a4a0d87725 Mon Sep 17 00:00:00 2001 From: Alexander Karsakov Date: Mon, 18 Aug 2014 18:34:44 +0400 Subject: [PATCH] Fixed getConversionInfo() for YUV2RGBA_* conversions --- modules/imgproc/perf/perf_cvt_color.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/imgproc/perf/perf_cvt_color.cpp b/modules/imgproc/perf/perf_cvt_color.cpp index f2da6ce29..02622ea80 100644 --- a/modules/imgproc/perf/perf_cvt_color.cpp +++ b/modules/imgproc/perf/perf_cvt_color.cpp @@ -155,14 +155,14 @@ ChPair getConversionInfo(int cvtMode) case COLOR_BGR5552BGR: case COLOR_BGR5552RGB: case COLOR_BGR5652BGR: case COLOR_BGR5652RGB: 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_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); case COLOR_BGR5552BGRA: case COLOR_BGR5552RGBA: 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); case COLOR_BGR2GRAY: case COLOR_RGB2GRAY: case COLOR_RGB2YUV_IYUV: case COLOR_RGB2YUV_YV12: