Merge pull request #652 from Daniil-Osokin:fixCvtColorHeader

12 years ago · da00252963
parent 819ac111a2 e153f0631c
commit da00252963
1 changed files with 15 additions and 1 deletions
--- a/modules/imgproc/include/opencv2/imgproc/imgproc.hpp
+++ b/modules/imgproc/include/opencv2/imgproc/imgproc.hpp
@ -1050,7 +1050,21 @@ enum
    COLOR_RGBA2mRGBA = 125,
    COLOR_mRGBA2RGBA = 126,

-    COLOR_COLORCVT_MAX  = 127
+    COLOR_RGB2YUV_I420 = 127,
+    COLOR_BGR2YUV_I420 = 128,
+    COLOR_RGB2YUV_IYUV = COLOR_RGB2YUV_I420,
+    COLOR_BGR2YUV_IYUV = COLOR_BGR2YUV_I420,
+
+    COLOR_RGBA2YUV_I420 = 129,
+    COLOR_BGRA2YUV_I420 = 130,
+    COLOR_RGBA2YUV_IYUV = COLOR_RGBA2YUV_I420,
+    COLOR_BGRA2YUV_IYUV = COLOR_BGRA2YUV_I420,
+    COLOR_RGB2YUV_YV12  = 131,
+    COLOR_BGR2YUV_YV12  = 132,
+    COLOR_RGBA2YUV_YV12 = 133,
+    COLOR_BGRA2YUV_YV12 = 134,
+
+    COLOR_COLORCVT_MAX  = 135
 };