minor fix

This commit is contained in:
Vladislav Vinogradov 2012-01-11 05:46:32 +00:00
parent bf747e6deb
commit f0356004bc

View File

@ -158,13 +158,13 @@ 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;
virtual void SetUp()
@ -175,6 +175,9 @@ PARAM_TEST_CASE(BruteForceMatcher, cv::gpu::DeviceInfo, DistType, int)
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();
cv::Mat queryBuf, trainBuf;
@ -234,6 +237,7 @@ TEST_P(BruteForceMatcher, Match)
ASSERT_EQ(0, badCount);
}
TEST_P(BruteForceMatcher, MatchAdd)
{
std::vector<cv::DMatch> matches;
@ -490,6 +494,7 @@ TEST_P(BruteForceMatcher, RadiusMatch)
const float radius = 1.f / countFactor;
std::vector< std::vector<cv::DMatch> > matches;
ASSERT_NO_THROW(