diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-08 09:06:25 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-08 20:43:30 +0000 |
| commit | fa4ed3621c9e50441b98e6c52c9bbe3ad9438248 (patch) | |
| tree | 33a5739b577def87b5ec563f3dd7a9f0132431ad /src/3rdparty/libwebp/src/dsp/dsp.h | |
| parent | 531c30ea66d2b8fe517c89bed149a938e16332ec (diff) | |
libwebp: update to 0.4.4
This commit imports libwebp 0.4.4, including AUTHORS, COPYING, ChangeLog,
NEWS, PATENTS, README and src directories. In src, only includes header
and source files.
The patches required to build it in Qt will follow in separate
commit(s).
Change-Id: Ib12593f56553e5358548c224d1855273f3fd2318
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
Diffstat (limited to 'src/3rdparty/libwebp/src/dsp/dsp.h')
| -rw-r--r-- | src/3rdparty/libwebp/src/dsp/dsp.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/3rdparty/libwebp/src/dsp/dsp.h b/src/3rdparty/libwebp/src/dsp/dsp.h index 2409bae..a2c3951 100644 --- a/src/3rdparty/libwebp/src/dsp/dsp.h +++ b/src/3rdparty/libwebp/src/dsp/dsp.h @@ -36,14 +36,9 @@ extern "C" { # define LOCAL_GCC_PREREQ(maj, min) 0 #endif -#ifdef __clang__ -# define LOCAL_CLANG_VERSION ((__clang_major__ << 8) | __clang_minor__) -# define LOCAL_CLANG_PREREQ(maj, min) \ - (LOCAL_CLANG_VERSION >= (((maj) << 8) | (min))) -#else -# define LOCAL_CLANG_VERSION 0 -# define LOCAL_CLANG_PREREQ(maj, min) 0 -#endif // __clang__ +#ifndef __has_builtin +# define __has_builtin(x) 0 +#endif #if defined(_MSC_VER) && _MSC_VER > 1310 && \ (defined(_M_X64) || defined(_M_IX86)) @@ -73,7 +68,8 @@ extern "C" { #define WEBP_USE_NEON #endif -#if defined(__mips__) && !defined(__mips64) && (__mips_isa_rev < 6) +#if defined(__mips__) && !defined(__mips64) && \ + defined(__mips_isa_rev) && (__mips_isa_rev >= 1) && (__mips_isa_rev < 6) #define WEBP_USE_MIPS32 #if (__mips_isa_rev >= 2) #define WEBP_USE_MIPS32_R2 |