potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2019-02-19 19:36:46 +00:00
parent f1d9666a20 8cedc052ca
commit 8bde6aea4b
137 changed files with 9339 additions and 4401 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/flann/include/opencv2/flann/dist.h
+2 -2
View File
@@ -47,7 +47,7 @@ typedef unsigned __int64 uint64_t;
# include <Intrin.h>
#endif
#ifdef __ARM_NEON__
#if defined(__ARM_NEON__) && !defined(__CUDACC__)
# include "arm_neon.h"
#endif
@@ -425,7 +425,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(__CUDACC__)
{
uint32x4_t bits = vmovq_n_u32(0);
for (size_t i = 0; i < size; i += 16) {