From: Vladislav Vinogradov Date: Wed, 11 Jan 2012 05:46:32 +0000 (+0000) Subject: minor fix X-Git-Tag: accepted/2.0/20130307.220821~1473 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f0356004bc152e258032da9f738b80ee2764f0d4;p=profile%2Fivi%2Fopencv.git minor fix --- diff --git a/modules/gpu/test/test_features2d.cpp b/modules/gpu/test/test_features2d.cpp index deeb72c..96fd992 100644 --- a/modules/gpu/test/test_features2d.cpp +++ b/modules/gpu/test/test_features2d.cpp @@ -158,12 +158,12 @@ INSTANTIATE_TEST_CASE_P(Features2D, SURF, DEVICES(cv::gpu::GLOBAL_ATOMICS)); PARAM_TEST_CASE(BruteForceMatcher, cv::gpu::DeviceInfo, DistType, int) { - static const int queryDescCount = 300; // must be even number because we split train data in some cases in two - static const int countFactor = 4; // do not change it - cv::gpu::DeviceInfo devInfo; cv::gpu::BruteForceMatcher_GPU_base::DistType distType; int dim; + + int queryDescCount; + int countFactor; cv::Mat query, train; @@ -174,6 +174,9 @@ PARAM_TEST_CASE(BruteForceMatcher, cv::gpu::DeviceInfo, DistType, int) dim = GET_PARAM(2); cv::gpu::setDevice(devInfo.deviceID()); + + queryDescCount = 300; // must be even number because we split train data in some cases in two + countFactor = 4; // do not change it cv::RNG& rng = cvtest::TS::ptr()->get_rng(); @@ -234,6 +237,7 @@ TEST_P(BruteForceMatcher, Match) ASSERT_EQ(0, badCount); } + TEST_P(BruteForceMatcher, MatchAdd) { std::vector matches; @@ -490,6 +494,7 @@ TEST_P(BruteForceMatcher, RadiusMatch) const float radius = 1.f / countFactor; + std::vector< std::vector > matches; ASSERT_NO_THROW(