aboutsummaryrefslogtreecommitdiffhomepage
path: root/third_party/libpng/pnglibconf.h
diff options
context:
space:
mode:
authorGravatar msarett <msarett@google.com>2016-02-19 11:14:43 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-02-19 11:14:43 -0800
commit740668d9071b8b767ec4ca344cb31fc0773ac2d5 (patch)
treeaf6cf019d554aeaa7140a28b02cb0effad8642e9 /third_party/libpng/pnglibconf.h
parentcbc5bccebec983cdd7bea4f10373ec3af115def3 (diff)
Update libpng to 1.6.22beta
Intel SSE filter optimizations have been upstreamed. Let's test on the upstream version (which we can use in Android). BUG=skia:4573 GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1710083007 Review URL: https://codereview.chromium.org/1710083007
Diffstat (limited to 'third_party/libpng/pnglibconf.h')
-rw-r--r--third_party/libpng/pnglibconf.h14
1 files changed, 3 insertions, 11 deletions
diff --git a/third_party/libpng/pnglibconf.h b/third_party/libpng/pnglibconf.h
index 15b3530f6e..7204c6d4a0 100644
--- a/third_party/libpng/pnglibconf.h
+++ b/third_party/libpng/pnglibconf.h
@@ -1,8 +1,8 @@
-/* libpng 1.6.19 STANDARD API DEFINITION */
+/* libpng 1.6.22beta03 STANDARD API DEFINITION */
/* pnglibconf.h - library build configuration */
-/* Libpng version 1.6.19 - November 12, 2015 */
+/* Libpng version 1.6.22beta03 - February 8, 2016 */
/* Copyright (c) 1998-2015 Glenn Randers-Pehrson */
@@ -109,6 +109,7 @@
#define PNG_SIMPLIFIED_READ_SUPPORTED
#define PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED
#define PNG_SIMPLIFIED_WRITE_BGR_SUPPORTED
+#define PNG_SIMPLIFIED_WRITE_STDIO_SUPPORTED
#define PNG_SIMPLIFIED_WRITE_SUPPORTED
#define PNG_STDIO_SUPPORTED
#define PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
@@ -211,13 +212,4 @@
#define PNG_sCAL_PRECISION 5
#define PNG_sRGB_PROFILE_CHECKS 2
/* end of settings */
-
-/* custom settings */
-#define PNG_ARM_NEON_API_SUPPORTED
-#define PNG_ARM_NEON_CHECK_SUPPORTED
-#if defined(__SSE2__)
- #define PNG_FILTER_OPTIMIZATIONS sk_png_init_filter_functions_sse2
-#endif
-/* end of custom settings */
-
#endif /* PNGLCONF_H */