minor fix of gpu perf tests

diff --git a/modules/gpu/perf_cpu/perf_features2d.cpp b/modules/gpu/perf_cpu/perf_features2d.cpp
index 13c6034..74579a6 100644 (file)
--- a/modules/gpu/perf_cpu/perf_features2d.cpp
+++ b/modules/gpu/perf_cpu/perf_features2d.cpp
@@ -21,6 +21,7 @@ GPU_PERF_TEST_1(SURF, cv::gpu::DeviceInfo)
 \r
     TEST_CYCLE()\r
     {\r
+        keypoints.clear();\r
         surf(img, cv::noArray(), keypoints, descriptors);\r
     }\r
 }\r
@@ -41,6 +42,7 @@ GPU_PERF_TEST_1(FAST, cv::gpu::DeviceInfo)
 \r
     TEST_CYCLE()\r
     {\r
+        keypoints.clear();\r
         cv::FAST(img, keypoints, 20);\r
     }\r
 }\r
@@ -64,6 +66,7 @@ GPU_PERF_TEST_1(ORB, cv::gpu::DeviceInfo)
 \r
     TEST_CYCLE()\r
     {\r
+        keypoints.clear();\r
         orb(img, cv::noArray(), keypoints, descriptors);\r
     }\r
 }\r

diff --git a/modules/gpu/perf_cpu/perf_utility.hpp b/modules/gpu/perf_cpu/perf_utility.hpp
index 1af0a0a..6bfc9c8 100644 (file)
--- a/modules/gpu/perf_cpu/perf_utility.hpp
+++ b/modules/gpu/perf_cpu/perf_utility.hpp
@@ -8,7 +8,7 @@ using perf::MatDepth;
 \r
 CV_ENUM(BorderMode, cv::BORDER_REFLECT101, cv::BORDER_REPLICATE, cv::BORDER_CONSTANT, cv::BORDER_REFLECT, cv::BORDER_WRAP)\r
 CV_ENUM(Interpolation, cv::INTER_NEAREST, cv::INTER_LINEAR, cv::INTER_CUBIC)\r
-CV_ENUM(NormType, cv::NORM_INF, cv::NORM_L1, cv::NORM_L2)\r
+CV_ENUM(NormType, cv::NORM_INF, cv::NORM_L1, cv::NORM_L2, cv::NORM_HAMMING)\r
 \r
 struct CvtColorInfo\r
 {\r
@@ -32,7 +32,7 @@ void PrintTo(const CvtColorInfo& info, std::ostream* os);
     }; \\r
     inline void PrintTo( name param, std::ostream* os) \\r
     { \\r
-        *os << #name <<  "(" << testing::PrintToString(static_cast< type >(param)) << ")"; \\r
+        *os << #name <<  " = " << testing::PrintToString(static_cast< type >(param)); \\r
     }\r
 \r
 IMPLEMENT_PARAM_CLASS(Channels, int)\r