diff options
| author |  scroggo <scroggo@google.com> | 2015-08-07 12:53:25 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-07 12:53:25 -0700 |
| commit | 0df0e43488dc785815d3234d9bd60bad91532f98 (patch) | |
| tree | b3b5ba951e6ce96cd8ea621874fd38f7cb5e3678 /third_party/libwebp | |
| parent | 0575d3e6c272744a66ab3281f9871366717df339 (diff) | |
Revert of Update libwebp and resume testing scaled webp (patchset #2 id:20001 of https://codereview.chromium.org/1280073002/ )
Reason for revert:
Compile failures, e.g.
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-Arm7-Debug-Android_NoNeon/builds/1427/steps/build%20most/logs/stdio
Original issue's description:
> 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
>
> Committed: https://skia.googlesource.com/skia/+/0575d3e6c272744a66ab3281f9871366717df339
TBR=djsollen@google.com,msarett@google.com,scroggo@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:4038
Review URL: https://codereview.chromium.org/1278173004
Diffstat (limited to 'third_party/libwebp')
| -rw-r--r-- | third_party/libwebp/webp/config.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/third_party/libwebp/webp/config.h b/third_party/libwebp/webp/config.h index b01473c827..62ade94d2a 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 +#ifdef __builtin_bswap64(x) #define HAVE_BUILTIN_BSWAP64 #endif -#ifdef __builtin_bswap32 +#ifdef __builtin_bswap32(x) #define HAVE_BUILTIN_BSWAP32 #endif -#ifdef __builtin_bswap16 +#ifdef __builtin_bswap16(x) #define HAVE_BUILTIN_BSWAP16 #endif |