diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-03-29 15:55:07 +0100 |
|---|---|---|
| committer | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2019-07-31 13:32:39 +0000 |
| commit | 9100cc7ab04586890fb8f1924b0e06ad3efa7d3e (patch) | |
| tree | 4eecafc1bdff92716fbf560c5d02376e7dc66761 | |
| parent | d4861c2a836f323e1c4694bf7830e69ef845b8ce (diff) | |
| download | qtimageformats-9100cc7ab04586890fb8f1924b0e06ad3efa7d3e.tar.gz | |
Reapply: Fix building with clang_cl
This fix was mistakenly overwritten by the recent 1.0.3 upgrade.
Change-Id: Ifcfeeac075d97d770de471380c506fb739f0b52a
(cherry picked from commit dbfcea2a638d9223bb8d4d9ffc63b0d294b9f97d)
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -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 |