diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2019-01-15 22:58:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-01-15 22:58:52 +0000 |
| commit | 5d19b1bb0f5694f2ae47b3cc2ccfeb571764b439 (patch) | |
| tree | 95dcf6b72b9e5af3290852bae26cdd3d78e3743c | |
| parent | 5695189d2c87a214a41a1974c2d8014e52e4b6f8 (diff) | |
| parent | ca3b792907e36c4760c10257c23e7e7488d54785 (diff) | |
| download | libpng-5d19b1bb0f5694f2ae47b3cc2ccfeb571764b439.tar.gz | |
Merge "Snap for 5234541 from 2f4a5d7c42cf1f3220fc652c83343ad9c256444f to sdk-release" into sdk-releasenetsim-devemu-prebuiltsemu-master-devemu-34-releaseemu-34-devemu-34-3-releaseemu-34-2-releaseemu-34-2-devemu-33-releaseemu-33-devemu-32-releaseemu-32-devemu-31-stable-releaseemu-31-releaseemu-30-releaseemu-29.0-releaseaosp-emu-34-devaosp-emu-30-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 |