projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
29b45e7
)
fixed compilation problems with new SIFT on Android
author
Andrey Kamaev
<no@email>
Wed, 1 Jun 2011 12:42:44 +0000
(12:42 +0000)
committer
Andrey Kamaev
<no@email>
Wed, 1 Jun 2011 12:42:44 +0000
(12:42 +0000)
modules/features2d/src/sift.cpp
patch
|
blob
|
history
diff --git
a/modules/features2d/src/sift.cpp
b/modules/features2d/src/sift.cpp
index
8d5831d
..
0f961d8
100644
(file)
--- 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 arg
S )
{
- O =
_
O;
- S =
_
S;
+ O =
arg
O;
+ S =
arg
S;
sigma0 = 1.6 * powf(2.0f, 1.0f / S ) ;