Commit 2c0015e7 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

temporarily turn off TBB threading when computing SURF descriptors (as the…

temporarily turn off TBB threading when computing SURF descriptors (as the parallel version seems to produce different descriptors on each run)
parent 4113d5da
...@@ -886,9 +886,11 @@ cvExtractSURF( const CvArr* _img, const CvArr* _mask, ...@@ -886,9 +886,11 @@ cvExtractSURF( const CvArr* _img, const CvArr* _mask,
if ( N > 0 ) if ( N > 0 )
cv::parallel_for(cv::BlockedRange(0, N), {
cv::SURFInvoker(&params, keypoints, descriptors, img, sum) ); //cv::parallel_for(cv::BlockedRange(0, N),
// cv::SURFInvoker(&params, keypoints, descriptors, img, sum) );
cv::SURFInvoker(&params, keypoints, descriptors, img, sum)(cv::BlockedRange(0, N));
}
/* remove keypoints that were marked for deletion */ /* remove keypoints that were marked for deletion */
for ( i = 0; i < N; i++ ) for ( i = 0; i < N; i++ )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment