Fix perf build with CUDA 9.

diff --git a/modules/cudaarithm/perf/perf_core.cpp b/modules/cudaarithm/perf/perf_core.cpp
index dde985c..917ad14 100644 (file)
--- a/modules/cudaarithm/perf/perf_core.cpp
+++ b/modules/cudaarithm/perf/perf_core.cpp
@@ -51,6 +51,8 @@ using namespace perf;
 //////////////////////////////////////////////////////////////////////
 // Merge
 
+DEF_PARAM_TEST(Sz_Depth_Cn, cv::Size, MatDepth, MatCn);
+
 PERF_TEST_P(Sz_Depth_Cn, Merge,
             Combine(CUDA_TYPICAL_MAT_SIZES,
                     ARITHM_MAT_DEPTH,

diff --git a/modules/cudaarithm/perf/perf_element_operations.cpp b/modules/cudaarithm/perf/perf_element_operations.cpp
index ca33950..7739754 100644 (file)
--- a/modules/cudaarithm/perf/perf_element_operations.cpp
+++ b/modules/cudaarithm/perf/perf_element_operations.cpp
@@ -51,6 +51,8 @@ using namespace perf;
 //////////////////////////////////////////////////////////////////////
 // AddMat
 
+DEF_PARAM_TEST(Sz_Depth, cv::Size, MatDepth);
+
 PERF_TEST_P(Sz_Depth, AddMat,
             Combine(CUDA_TYPICAL_MAT_SIZES,
                     ARITHM_MAT_DEPTH))
@@ -776,6 +778,8 @@ PERF_TEST_P(Sz_Depth, BitwiseAndMat,
 //////////////////////////////////////////////////////////////////////
 // BitwiseAndScalar
 
+DEF_PARAM_TEST(Sz_Depth_Cn, cv::Size, MatDepth, MatCn);
+
 PERF_TEST_P(Sz_Depth_Cn, BitwiseAndScalar,
             Combine(CUDA_TYPICAL_MAT_SIZES,
                     Values(CV_8U, CV_16U, CV_32S),

diff --git a/modules/cudaarithm/perf/perf_reductions.cpp b/modules/cudaarithm/perf/perf_reductions.cpp
index 54c5147..8b14846 100644 (file)
--- a/modules/cudaarithm/perf/perf_reductions.cpp
+++ b/modules/cudaarithm/perf/perf_reductions.cpp
@@ -128,6 +128,8 @@ PERF_TEST_P(Sz_Norm, NormDiff,
 //////////////////////////////////////////////////////////////////////
 // Sum
 
+DEF_PARAM_TEST(Sz_Depth_Cn, cv::Size, MatDepth, MatCn);
+
 PERF_TEST_P(Sz_Depth_Cn, Sum,
             Combine(CUDA_TYPICAL_MAT_SIZES,
                     Values(CV_8U, CV_16U, CV_32F),
@@ -228,6 +230,8 @@ PERF_TEST_P(Sz_Depth_Cn, SumSqr,
 //////////////////////////////////////////////////////////////////////
 // MinMax
 
+DEF_PARAM_TEST(Sz_Depth, cv::Size, MatDepth);
+
 PERF_TEST_P(Sz_Depth, MinMax,
             Combine(CUDA_TYPICAL_MAT_SIZES,
                     Values(CV_8U, CV_16U, CV_32F, CV_64F)))

diff --git a/modules/cudaimgproc/perf/perf_blend.cpp b/modules/cudaimgproc/perf/perf_blend.cpp
index 09d8d8f..62d9e83 100644 (file)
--- a/modules/cudaimgproc/perf/perf_blend.cpp
+++ b/modules/cudaimgproc/perf/perf_blend.cpp
@@ -49,6 +49,8 @@ using namespace perf;
 //////////////////////////////////////////////////////////////////////
 // BlendLinear
 
+DEF_PARAM_TEST(Sz_Depth_Cn, cv::Size, MatDepth, MatCn);
+
 PERF_TEST_P(Sz_Depth_Cn, BlendLinear,
             Combine(CUDA_TYPICAL_MAT_SIZES,
                     Values(CV_8U, CV_32F),

diff --git a/modules/cudaimgproc/perf/perf_histogram.cpp b/modules/cudaimgproc/perf/perf_histogram.cpp
index c638ce0..29a1df5 100644 (file)
--- a/modules/cudaimgproc/perf/perf_histogram.cpp
+++ b/modules/cudaimgproc/perf/perf_histogram.cpp
@@ -49,6 +49,8 @@ using namespace perf;
 //////////////////////////////////////////////////////////////////////
 // HistEvenC1
 
+DEF_PARAM_TEST(Sz_Depth, cv::Size, MatDepth);
+
 PERF_TEST_P(Sz_Depth, HistEvenC1,
             Combine(CUDA_TYPICAL_MAT_SIZES,
                     Values(CV_8U, CV_16U, CV_16S)))

diff --git a/modules/cudastereo/perf/perf_stereo.cpp b/modules/cudastereo/perf/perf_stereo.cpp
index 36b065e..2c00a25 100644 (file)
--- a/modules/cudastereo/perf/perf_stereo.cpp
+++ b/modules/cudastereo/perf/perf_stereo.cpp
@@ -192,6 +192,8 @@ PERF_TEST_P(ImagePair, DisparityBilateralFilter,
 //////////////////////////////////////////////////////////////////////
 // ReprojectImageTo3D
 
+DEF_PARAM_TEST(Sz_Depth, cv::Size, MatDepth);
+
 PERF_TEST_P(Sz_Depth, ReprojectImageTo3D,
             Combine(CUDA_TYPICAL_MAT_SIZES,
                     Values(CV_8U, CV_16S)))

diff --git a/modules/cudawarping/perf/perf_warping.cpp b/modules/cudawarping/perf/perf_warping.cpp
index 6ce547e..a6c68df 100644 (file)
--- a/modules/cudawarping/perf/perf_warping.cpp
+++ b/modules/cudawarping/perf/perf_warping.cpp
@@ -364,6 +364,8 @@ PERF_TEST_P(Sz_Depth_Cn_Inter, Rotate,
 //////////////////////////////////////////////////////////////////////
 // PyrDown
 
+DEF_PARAM_TEST(Sz_Depth_Cn, cv::Size, MatDepth, MatCn);
+
 PERF_TEST_P(Sz_Depth_Cn, PyrDown,
             Combine(CUDA_TYPICAL_MAT_SIZES,
                     Values(CV_8U, CV_16U, CV_32F),