Skip to content

O
opencv
Commit 49b55a72 authored by Sam Bromley's avatar Sam Bromley
Browse files
Options

Protect check for _MSC_VER with #if defined.

parent 318151d7
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
modules/core/include/opencv2/core/internal.hpp
View file @ 49b55a72
...@@ -120,15 +120,15 @@ CV_INLINE IppiSize ippiSize(int width, int height) ...@@ -120,15 +120,15 @@ CV_INLINE IppiSize ippiSize(int width, int height)
# else # else
# define CV_SSSE3 0 # define CV_SSSE3 0
# endif # endif
# if defined __SSE4_1__ || _MSC_VER >= 1600 # if defined __SSE4_1__ || (defined _MSC_VER && _MSC_VER >= 1600)
# include <smmintrin.h> # include <smmintrin.h>
# define CV_SSE4_1 1 # define CV_SSE4_1 1
# endif # endif
# if defined __SSE4_2__ || _MSC_VER >= 1600 # if defined __SSE4_2__ || (defined _MSC_VER && _MSC_VER >= 1600)
# include <nmmintrin.h> # include <nmmintrin.h>
# define CV_SSE4_2 1 # define CV_SSE4_2 1
# endif # endif
# if defined __AVX__ || _MSC_VER >= 1600 # if defined __AVX__ || (defined _MSC_VER && _MSC_VER >= 1600)
# include <immintrin.h> # include <immintrin.h>
# define CV_AVX 1 # define CV_AVX 1
# endif # endif
...@@ -779,4 +779,4 @@ CV_EXPORTS bool icvCheckGlError(const char* file, const int line, const char* fu ...@@ -779,4 +779,4 @@ CV_EXPORTS bool icvCheckGlError(const char* file, const int line, const char* fu
#endif //__cplusplus #endif //__cplusplus
#endif // __OPENCV_CORE_INTERNAL_HPP__ #endif // __OPENCV_CORE_INTERNAL_HPP__
\ No newline at end of file
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