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

30
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
View File

@@ -918,26 +918,20 @@ enum
COLOR_BayerGB2GRAY = 87,
COLOR_BayerRG2GRAY = 88,
COLOR_BayerGR2GRAY = 89,
COLOR_YUV420i2RGB = 90,
COLOR_YUV420i2BGR = 91,
COLOR_YUV420sp2RGB = 92,
COLOR_YUV420sp2BGR = 93,
COLOR_YUV2RGB_NV12 = COLOR_YUV420i2RGB,
COLOR_YUV2BGR_NV12 = COLOR_YUV420i2BGR,
COLOR_YUV2RGB_NV21 = COLOR_YUV420sp2RGB,
COLOR_YUV2BGR_NV21 = COLOR_YUV420sp2BGR,
COLOR_YUV2RGB_NV12 = 90,
COLOR_YUV2BGR_NV12 = 91,
COLOR_YUV2RGB_NV21 = 92,
COLOR_YUV2BGR_NV21 = 93,
COLOR_YUV420sp2RGB = COLOR_YUV2RGB_NV21,
COLOR_YUV420sp2BGR = COLOR_YUV2BGR_NV21,
COLOR_YUV420i2RGBA = 94,
COLOR_YUV420i2BGRA = 95,
COLOR_YUV420sp2RGBA = 96,
COLOR_YUV420sp2BGRA = 97,
COLOR_YUV2RGBA_NV12 = COLOR_YUV420i2RGBA,
COLOR_YUV2BGRA_NV12 = COLOR_YUV420i2BGRA,
COLOR_YUV2RGBA_NV21 = COLOR_YUV420sp2RGBA,
COLOR_YUV2BGRA_NV21 = COLOR_YUV420sp2BGRA,
COLOR_YUV2RGBA_NV12 = 94,
COLOR_YUV2BGRA_NV12 = 95,
COLOR_YUV2RGBA_NV21 = 96,
COLOR_YUV2BGRA_NV21 = 97,
COLOR_YUV420sp2RGBA = COLOR_YUV2RGBA_NV21,
COLOR_YUV420sp2BGRA = COLOR_YUV2BGRA_NV21,
COLOR_COLORCVT_MAX =100
};

30
modules/imgproc/include/opencv2/imgproc/types_c.h
View File

@@ -225,25 +225,19 @@ enum
CV_BayerRG2GRAY = 88,
CV_BayerGR2GRAY = 89,
CV_YUV420i2RGB = 90,
CV_YUV420i2BGR = 91,
CV_YUV420sp2RGB = 92,
CV_YUV420sp2BGR = 93,
CV_YUV2RGB_NV12 = 90,
CV_YUV2BGR_NV12 = 91,
CV_YUV2RGB_NV21 = 92,
CV_YUV2BGR_NV21 = 93,
CV_YUV420sp2RGB = CV_YUV2RGB_NV21,
CV_YUV420sp2BGR = CV_YUV2BGR_NV21,
CV_YUV2RGB_NV12 = CV_YUV420i2RGB,
CV_YUV2BGR_NV12 = CV_YUV420i2BGR,
CV_YUV2RGB_NV21 = CV_YUV420sp2RGB,
CV_YUV2BGR_NV21 = CV_YUV420sp2BGR,
CV_YUV420i2RGBA = 94,
CV_YUV420i2BGRA = 95,
CV_YUV420sp2RGBA = 96,
CV_YUV420sp2BGRA = 97,
CV_YUV2RGBA_NV12 = CV_YUV420i2RGBA,
CV_YUV2BGRA_NV12 = CV_YUV420i2BGRA,
CV_YUV2RGBA_NV21 = CV_YUV420sp2RGBA,
CV_YUV2BGRA_NV21 = CV_YUV420sp2BGRA,
CV_YUV2RGBA_NV12 = 94,
CV_YUV2BGRA_NV12 = 95,
CV_YUV2RGBA_NV21 = 96,
CV_YUV2BGRA_NV21 = 97,
CV_YUV420sp2RGBA = CV_YUV2RGBA_NV21,
CV_YUV420sp2BGRA = CV_YUV2BGRA_NV21,
CV_COLORCVT_MAX =100
};