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

Merge pull request #3534 from taka-no-me:build_fixes

Browse Source
This commit is contained in:
Vadim Pisarevsky
2014-12-26 14:34:13 +00:00
parent b01cdf28ca 7ec6d8a336
commit a5969aec96
12 changed files with 44 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/flann/include/opencv2/flann/dist.h
View File

@@ -47,7 +47,7 @@ typedef unsigned __int64 uint64_t;
# include <Intrin.h>
#endif
#ifdef __ARM_NEON__
#if defined(__ARM_NEON__) || defined(__ARM_NEON)
# include "arm_neon.h"
#endif
@@ -460,7 +460,7 @@ struct Hamming
ResultType operator()(Iterator1 a, Iterator2 b, size_t size, ResultType /*worst_dist*/ = -1) const
{
ResultType result = 0;
#ifdef __ARM_NEON__
#if defined(__ARM_NEON__) || defined(__ARM_NEON)
{
uint32x4_t bits = vmovq_n_u32(0);
for (size_t i = 0; i < size; i += 16) {