From 196d45bc3ef6c33044945a17ba9f6c88a1fbcd4e Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Tue, 30 Nov 2010 16:36:26 +0000 Subject: [PATCH] undo the latest change in SURF --- modules/features2d/src/surf.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/features2d/src/surf.cpp b/modules/features2d/src/surf.cpp index 6affab1ea..b0a0c75ff 100644 --- a/modules/features2d/src/surf.cpp +++ b/modules/features2d/src/surf.cpp @@ -886,11 +886,9 @@ cvExtractSURF( const CvArr* _img, const CvArr* _mask, if ( N > 0 ) - { - //cv::parallel_for(cv::BlockedRange(0, N), - // cv::SURFInvoker(¶ms, keypoints, descriptors, img, sum) ); - cv::SURFInvoker(¶ms, keypoints, descriptors, img, sum)(cv::BlockedRange(0, N)); - } + cv::parallel_for(cv::BlockedRange(0, N), + cv::SURFInvoker(¶ms, keypoints, descriptors, img, sum) ); + /* remove keypoints that were marked for deletion */ for ( i = 0; i < N; i++ )