From b114e552211456fbde3ff6ca2da21cbc8d1e90e2 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 9 Mar 2016 10:22:13 +0100 Subject: libwebp: update to 0.5.0 This commit imports libwebp 0.5.0, 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: I96b4961ba63c75cc7fbab158c36a0f403f254c14 Reviewed-by: aavit --- src/3rdparty/libwebp/src/dsp/yuv_mips32.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'src/3rdparty/libwebp/src/dsp/yuv_mips32.c') diff --git a/src/3rdparty/libwebp/src/dsp/yuv_mips32.c b/src/3rdparty/libwebp/src/dsp/yuv_mips32.c index c82b4df..b8fe512 100644 --- a/src/3rdparty/libwebp/src/dsp/yuv_mips32.c +++ b/src/3rdparty/libwebp/src/dsp/yuv_mips32.c @@ -14,7 +14,8 @@ #include "./dsp.h" -#if defined(WEBP_USE_MIPS32) +// Code is disabled for now, in favor of the plain-C version +#if 0 // defined(WEBP_USE_MIPS32) #include "./yuv.h" @@ -84,17 +85,20 @@ ROW_FUNC(YuvToBgraRow, 4, 2, 1, 0, 3) #undef ROW_FUNC -#endif // WEBP_USE_MIPS32 - //------------------------------------------------------------------------------ +// Entry point extern void WebPInitSamplersMIPS32(void); -void WebPInitSamplersMIPS32(void) { -#if defined(WEBP_USE_MIPS32) +WEBP_TSAN_IGNORE_FUNCTION void WebPInitSamplersMIPS32(void) { WebPSamplers[MODE_RGB] = YuvToRgbRow; WebPSamplers[MODE_RGBA] = YuvToRgbaRow; WebPSamplers[MODE_BGR] = YuvToBgrRow; WebPSamplers[MODE_BGRA] = YuvToBgraRow; -#endif // WEBP_USE_MIPS32 } + +#else // !WEBP_USE_MIPS32 + +WEBP_DSP_INIT_STUB(WebPInitSamplersMIPS32) + +#endif // WEBP_USE_MIPS32 -- cgit v1.2.3