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

Fixed #1613: removed YUV420i color conversion constants

Browse Source
This commit is contained in:
Andrey Kamaev
2012-02-21 15:08:03 +00:00
parent 9a88aea697
commit e426dfc396
7 changed files with 47 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,7 +106,7 @@ CV_ENUM(CvtMode,
CV_YUV2BGR, CV_YUV2RGB, CX_YUV2BGRA, CX_YUV2RGBA
)
CV_ENUM(CvtMode2, CV_YUV420i2BGR, CV_YUV420i2BGRA, CV_YUV420i2RGB, CV_YUV420i2RGBA, CV_YUV420sp2BGR, CV_YUV420sp2BGRA, CV_YUV420sp2RGB, CV_YUV420sp2RGBA)
CV_ENUM(CvtMode2, CV_YUV2BGR_NV12, CV_YUV2BGRA_NV12, CV_YUV2RGB_NV12, CV_YUV2RGBA_NV12, CV_YUV420sp2BGR, CV_YUV420sp2BGRA, CV_YUV420sp2RGB, CV_YUV420sp2RGBA)
struct ChPair
{
@@ -127,12 +127,12 @@ ChPair getConversionInfo(int cvtMode)
case CV_BayerGB2BGR: case CV_BayerGB2BGR_VNG:
case CV_BayerGR2BGR: case CV_BayerGR2BGR_VNG:
case CV_BayerRG2BGR: case CV_BayerRG2BGR_VNG:
case CV_GRAY2BGR: case CV_YUV420i2BGR:
case CV_YUV420i2RGB: case CV_YUV420sp2BGR:
case CV_GRAY2BGR: case CV_YUV2BGR_NV12:
case CV_YUV2RGB_NV12: case CV_YUV420sp2BGR:
case CV_YUV420sp2RGB:
return ChPair(1,3);
case CV_GRAY2BGRA: case CV_YUV420i2BGRA:
case CV_YUV420i2RGBA: case CV_YUV420sp2BGRA:
case CV_GRAY2BGRA: case CV_YUV2BGRA_NV12:
case CV_YUV2RGBA_NV12: case CV_YUV420sp2BGRA:
case CV_YUV420sp2RGBA:
return ChPair(1,4);
case CV_BGR5552GRAY: case CV_BGR5652GRAY:
@@ -259,4 +259,4 @@ PERF_TEST_P(Size_CvtMode2, cvtColorYUV420,
TEST_CYCLE() cvtColor(src, dst, mode, ch.dcn);
SANITY_CHECK(dst, 1);
}
}