Merge pull request #1940 from pentschev:ocl_bfm_oclMat_ptr_fix_2.4

72cfff4c · Andrey Pavlenko · OpenCV Buildbot · b0b199ee · 3bc952ed · 72cfff4c
Commit 72cfff4c authored Dec 06, 2013 by Andrey Pavlenko Committed by OpenCV Buildbot Dec 06, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

brute_force_matcher.cpp modules/ocl/src/brute_force_matcher.cpp +1 -1

No files found.
--- a/modules/ocl/src/brute_force_matcher.cpp
+++ b/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_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;
 }