undo the latest change in SURF

diff --git a/modules/features2d/src/surf.cpp b/modules/features2d/src/surf.cpp
index 6affab1..b0a0c75 100644 (file)
--- 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(&params, keypoints, descriptors, img, sum) );
-        cv::SURFInvoker(&params, keypoints, descriptors, img, sum)(cv::BlockedRange(0, N));
-    }
+    cv::parallel_for(cv::BlockedRange(0, N),
+                     cv::SURFInvoker(&params, keypoints, descriptors, img, sum) );
+
 
     /* remove keypoints that were marked for deletion */
     for ( i = 0; i < N; i++ )