diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-06 03:02:17 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-06 03:02:17 +0200 |
| commit | ac5a49b81975f0fbfae73655c97e39503b5cb8d7 (patch) | |
| tree | d643ccd41d5158651f2c8161b7125c19066e462d | |
| parent | e7940d951e211837ed45b759fb97282e8d65e4c5 (diff) | |
| parent | d72ff0cd09eda68a0579dc57389ecc1ee4a3b7c8 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I9b50b4428c3f786c3a7d04a815f871993f2e0cc5
| -rw-r--r-- | src/3rdparty/libwebp/src/dsp/dsp.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/libwebp/src/dsp/dsp.h b/src/3rdparty/libwebp/src/dsp/dsp.h index fafc2d0..0d7f3fb 100644 --- a/src/3rdparty/libwebp/src/dsp/dsp.h +++ b/src/3rdparty/libwebp/src/dsp/dsp.h @@ -55,12 +55,12 @@ extern "C" { #if !defined(EMSCRIPTEN) #if defined(_MSC_VER) && _MSC_VER > 1310 && \ - (defined(_M_X64) || defined(_M_IX86)) + (defined(_M_X64) || defined(_M_IX86)) && !defined(__clang__) #define WEBP_MSC_SSE2 // Visual C++ SSE2 targets #endif #if defined(_MSC_VER) && _MSC_VER >= 1500 && \ - (defined(_M_X64) || defined(_M_IX86)) + (defined(_M_X64) || defined(_M_IX86)) && !defined(__clang__) #define WEBP_MSC_SSE41 // Visual C++ SSE4.1 targets #endif @@ -90,7 +90,7 @@ extern "C" { #define WEBP_USE_NEON #endif -#if defined(_MSC_VER) && _MSC_VER >= 1700 && defined(_M_ARM) +#if defined(_MSC_VER) && _MSC_VER >= 1700 && defined(_M_ARM) && !defined(__clang__) #define WEBP_USE_NEON #define WEBP_USE_INTRINSICS #endif |