Applying fix described in ticket #910. sift was not being built for arm...

6c2cdb67 · Ethan Rublee · ca803e12 · 6c2cdb67
Commit 6c2cdb67 authored Mar 15, 2011 by Ethan Rublee
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 6 deletions

sift.cpp modules/features2d/src/sift.cpp +7 -6

No files found.
--- 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"); }