Fixed typo.

diff --git a/modules/imgproc/include/opencv2/imgproc/imgproc.hpp b/modules/imgproc/include/opencv2/imgproc/imgproc.hpp
index 6817977..3706030 100644 (file)
--- a/modules/imgproc/include/opencv2/imgproc/imgproc.hpp
+++ b/modules/imgproc/include/opencv2/imgproc/imgproc.hpp
@@ -996,13 +996,13 @@ enum
     COLOR_YUV2BGRA_YUNV = COLOR_YUV2BGRA_YUY2,
     
     COLOR_YUV2GRAY_UYVY = 123,
-    COLOR_YUV2GRAY_YUV2 = 124,
+    COLOR_YUV2GRAY_YUY2 = 124,
     //COLOR_YUV2GRAY_VYUY = COLOR_YUV2GRAY_UYVY,
     COLOR_YUV2GRAY_Y422 = COLOR_YUV2GRAY_UYVY,
     COLOR_YUV2GRAY_UYNV = COLOR_YUV2GRAY_UYVY,
-    COLOR_YUV2GRAY_YVYU = COLOR_YUV2GRAY_YUV2,
-    COLOR_YUV2GRAY_YUYV = COLOR_YUV2GRAY_YUV2,
-    COLOR_YUV2GRAY_YUNV = COLOR_YUV2GRAY_YUV2,
+    COLOR_YUV2GRAY_YVYU = COLOR_YUV2GRAY_YUY2,
+    COLOR_YUV2GRAY_YUYV = COLOR_YUV2GRAY_YUY2,
+    COLOR_YUV2GRAY_YUNV = COLOR_YUV2GRAY_YUY2,
     
     COLOR_COLORCVT_MAX  = 125
 };

diff --git a/modules/imgproc/include/opencv2/imgproc/types_c.h b/modules/imgproc/include/opencv2/imgproc/types_c.h
index d75050d..126b457 100644 (file)
--- a/modules/imgproc/include/opencv2/imgproc/types_c.h
+++ b/modules/imgproc/include/opencv2/imgproc/types_c.h
@@ -298,13 +298,13 @@ enum
     CV_YUV2BGRA_YUNV = CV_YUV2BGRA_YUY2,
     
     CV_YUV2GRAY_UYVY = 123,
-    CV_YUV2GRAY_YUV2 = 124,
+    CV_YUV2GRAY_YUY2 = 124,
     //CV_YUV2GRAY_VYUY = CV_YUV2GRAY_UYVY,
     CV_YUV2GRAY_Y422 = CV_YUV2GRAY_UYVY,
     CV_YUV2GRAY_UYNV = CV_YUV2GRAY_UYVY,
-    CV_YUV2GRAY_YVYU = CV_YUV2GRAY_YUV2,
-    CV_YUV2GRAY_YUYV = CV_YUV2GRAY_YUV2,
-    CV_YUV2GRAY_YUNV = CV_YUV2GRAY_YUV2,
+    CV_YUV2GRAY_YVYU = CV_YUV2GRAY_YUY2,
+    CV_YUV2GRAY_YUYV = CV_YUV2GRAY_YUY2,
+    CV_YUV2GRAY_YUNV = CV_YUV2GRAY_YUY2,
     
     CV_COLORCVT_MAX  = 125
 };

diff --git a/modules/imgproc/src/color.cpp b/modules/imgproc/src/color.cpp
index 47ae987..1656f09 100644 (file)
--- a/modules/imgproc/src/color.cpp
+++ b/modules/imgproc/src/color.cpp
@@ -3491,7 +3491,7 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
         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:
-        case COLOR_YUV2GRAY_UYVY: case COLOR_YUV2GRAY_YUV2:
+        case COLOR_YUV2GRAY_UYVY: case COLOR_YUV2GRAY_YUY2:
             CV_Error(CV_StsUnsupportedFormat, "This format is not supported yet");
             break;
         default: