Skip to content

Commit

Permalink
ocl::BruteForceMatcher fix wrong use of oclMat::ptr().
Browse files Browse the repository at this point in the history
The oclMat::ptr() method was mistakenly used in ocl::BruteForceMatcher to pass a pointer to a oclMat object. The ptr() method returns a uchar pointer to the cl_mem data structure and this method will be removed.
  • Loading branch information
pentschev committed Dec 5, 2013
1 parent 9dea590 commit 3bc952e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion modules/ocl/src/brute_force_matcher.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,7 @@ void cv::ocl::BruteForceMatcher_OCL_base::matchCollection(const oclMat &query, c
ensureSizeIsEnough(1, nQuery, CV_32S, imgIdx);
ensureSizeIsEnough(1, nQuery, CV_32F, distance);

matchDispatcher(query, (const oclMat *)trainCollection.ptr(), trainCollection.cols, masks, trainIdx, imgIdx, distance, distType);
matchDispatcher(query, &trainCollection, trainCollection.cols, masks, trainIdx, imgIdx, distance, distType);

return;
}
Expand Down

0 comments on commit 3bc952e

Please sign in to comment.