From 2243118fc039288a2a4aaa6972b63c84b6b29ae1 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Sun, 4 Aug 2013 08:47:42 -0700 Subject: [PATCH] NEON instruction set enabled for WIN32 on ARM by default. --- modules/core/include/opencv2/core/internal.hpp | 8 +++++++- modules/flann/include/opencv2/flann/dist.h | 6 +++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/core/include/opencv2/core/internal.hpp b/modules/core/include/opencv2/core/internal.hpp index 5e8a03b..2f26e7c 100644 --- a/modules/core/include/opencv2/core/internal.hpp +++ b/modules/core/include/opencv2/core/internal.hpp @@ -136,7 +136,13 @@ CV_INLINE IppiSize ippiSize(int width, int height) # endif #endif -#ifdef __ARM_NEON__ + +#if (defined WIN32 || defined _WIN32) && defined(_M_ARM) +# include +# include "arm_neon.h" +# define CV_NEON 1 +# define CPU_HAS_NEON_FEATURE (true) +#elif defined(__ARM_NEON__) # include # define CV_NEON 1 # define CPU_HAS_NEON_FEATURE (true) diff --git a/modules/flann/include/opencv2/flann/dist.h b/modules/flann/include/opencv2/flann/dist.h index 7380d0c..80ae2dc 100644 --- a/modules/flann/include/opencv2/flann/dist.h +++ b/modules/flann/include/opencv2/flann/dist.h @@ -43,8 +43,12 @@ typedef unsigned __int64 uint64_t; #include "defines.h" +#if (defined WIN32 || defined _WIN32) && defined(_M_ARM) +# include +#endif + #ifdef __ARM_NEON__ -#include "arm_neon.h" +# include "arm_neon.h" #endif namespace cvflann -- 2.7.4