Merge pull request #1940 from pentschev:ocl_bfm_oclMat_ptr_fix_2.4

pull/1943/head
Andrey Pavlenko 11 years ago committed by OpenCV Buildbot
commit 72cfff4c59
  1. 2
      modules/ocl/src/brute_force_matcher.cpp

@ -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_32S, imgIdx);
ensureSizeIsEnough(1, nQuery, CV_32F, distance); 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; return;
} }

Loading…
Cancel
Save