more compilation fixes

diff --git a/modules/gpu/perf/utility.hpp b/modules/gpu/perf/utility.hpp
index b40d55e..3517909 100644 (file)
--- a/modules/gpu/perf/utility.hpp
+++ b/modules/gpu/perf/utility.hpp
@@ -16,12 +16,13 @@ using perf::MatDepth;
 \r
 CV_ENUM(BorderMode, cv::BORDER_REFLECT101, cv::BORDER_REPLICATE, cv::BORDER_CONSTANT, cv::BORDER_REFLECT, cv::BORDER_WRAP)\r
 #define ALL_BORDER_MODES testing::ValuesIn(BorderMode::all())\r
+\r
 CV_ENUM(Interpolation, cv::INTER_NEAREST, cv::INTER_LINEAR, cv::INTER_CUBIC, cv::INTER_AREA)\r
 #define ALL_INTERPOLATIONS testing::ValuesIn(Interpolation::all())\r
 CV_ENUM(NormType, cv::NORM_INF, cv::NORM_L1, cv::NORM_L2, cv::NORM_HAMMING)\r
 \r
-enum { Gray = 1, TwoChannel = 2, BGR = 3, BGRA = 4 };\r
-CV_ENUM(MatCn, Gray, TwoChannel, BGR, BGRA)\r
+const int Gray = 1, TwoChannel = 2, BGR = 3, BGRA = 4;\r
+CV_FLAGS(MatCn, Gray, TwoChannel, BGR, BGRA)\r
 #define GPU_CHANNELS_1_3_4 testing::Values(Gray, BGR, BGRA)\r
 #define GPU_CHANNELS_1_3 testing::Values(Gray, BGR)\r
 \r
@@ -43,7 +44,7 @@ void PrintTo(const CvtColorInfo& info, std::ostream* os);
 DEF_PARAM_TEST_1(Sz, cv::Size);\r
 typedef perf::Size_MatType Sz_Type;\r
 DEF_PARAM_TEST(Sz_Depth, cv::Size, MatDepth);\r
-DEF_PARAM_TEST(Sz_Depth_Cn, cv::Size, MatDepth, int);\r
+DEF_PARAM_TEST(Sz_Depth_Cn, cv::Size, MatDepth, MatCn);\r
 \r
 #define GPU_TYPICAL_MAT_SIZES testing::Values(perf::sz720p, perf::szSXGA, perf::sz1080p)\r
 \r