Fixed gcc build

diff --git a/modules/imgproc/test/test_cvtyuv.cpp b/modules/imgproc/test/test_cvtyuv.cpp
index 6907bd0..d399286 100644 (file)
--- a/modules/imgproc/test/test_cvtyuv.cpp
+++ b/modules/imgproc/test/test_cvtyuv.cpp
@@ -471,17 +471,17 @@ TEST_P(Imgproc_ColorYUV, roi_accuracy)
 }\r
 \r
 INSTANTIATE_TEST_CASE_P(cvt420, Imgproc_ColorYUV,\r
 }\r
 \r
 INSTANTIATE_TEST_CASE_P(cvt420, Imgproc_ColorYUV,\r

-    ::testing::Values(CV_YUV2RGB_NV12, CV_YUV2BGR_NV12, CV_YUV2RGB_NV21, CV_YUV2BGR_NV21,\r
-                      CV_YUV2RGBA_NV12, CV_YUV2BGRA_NV12, CV_YUV2RGBA_NV21, CV_YUV2BGRA_NV21,\r
-                      CV_YUV2RGB_YV12, CV_YUV2BGR_YV12, CV_YUV2RGB_IYUV, CV_YUV2BGR_IYUV,\r
-                      CV_YUV2RGBA_YV12, CV_YUV2BGRA_YV12, CV_YUV2RGBA_IYUV, CV_YUV2BGRA_IYUV,\r
-                      CV_YUV2GRAY_420));\r
+    ::testing::Values((int)CV_YUV2RGB_NV12, (int)CV_YUV2BGR_NV12, (int)CV_YUV2RGB_NV21, (int)CV_YUV2BGR_NV21,\r
+                      (int)CV_YUV2RGBA_NV12, (int)CV_YUV2BGRA_NV12, (int)CV_YUV2RGBA_NV21, (int)CV_YUV2BGRA_NV21,\r
+                      (int)CV_YUV2RGB_YV12, (int)CV_YUV2BGR_YV12, (int)CV_YUV2RGB_IYUV, (int)CV_YUV2BGR_IYUV,\r
+                      (int)CV_YUV2RGBA_YV12, (int)CV_YUV2BGRA_YV12, (int)CV_YUV2RGBA_IYUV, (int)CV_YUV2BGRA_IYUV,\r
+                      (int)CV_YUV2GRAY_420));\r

 \r
 INSTANTIATE_TEST_CASE_P(DISABLED_cvt888, Imgproc_ColorYUV,\r
 \r
 INSTANTIATE_TEST_CASE_P(DISABLED_cvt888, Imgproc_ColorYUV,\r

-    ::testing::Values(CV_YUV2BGR, CV_YUV2RGB));\r
+    ::testing::Values((int)CV_YUV2BGR, (int)CV_YUV2RGB));\r

 \r
 INSTANTIATE_TEST_CASE_P(DISABLED_cvt422, Imgproc_ColorYUV,\r
 \r
 INSTANTIATE_TEST_CASE_P(DISABLED_cvt422, Imgproc_ColorYUV,\r

-    ::testing::Values(CV_YUV2RGB_UYVY, CV_YUV2BGR_UYVY, CV_YUV2RGBA_UYVY, CV_YUV2BGRA_UYVY,\r
-                      CV_YUV2RGB_YUY2, CV_YUV2BGR_YUY2, CV_YUV2RGB_YVYU, CV_YUV2BGR_YVYU,\r
-                      CV_YUV2RGBA_YUY2, CV_YUV2BGRA_YUY2, CV_YUV2RGBA_YVYU, CV_YUV2BGRA_YVYU,\r
-                      CV_YUV2GRAY_UYVY, CV_YUV2GRAY_YUY2));\r
+    ::testing::Values((int)CV_YUV2RGB_UYVY, (int)CV_YUV2BGR_UYVY, (int)CV_YUV2RGBA_UYVY, (int)CV_YUV2BGRA_UYVY,\r
+                      (int)CV_YUV2RGB_YUY2, (int)CV_YUV2BGR_YUY2, (int)CV_YUV2RGB_YVYU, (int)CV_YUV2BGR_YVYU,\r
+                      (int)CV_YUV2RGBA_YUY2, (int)CV_YUV2BGRA_YUY2, (int)CV_YUV2RGBA_YVYU, (int)CV_YUV2BGRA_YVYU,\r
+                      (int)CV_YUV2GRAY_UYVY, (int)CV_YUV2GRAY_YUY2));\r