From 1c49796e8e1db2bcfb65b5f266c2fb67d2c898ef Mon Sep 17 00:00:00 2001 From: Tomoaki Teshima Date: Mon, 31 Jul 2017 18:42:36 +0900 Subject: [PATCH] guad for CUDA correctly --- modules/core/include/opencv2/core/cv_cpu_dispatch.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/core/include/opencv2/core/cv_cpu_dispatch.h b/modules/core/include/opencv2/core/cv_cpu_dispatch.h index 702f11e0ca..acde4cd485 100644 --- a/modules/core/include/opencv2/core/cv_cpu_dispatch.h +++ b/modules/core/include/opencv2/core/cv_cpu_dispatch.h @@ -121,8 +121,8 @@ struct VZeroUpperGuard { -#if !defined __OPENCV_BUILD // Compatibility code - +#if !defined __OPENCV_BUILD /* Compatibility code */ \ + && !defined __CUDACC__ /* do not include SSE/AVX/NEON headers for NVCC compiler */ #if defined __SSE2__ || defined _M_X64 || (defined _M_IX86_FP && _M_IX86_FP >= 2) # include # define CV_MMX 1 @@ -137,7 +137,7 @@ struct VZeroUpperGuard { # define CV_NEON 1 #endif -#endif // !__OPENCV_BUILD (Compatibility code) +#endif // !__OPENCV_BUILD && !__CUDACC (Compatibility code)