NEON instruction set enabled for WIN32 on ARM by default.

This commit is contained in:
Alexander Smorkalov 2013-08-04 08:47:42 -07:00
parent ee8687ba19
commit 2243118fc0
2 changed files with 12 additions and 2 deletions

View File

@ -136,7 +136,13 @@ CV_INLINE IppiSize ippiSize(int width, int height)
# endif # endif
#endif #endif
#ifdef __ARM_NEON__
#if (defined WIN32 || defined _WIN32) && defined(_M_ARM)
# include <Intrin.h>
# include "arm_neon.h"
# define CV_NEON 1
# define CPU_HAS_NEON_FEATURE (true)
#elif defined(__ARM_NEON__)
# include <arm_neon.h> # include <arm_neon.h>
# define CV_NEON 1 # define CV_NEON 1
# define CPU_HAS_NEON_FEATURE (true) # define CPU_HAS_NEON_FEATURE (true)

View File

@ -43,8 +43,12 @@ typedef unsigned __int64 uint64_t;
#include "defines.h" #include "defines.h"
#if (defined WIN32 || defined _WIN32) && defined(_M_ARM)
# include <Intrin.h>
#endif
#ifdef __ARM_NEON__ #ifdef __ARM_NEON__
#include "arm_neon.h" # include "arm_neon.h"
#endif #endif
namespace cvflann namespace cvflann