fixed gpu performance sample (SURF usage)

added tests for filter2D

diff --git a/samples/gpu/performance/tests.cpp b/samples/gpu/performance/tests.cpp
index a49ba2a..ddb77bb 100644 (file)
--- a/samples/gpu/performance/tests.cpp
+++ b/samples/gpu/performance/tests.cpp
@@ -273,7 +273,7 @@ TEST(SURF)
 \r
     SURF surf;\r
     vector<KeyPoint> keypoints;\r
-    vector<float> descriptors;\r
+    Mat descriptors;\r
 \r
     surf(src, Mat(), keypoints, descriptors);\r
 \r
@@ -899,7 +899,6 @@ TEST(solvePnPRansac)
     }\r
 }\r
 \r
-\r
 TEST(GaussianBlur)\r
 {\r
     for (int size = 1000; size <= 4000; size += 1000)\r
@@ -928,6 +927,39 @@ TEST(GaussianBlur)
     }\r
 }\r
 \r
+TEST(filter2D)\r
+{\r
+    for (int size = 1000; size <= 4000; size += 1000)\r
+    {\r
+        Mat src;\r
+        gen(src, size, size, CV_8UC4, 0, 256);\r
+                \r
+        for (int ksize = 3; ksize <= 16; ksize += 2)\r
+        {        \r
+            SUBTEST << "ksize = " << ksize << ", " << size << 'x' << size << ", 8UC4";\r
+            \r
+            Mat kernel;\r
+            gen(kernel, ksize, ksize, CV_32FC1, 0.0, 1.0);\r
+\r
+            Mat dst;\r
+            cv::filter2D(src, dst, -1, kernel);\r
+\r
+            CPU_ON;\r
+            cv::filter2D(src, dst, -1, kernel);\r
+            CPU_OFF;\r
+\r
+            gpu::GpuMat d_src(src);\r
+            gpu::GpuMat d_dst;\r
+\r
+            gpu::filter2D(d_src, d_dst, -1, kernel);\r
+\r
+            GPU_ON;\r
+            gpu::filter2D(d_src, d_dst, -1, kernel);\r
+            GPU_OFF;\r
+        }\r
+    }\r
+}\r
+\r
 TEST(pyrDown)\r
 {\r
     for (int size = 4000; size >= 1000; size -= 1000)\r