|
|
@ -886,11 +886,9 @@ cvExtractSURF( const CvArr* _img, const CvArr* _mask, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if ( N > 0 ) |
|
|
|
if ( N > 0 ) |
|
|
|
{ |
|
|
|
cv::parallel_for(cv::BlockedRange(0, N), |
|
|
|
//cv::parallel_for(cv::BlockedRange(0, N),
|
|
|
|
cv::SURFInvoker(¶ms, keypoints, descriptors, img, sum) ); |
|
|
|
// cv::SURFInvoker(¶ms, keypoints, descriptors, img, sum) );
|
|
|
|
|
|
|
|
cv::SURFInvoker(¶ms, 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++ ) |
|
|
|