diff options
| author | Eirik Aavitsland <eirik.aavitsland@theqtcompany.com> | 2016-02-10 13:57:10 +0100 |
|---|---|---|
| committer | aavit <eirik.aavitsland@theqtcompany.com> | 2016-03-16 14:32:49 +0000 |
| commit | 714cb4020e12e078e8ba8c2c5493d138d515f46d (patch) | |
| tree | 3fc151b4662f4f4a9c5ea4bcf4444d87cd817444 /src/3rdparty/libpng/pngstruct.h | |
| parent | 10a4151e83da4662eb51a8c67760f2e38d84759e (diff) | |
Update bundled libpng to version 1.6.20
Merged in the upstream version. The remaining diff to clean 1.6.20 is
archived in the qtpatches.diff file.
Change-Id: I56f557bfe04ac1aa0e2c090826bbb144ae93cbb7
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Diffstat (limited to 'src/3rdparty/libpng/pngstruct.h')
| -rw-r--r-- | src/3rdparty/libpng/pngstruct.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/3rdparty/libpng/pngstruct.h b/src/3rdparty/libpng/pngstruct.h index c8c0e46e8b..d0bcc7914a 100644 --- a/src/3rdparty/libpng/pngstruct.h +++ b/src/3rdparty/libpng/pngstruct.h @@ -263,6 +263,9 @@ struct png_struct_def /* pixel depth used for the row buffers */ png_byte transformed_pixel_depth; /* pixel depth after read/write transforms */ +#if PNG_ZLIB_VERNUM >= 0x1240 + png_byte zstream_start; /* at start of an input zlib stream */ +#endif /* Zlib >= 1.2.4 */ #if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED) png_uint_16 filler; /* filler bytes for pixel expansion */ #endif |