From: Vadim Pisarevsky <no@email>
Date: Tue, 30 Nov 2010 16:36:26 +0000 (+0000)
Subject: undo the latest change in SURF
X-Git-Tag: accepted/2.0/20130307.220821~4002
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=196d45bc3ef6c33044945a17ba9f6c88a1fbcd4e;p=profile%2Fivi%2Fopencv.git

undo the latest change in SURF
---

diff --git a/modules/features2d/src/surf.cpp b/modules/features2d/src/surf.cpp
index 6affab1..b0a0c75 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(&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++ )