projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ca803e1
)
Applying fix described in ticket #910. sift was not being built for arm...
author
Ethan Rublee
<no@email>
Tue, 15 Mar 2011 16:31:53 +0000
(16:31 +0000)
committer
Ethan Rublee
<no@email>
Tue, 15 Mar 2011 16:31:53 +0000
(16:31 +0000)
modules/features2d/src/sift.cpp
patch
|
blob
|
history
diff --git
a/modules/features2d/src/sift.cpp
b/modules/features2d/src/sift.cpp
index 61e999953392366291f84145824487a841254cf9..f97f1faa615f1175950d1185344ce9acef96264d 100644
(file)
--- a/
modules/features2d/src/sift.cpp
+++ b/
modules/features2d/src/sift.cpp
@@
-48,14
+48,15
@@
#include "precomp.hpp"
-#ifdef __arm__
-#define ARM_NO_SIFT
-#endif
+
//
#ifdef __arm__
+
//
#define ARM_NO_SIFT
+
//
#endif
-#ifdef ANDROID
-#undef ARM_NO_SIFT
-#endif //ANDROID
+
//
#ifdef ANDROID
+
//
#undef ARM_NO_SIFT
+
//
#endif //ANDROID
+#undef ARM_NO_SIFT
#ifdef ARM_NO_SIFT
static inline void throw_nosift() { CV_Error(CV_StsBadFunc, "The library is compiled under ARM without SIFT support"); }