aboutsummaryrefslogtreecommitdiffhomepage
path: root/third_party/libwebp
diff options
context:
space:
mode:
authorGravatar scroggo <scroggo@chromium.org>2015-07-10 09:32:09 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-07-10 09:32:09 -0700
commit139491fbaa6fc926456a246bb28e09848e0e48f5 (patch)
tree3cbb6ad0ae2db8c4d18a5be3a83d34ed4ea156d1 /third_party/libwebp
parent416e14f517f91e3d8b24ed99f5ca56fc5ec6ceee (diff)
Use the upstream version of libwebp, v0.4.3.
DEPS: Update to pull v0.4.3 of libwebp from upstream gyp/libwebp.gyp: Add new files, as referenced by the gyp file used by Chromium. resource/tests: Add regression tests for particular images. BUG=skia:3442 BUG=skia:3315 BUG=skia:3429 Committed: https://skia.googlesource.com/skia/+/3aa0fb4d80c76b559ff4b82d5e569993aea06da1 Review URL: https://codereview.chromium.org/1178013008
Diffstat (limited to 'third_party/libwebp')
-rw-r--r--third_party/libwebp/webp/config.h27
1 files changed, 27 insertions, 0 deletions
diff --git a/third_party/libwebp/webp/config.h b/third_party/libwebp/webp/config.h
new file mode 100644
index 0000000000..62ade94d2a
--- /dev/null
+++ b/third_party/libwebp/webp/config.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015 Google, Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+// FIXME: Workaround for skbug.com/4037
+// Some of our test machines have an older version of clang that does not
+// have
+// __builtin_bswap16
+//
+// But libwebp expects the builtin. We can change that by using this config.h
+// file, which replaces the checks in endian_inl.h to decide whether we have
+// particular builtins.
+
+#ifdef __builtin_bswap64(x)
+ #define HAVE_BUILTIN_BSWAP64
+#endif
+
+#ifdef __builtin_bswap32(x)
+ #define HAVE_BUILTIN_BSWAP32
+#endif
+
+#ifdef __builtin_bswap16(x)
+ #define HAVE_BUILTIN_BSWAP16
+#endif