From: Andrey Kamaev <no@email>
Date: Wed, 1 Jun 2011 12:42:44 +0000 (+0000)
Subject: fixed compilation problems with new SIFT on Android
X-Git-Tag: accepted/2.0/20130307.220821~2962
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=25213d88a8f4791924ab6680b57de6590078a090;p=profile%2Fivi%2Fopencv.git

fixed compilation problems with new SIFT on Android
---

diff --git a/modules/features2d/src/sift.cpp b/modules/features2d/src/sift.cpp
index 8d5831d..0f961d8 100644
--- a/modules/features2d/src/sift.cpp
+++ b/modules/features2d/src/sift.cpp
@@ -1450,10 +1450,10 @@ SIFT::DescriptorParams SIFT::getDescriptorParams () const
 
 struct SiftParams
 {
-    SiftParams( int _O, int _S )
+    SiftParams( int argO, int argS )
     {
-        O = _O;
-        S = _S;
+        O = argO;
+        S = argS;
 
         sigma0 = 1.6 * powf(2.0f, 1.0f / S ) ;