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

Allow more query/train types for ocl::bfmatcher

Browse Source
This commit is contained in:
Peng Xiao
2013-04-13 14:08:58 +08:00
parent 1db20099a9
commit 6b6b1c9cbf
3 changed files with 34 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/ocl/test/test_brute_force_matcher.cpp
View File

@@ -158,11 +158,7 @@ namespace
TEST_P(BruteForceMatcher, RadiusMatch_Single)
{
float radius;
if(distType == cv::ocl::BruteForceMatcher_OCL_base::L2Dist)
radius = 1.f / countFactor / countFactor;
else
radius = 1.f / countFactor;
float radius = 1.f / countFactor;
cv::ocl::BruteForceMatcher_OCL_base matcher(distType);
@@ -193,8 +189,8 @@ namespace
testing::Combine(
testing::Values(
DistType(cv::ocl::BruteForceMatcher_OCL_base::L1Dist),
DistType(cv::ocl::BruteForceMatcher_OCL_base::L2Dist),
DistType(cv::ocl::BruteForceMatcher_OCL_base::HammingDist)
DistType(cv::ocl::BruteForceMatcher_OCL_base::L2Dist)/*,
DistType(cv::ocl::BruteForceMatcher_OCL_base::HammingDist)*/
),
testing::Values(
DescriptorSize(57),