diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
| commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
| tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/third_party/libpng | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/third_party/libpng')
| -rw-r--r-- | chromium/third_party/libpng/README.chromium | 2 | ||||
| -rw-r--r-- | chromium/third_party/libpng/libpng.gyp | 8 | ||||
| -rw-r--r-- | chromium/third_party/libpng/pngusr.h | 4 |
3 files changed, 14 insertions, 0 deletions
diff --git a/chromium/third_party/libpng/README.chromium b/chromium/third_party/libpng/README.chromium index 39d57b55fef..391a25cd4f0 100644 --- a/chromium/third_party/libpng/README.chromium +++ b/chromium/third_party/libpng/README.chromium @@ -15,3 +15,5 @@ stripped. - One custom patch for bug 112822, to be sent upstream. - Also a signedness condition from upstream relating to the above, bug 116162. +- Unset PNG_NO_READ_PACK on Android in pngusr.h, required by freetype to support + color glyphs. diff --git a/chromium/third_party/libpng/libpng.gyp b/chromium/third_party/libpng/libpng.gyp index 38082f4e0e0..ac8fdb41c92 100644 --- a/chromium/third_party/libpng/libpng.gyp +++ b/chromium/third_party/libpng/libpng.gyp @@ -71,6 +71,14 @@ }], ['OS=="android"', { 'toolsets': ['target', 'host'], + 'defines': [ + 'CHROME_PNG_READ_PACK_SUPPORT', # Required by freetype. + ], + 'direct_dependent_settings': { + 'defines': [ + 'CHROME_PNG_READ_PACK_SUPPORT', + ], + }, }], ], }, diff --git a/chromium/third_party/libpng/pngusr.h b/chromium/third_party/libpng/pngusr.h index d080ea2a7a0..fabae6eab4f 100644 --- a/chromium/third_party/libpng/pngusr.h +++ b/chromium/third_party/libpng/pngusr.h @@ -44,7 +44,11 @@ #define PNG_NO_READ_DITHER #define PNG_NO_READ_INVERT #define PNG_NO_READ_SHIFT +#if defined(CHROME_PNG_READ_PACK_SUPPORT) +#undef PNG_NO_READ_PACK // Required by freetype to support png glyphs. +#else #define PNG_NO_READ_PACK +#endif #define PNG_NO_READ_PACKSWAP #undef PNG_NO_READ_FILLER #define PNG_NO_READ_SWAP |