From 6c2cdb677245c7f515d4cda5ca7a369ce088340f Mon Sep 17 00:00:00 2001 From: Ethan Rublee Date: Tue, 15 Mar 2011 16:31:53 +0000 Subject: [PATCH] Applying fix described in ticket #910. sift was not being built for arm... --- modules/features2d/src/sift.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/features2d/src/sift.cpp b/modules/features2d/src/sift.cpp index 61e999953..f97f1faa6 100644 --- 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"); }