diff --git a/modules/gpu/perf_cpu/perf_features2d.cpp b/modules/gpu/perf_cpu/perf_features2d.cpp index 13c6034f4..74579a64a 100644 --- 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) TEST_CYCLE() { + keypoints.clear(); surf(img, cv::noArray(), keypoints, descriptors); } } @@ -41,6 +42,7 @@ GPU_PERF_TEST_1(FAST, cv::gpu::DeviceInfo) TEST_CYCLE() { + keypoints.clear(); cv::FAST(img, keypoints, 20); } } @@ -64,6 +66,7 @@ GPU_PERF_TEST_1(ORB, cv::gpu::DeviceInfo) TEST_CYCLE() { + keypoints.clear(); orb(img, cv::noArray(), keypoints, descriptors); } } diff --git a/modules/gpu/perf_cpu/perf_utility.hpp b/modules/gpu/perf_cpu/perf_utility.hpp index 1af0a0a33..6bfc9c8a7 100644 --- a/modules/gpu/perf_cpu/perf_utility.hpp +++ b/modules/gpu/perf_cpu/perf_utility.hpp @@ -8,7 +8,7 @@ using perf::MatDepth; CV_ENUM(BorderMode, cv::BORDER_REFLECT101, cv::BORDER_REPLICATE, cv::BORDER_CONSTANT, cv::BORDER_REFLECT, cv::BORDER_WRAP) CV_ENUM(Interpolation, cv::INTER_NEAREST, cv::INTER_LINEAR, cv::INTER_CUBIC) -CV_ENUM(NormType, cv::NORM_INF, cv::NORM_L1, cv::NORM_L2) +CV_ENUM(NormType, cv::NORM_INF, cv::NORM_L1, cv::NORM_L2, cv::NORM_HAMMING) struct CvtColorInfo { @@ -32,7 +32,7 @@ void PrintTo(const CvtColorInfo& info, std::ostream* os); }; \ inline void PrintTo( name param, std::ostream* os) \ { \ - *os << #name << "(" << testing::PrintToString(static_cast< type >(param)) << ")"; \ + *os << #name << " = " << testing::PrintToString(static_cast< type >(param)); \ } IMPLEMENT_PARAM_CLASS(Channels, int)