cvtColor: dst channels number default is set to 4 for RGBA/BGRA cases; added new codes for yuv420 to RGBA/BGRA.

2011-09-06 08:35:31 +00:00
parent 84022779a1
commit f2da701723
3 changed files with 20 additions and 9 deletions
--- a/modules/imgproc/include/opencv2/imgproc/imgproc.hpp
+++ b/modules/imgproc/include/opencv2/imgproc/imgproc.hpp
@@ -905,6 +905,11 @@ enum
    COLOR_YUV420sp2RGB = 92,
    COLOR_YUV420sp2BGR = 93,
    
+    COLOR_YUV420i2RGBA  = 94,
+    COLOR_YUV420i2BGRA  = 95,
+    COLOR_YUV420sp2RGBA = 96,
+    COLOR_YUV420sp2BGRA = 97,
+
    COLOR_COLORCVT_MAX  =100
 };
    
--- a/modules/imgproc/include/opencv2/imgproc/types_c.h
+++ b/modules/imgproc/include/opencv2/imgproc/types_c.h
@@ -230,6 +230,11 @@ enum
    CV_YUV420i2BGR  = 91,
    CV_YUV420sp2RGB = 92,
    CV_YUV420sp2BGR = 93,
+
+    CV_YUV420i2RGBA  = 94,
+    CV_YUV420i2BGRA  = 95,
+    CV_YUV420sp2RGBA = 96,
+    CV_YUV420sp2BGRA = 97,
    
    CV_COLORCVT_MAX  =100
 };