aboutsummaryrefslogtreecommitdiffhomepage
path: root/third_party/libwebp
diff options
context:
space:
mode:
authorGravatar scroggo <scroggo@chromium.org>2015-08-07 12:49:16 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-08-07 12:49:16 -0700
commit0575d3e6c272744a66ab3281f9871366717df339 (patch)
tree1a121e37ecbd7cf5b63fd3647b05c115ef2128ac /third_party/libwebp
parent2771b5617c0440de2e8b3a024e367553e8a99d70 (diff)
Update libwebp and resume testing scaled webp
libwebp has a fix for [1]. Update to the commit that contains the fix. Update libwebp.gypi, corresponding to libwebp's latest makefile. Turn back on DM testing for scaled webp, now that it should no longer use uninitialized memory. Fix a warning in config.h [1] https://code.google.com/p/webp/issues/detail?id=254 BUG=skia:4038 Review URL: https://codereview.chromium.org/1280073002
Diffstat (limited to 'third_party/libwebp')
-rw-r--r--third_party/libwebp/webp/config.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/third_party/libwebp/webp/config.h b/third_party/libwebp/webp/config.h
index 62ade94d2a..b01473c827 100644
--- a/third_party/libwebp/webp/config.h
+++ b/third_party/libwebp/webp/config.h
@@ -14,14 +14,14 @@
// file, which replaces the checks in endian_inl.h to decide whether we have
// particular builtins.
-#ifdef __builtin_bswap64(x)
+#ifdef __builtin_bswap64
#define HAVE_BUILTIN_BSWAP64
#endif
-#ifdef __builtin_bswap32(x)
+#ifdef __builtin_bswap32
#define HAVE_BUILTIN_BSWAP32
#endif
-#ifdef __builtin_bswap16(x)
+#ifdef __builtin_bswap16
#define HAVE_BUILTIN_BSWAP16
#endif