generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor fix of gpu perf tests

Browse Source
This commit is contained in:
Vladislav Vinogradov 2012-05-28 08:08:14 +00:00
parent eb2f1f81ed
commit addcd16d8f
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/gpu/perf_cpu/perf_features2d.cpp
View File

@ -21,6 +21,7 @@ GPU_PERF_TEST_1(SURF, cv::gpu::DeviceInfo)
TEST_CYCLE() TEST_CYCLE()
{ {
keypoints.clear();
surf(img, cv::noArray(), keypoints, descriptors); surf(img, cv::noArray(), keypoints, descriptors);
} }
} }
@ -41,6 +42,7 @@ GPU_PERF_TEST_1(FAST, cv::gpu::DeviceInfo)
TEST_CYCLE() TEST_CYCLE()
{ {
keypoints.clear();
cv::FAST(img, keypoints, 20); cv::FAST(img, keypoints, 20);
} }
} }
@ -64,6 +66,7 @@ GPU_PERF_TEST_1(ORB, cv::gpu::DeviceInfo)
TEST_CYCLE() TEST_CYCLE()
{ {
keypoints.clear();
orb(img, cv::noArray(), keypoints, descriptors); orb(img, cv::noArray(), keypoints, descriptors);
} }
} }

4
modules/gpu/perf_cpu/perf_utility.hpp
View File

@ -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(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(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 struct CvtColorInfo
{ {
@ -32,7 +32,7 @@ void PrintTo(const CvtColorInfo& info, std::ostream* os);
}; \ }; \
inline void PrintTo( name param, 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) IMPLEMENT_PARAM_CLASS(Channels, int)