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

Replace create with ensureSizeIsEnough thus buffer objects can be reused.

Browse Source
This commit is contained in:
peng xiao 2013-04-12 16:47:44 +08:00
parent ca56e99a62
commit 1e49c00f4b
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
modules/ocl/src/brute_force_matcher.cpp
View File

@ -547,8 +547,8 @@ void cv::ocl::BruteForceMatcher_OCL_base::matchSingle(const oclMat &query, const
CV_Assert(query.channels() == 1 && query.depth() < CV_64F); CV_Assert(query.channels() == 1 && query.depth() < CV_64F);
CV_Assert(train.cols == query.cols && train.type() == query.type()); CV_Assert(train.cols == query.cols && train.type() == query.type());
trainIdx.create(1, query.rows, CV_32S); ensureSizeIsEnough(1, query.rows, CV_32S, trainIdx);
distance.create(1, query.rows, CV_32F); ensureSizeIsEnough(1, query.rows, CV_32F, distance);
matchDispatcher(query, train, mask, trainIdx, distance, distType); matchDispatcher(query, train, mask, trainIdx, distance, distType);
exit: exit:
@ -667,10 +667,11 @@ void cv::ocl::BruteForceMatcher_OCL_base::matchCollection(const oclMat &query, c
} }
CV_Assert(query.channels() == 1 && query.depth() < CV_64F); CV_Assert(query.channels() == 1 && query.depth() < CV_64F);
const int nQuery = query.rows;
trainIdx.create(1, query.rows, CV_32S); ensureSizeIsEnough(1, nQuery, CV_32S, trainIdx);
imgIdx.create(1, query.rows, CV_32S); ensureSizeIsEnough(1, nQuery, CV_32S, imgIdx);
distance.create(1, query.rows, CV_32F); ensureSizeIsEnough(1, nQuery, CV_32F, distance);
matchDispatcher(query, (const oclMat *)trainCollection.ptr(), trainCollection.cols, masks, trainIdx, imgIdx, distance, distType); matchDispatcher(query, (const oclMat *)trainCollection.ptr(), trainCollection.cols, masks, trainIdx, imgIdx, distance, distType);
exit: exit:
@ -759,16 +760,18 @@ void cv::ocl::BruteForceMatcher_OCL_base::knnMatchSingle(const oclMat &query, co
CV_Assert(query.channels() == 1 && query.depth() < CV_64F); CV_Assert(query.channels() == 1 && query.depth() < CV_64F);
CV_Assert(train.type() == query.type() && train.cols == query.cols); CV_Assert(train.type() == query.type() && train.cols == query.cols);
const int nQuery = query.rows;
const int nTrain = train.rows;
if (k == 2) if (k == 2)
{ {
trainIdx.create(1, query.rows, CV_32SC2); ensureSizeIsEnough(1, nQuery, CV_32SC2, trainIdx);
distance.create(1, query.rows, CV_32FC2); ensureSizeIsEnough(1, nQuery, CV_32FC2, distance);
} }
else else
{ {
trainIdx.create(query.rows, k, CV_32S); ensureSizeIsEnough(nQuery, k, CV_32S, trainIdx);
distance.create(query.rows, k, CV_32F); ensureSizeIsEnough(nQuery, k, CV_32F, distance);
allDist.create(query.rows, train.rows, CV_32FC1); ensureSizeIsEnough(nQuery, nTrain, CV_32FC1, allDist);
} }
trainIdx.setTo(Scalar::all(-1)); trainIdx.setTo(Scalar::all(-1));
@ -873,9 +876,9 @@ void cv::ocl::BruteForceMatcher_OCL_base::knnMatch2Collection(const oclMat &quer
const int nQuery = query.rows; const int nQuery = query.rows;
trainIdx.create(1, nQuery, CV_32SC2); ensureSizeIsEnough(1, nQuery, CV_32SC2, trainIdx);
imgIdx.create(1, nQuery, CV_32SC2); ensureSizeIsEnough(1, nQuery, CV_32SC2, imgIdx);
distance.create(1, nQuery, CV_32SC2); ensureSizeIsEnough(1, nQuery, CV_32FC2, distance);
trainIdx.setTo(Scalar::all(-1)); trainIdx.setTo(Scalar::all(-1));
@ -1031,15 +1034,17 @@ void cv::ocl::BruteForceMatcher_OCL_base::radiusMatchSingle(const oclMat &query,
CV_ERROR(CV_UNSUPPORTED_DEPTH_ERR, "BruteForceMatch OpenCL only support float type query!\n"); CV_ERROR(CV_UNSUPPORTED_DEPTH_ERR, "BruteForceMatch OpenCL only support float type query!\n");
} }
const int nQuery = query.rows;
const int nTrain = train.rows;
CV_Assert(query.channels() == 1 && query.depth() < CV_64F); CV_Assert(query.channels() == 1 && query.depth() < CV_64F);
CV_Assert(train.type() == query.type() && train.cols == query.cols); CV_Assert(train.type() == query.type() && train.cols == query.cols);
CV_Assert(trainIdx.empty() || (trainIdx.rows == query.rows && trainIdx.size() == distance.size())); CV_Assert(trainIdx.empty() || (trainIdx.rows == query.rows && trainIdx.size() == distance.size()));
nMatches.create(1, query.rows, CV_32SC1); ensureSizeIsEnough(1, nQuery, CV_32SC1, nMatches);
if (trainIdx.empty()) if (trainIdx.empty())
{ {
trainIdx.create(query.rows, std::max((train.rows/ 100), 10), CV_32SC1); ensureSizeIsEnough(nQuery, std::max((nTrain / 100), 10), CV_32SC1, trainIdx);
distance.create(query.rows, std::max((train.rows/ 100), 10), CV_32FC1); ensureSizeIsEnough(nQuery, std::max((nTrain / 100), 10), CV_32FC1, distance);
} }
nMatches.setTo(Scalar::all(0)); nMatches.setTo(Scalar::all(0));