diff options
| author | Leon Scroggins III <scroggo@google.com> | 2018-08-29 11:34:39 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-08-29 11:34:39 -0700 |
| commit | 0253391497ed21d26933bdd89aa3992067d9d2e4 (patch) | |
| tree | 95dcf6b72b9e5af3290852bae26cdd3d78e3743c | |
| parent | fffa5908504aa0f531f7a0534d9ce56dc0c8eb78 (diff) | |
| parent | 1bf0c27e566d3556a51034072be3a679e46a6148 (diff) | |
| download | libpng-0253391497ed21d26933bdd89aa3992067d9d2e4.tar.gz | |
Merge "Undefine PNG_READ_OPT_PLTE_SUPPORTED" am: 4bc5f654f4 am: 7cfd88bba9
am: 1bf0c27e56
Change-Id: I4cce55eb365408aaea7422c289479f708cd1b18a
| -rw-r--r-- | README.android | 3 | ||||
| -rw-r--r-- | pnglibconf.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/README.android b/README.android index 80e837e61..5f94dc96e 100644 --- a/README.android +++ b/README.android @@ -10,4 +10,5 @@ be listed here: (2) pnglibconf.h This is copied from scripts/pnglibconf.h.prebuilt. - Android has undefined PNG_WARNINGS_SUPPORTED. + Android has undefined PNG_WARNINGS_SUPPORTED and + PNG_READ_OPT_PLTE_SUPPORTED. diff --git a/pnglibconf.h b/pnglibconf.h index 366cdc64c..32e60aa14 100644 --- a/pnglibconf.h +++ b/pnglibconf.h @@ -65,7 +65,7 @@ #define PNG_READ_INT_FUNCTIONS_SUPPORTED #define PNG_READ_INVERT_ALPHA_SUPPORTED #define PNG_READ_INVERT_SUPPORTED -#define PNG_READ_OPT_PLTE_SUPPORTED +/*#undef PNG_READ_OPT_PLTE_SUPPORTED*/ #define PNG_READ_PACKSWAP_SUPPORTED #define PNG_READ_PACK_SUPPORTED #define PNG_READ_QUANTIZE_SUPPORTED |