diff --git a/modules/flann/include/opencv2/flann/dist.h b/modules/flann/include/opencv2/flann/dist.h index a65e712aed8c43bbdfc27cd388e24d5c3900f86a..2bb4fc947a5f9d9eb096ba246a8c5b2be0904332 100644 --- a/modules/flann/include/opencv2/flann/dist.h +++ b/modules/flann/include/opencv2/flann/dist.h @@ -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) {