Merge pull request #1219 from asmorkalov:winrt_neon

a2ff1b07 · Andrey Pavlenko · OpenCV Buildbot · ee8687ba · 2243118f · a2ff1b07
Commit a2ff1b07 authored Aug 04, 2013 by Andrey Pavlenko Committed by OpenCV Buildbot Aug 04, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 2 deletions

internal.hpp modules/core/include/opencv2/core/internal.hpp +7 -1

dist.h modules/flann/include/opencv2/flann/dist.h +5 -1

No files found.
--- 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 <Intrin.h>
+# include "arm_neon.h"
+# define CV_NEON 1
+# define CPU_HAS_NEON_FEATURE (true)
+#elif defined(__ARM_NEON__)
 #  include <arm_neon.h>
 #  define CV_NEON 1
 #  define CPU_HAS_NEON_FEATURE (true)

--- 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 <Intrin.h>
+#endif
+
 #ifdef __ARM_NEON__
-#include "arm_neon.h"
+# include "arm_neon.h"
 #endif

 namespace cvflann