diff options
| author |  Mike Klein <mtklein@chromium.org> | 2017-09-19 13:30:58 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-19 19:33:09 +0000 |
| commit | 6b6674d321ef059bf9b1b7f0be39737d880fa428 (patch) | |
| tree | 2cd1910117b58b83f9ad4e66c7db8a35b744e3ec /third_party/libpng/pnglibconf.h | |
| parent | 10501885de057c155195bcbd1dd18d9cd16f59ac (diff) | |
libpng: update to 1.6.32, pull using DEPS
I'd have done this as two steps, but we didn't have a pure copy of
libpng to start with. The patches we did have, though, have been
upstreamed and are now unneeded.
Change-Id: I884b9bc47afe5000f5a521f66a3bb95c0411b39a
Reviewed-on: https://skia-review.googlesource.com/48620
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'third_party/libpng/pnglibconf.h')
| -rw-r--r-- | third_party/libpng/pnglibconf.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/third_party/libpng/pnglibconf.h b/third_party/libpng/pnglibconf.h index db5c9ac21f..9e45f73129 100644 --- a/third_party/libpng/pnglibconf.h +++ b/third_party/libpng/pnglibconf.h @@ -1,10 +1,10 @@ -/* libpng 1.6.22rc01 STANDARD API DEFINITION */ +/* libpng 1.6.32 STANDARD API DEFINITION */ /* pnglibconf.h - library build configuration */ -/* Libpng version 1.6.22rc01 - May 14, 2016 */ +/* Libpng version 1.6.32 - August 24, 2017 */ -/* Copyright (c) 1998-2015 Glenn Randers-Pehrson */ +/* Copyright (c) 1998-2017 Glenn Randers-Pehrson */ /* This code is released under the libpng license. */ /* For conditions of distribution and use, see the disclaimer */ @@ -20,6 +20,8 @@ #define PNG_ALIGNED_MEMORY_SUPPORTED /*#undef PNG_ARM_NEON_API_SUPPORTED*/ /*#undef PNG_ARM_NEON_CHECK_SUPPORTED*/ +/*#undef PNG_POWERPC_VSX_API_SUPPORTED*/ +/*#undef PNG_POWERPC_VSX_CHECK_SUPPORTED*/ #define PNG_BENIGN_ERRORS_SUPPORTED #define PNG_BENIGN_READ_ERRORS_SUPPORTED /*#undef PNG_BENIGN_WRITE_ERRORS_SUPPORTED*/ @@ -82,6 +84,7 @@ #define PNG_READ_USER_TRANSFORM_SUPPORTED #define PNG_READ_bKGD_SUPPORTED #define PNG_READ_cHRM_SUPPORTED +#define PNG_READ_eXIf_SUPPORTED #define PNG_READ_gAMA_SUPPORTED #define PNG_READ_hIST_SUPPORTED #define PNG_READ_iCCP_SUPPORTED @@ -151,6 +154,7 @@ #define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED #define PNG_WRITE_bKGD_SUPPORTED #define PNG_WRITE_cHRM_SUPPORTED +#define PNG_WRITE_eXIf_SUPPORTED #define PNG_WRITE_gAMA_SUPPORTED #define PNG_WRITE_hIST_SUPPORTED #define PNG_WRITE_iCCP_SUPPORTED @@ -168,6 +172,7 @@ #define PNG_WRITE_zTXt_SUPPORTED #define PNG_bKGD_SUPPORTED #define PNG_cHRM_SUPPORTED +#define PNG_eXIf_SUPPORTED #define PNG_gAMA_SUPPORTED #define PNG_hIST_SUPPORTED #define PNG_iCCP_SUPPORTED @@ -212,10 +217,4 @@ #define PNG_sCAL_PRECISION 5 #define PNG_sRGB_PROFILE_CHECKS 2 /* end of settings */ - -/* Skia-specific settings */ -#define PNG_PREFIX -#include "pngprefix.h" -/* end of Skia-specific settings */ - #endif /* PNGLCONF_H */ |