diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-08-29 18:14:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-08-29 18:14:54 +0000 |
| commit | 4bc5f654f402460b9ede2a4b13c5697ac174f936 (patch) | |
| tree | 95dcf6b72b9e5af3290852bae26cdd3d78e3743c | |
| parent | 62f5255389a91db9332ca2a1946ce8ab2a594d44 (diff) | |
| parent | 34e8fe047921fa8fb04cd6fd600a00e8dc6a6385 (diff) | |
| download | libpng-master-cuttlefish-testing-release.tar.gz | |
Merge "Undefine PNG_READ_OPT_PLTE_SUPPORTED"android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-release
| -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 |