Skip to content

O
opencv
Commit 6e34d277 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #13865 from lsr0:flann_cudacc

parents aebb6668 7c72e095
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/flann/include/opencv2/flann/dist.h
View file @ 6e34d277
...@@ -47,7 +47,7 @@ typedef unsigned __int64 uint64_t; ...@@ -47,7 +47,7 @@ typedef unsigned __int64 uint64_t;
# include <Intrin.h> # include <Intrin.h>
#endif #endif
#ifdef __ARM_NEON__ #if defined(__ARM_NEON__) && !defined(__CUDACC__)
# include "arm_neon.h" # include "arm_neon.h"
#endif #endif
...@@ -425,7 +425,7 @@ struct Hamming ...@@ -425,7 +425,7 @@ struct Hamming
ResultType operator()(Iterator1 a, Iterator2 b, size_t size, ResultType /*worst_dist*/ = -1) const ResultType operator()(Iterator1 a, Iterator2 b, size_t size, ResultType /*worst_dist*/ = -1) const
{ {
ResultType result = 0; ResultType result = 0;
#ifdef __ARM_NEON__ #if defined(__ARM_NEON__) && !defined(__CUDACC__)
{ {
uint32x4_t bits = vmovq_n_u32(0); uint32x4_t bits = vmovq_n_u32(0);
for (size_t i = 0; i < size; i += 16) { for (size_t i = 0; i < size; i += 16) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment