generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1219 from asmorkalov:winrt_neon

Browse Source
This commit is contained in:
Andrey Pavlenko 2013-08-04 21:59:05 +04:00 committed by OpenCV Buildbot
commit a2ff1b07b3
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/core/include/opencv2/core/internal.hpp
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)

6
modules/flann/include/opencv2/flann/dist.h
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