mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 11:40:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9272 from tomoaki0705:fixCudaBuild

Browse Source
This commit is contained in:
Alexander Alekhin 2017-07-31 12:02:40 +00:00
commit 728bd68977
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/core/include/opencv2/core/cv_cpu_dispatch.h
View File

@ -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 <emmintrin.h>
# 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)