cheng/libpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libng16] Conditionally compile png_inflate(). It's not needed for iCCP

Browse Source 
chunk reading.
This commit is contained in:
Glenn Randers-Pehrson 2016-08-11 20:13:33 -05:00
parent 6bdaf38d12
commit 8ff2ed2fe1
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ANNOUNCE
View File

@ -1,4 +1,4 @@
Libpng 1.6.25beta01 - August 11, 2016 Libpng 1.6.25beta01 - August 12, 2016
This is not intended to be a public release. It will be replaced This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version. within a few weeks by a public version or by another test version.
@ -25,9 +25,10 @@ Other information:
Changes since the last public release (1.6.24): Changes since the last public release (1.6.24):
Version 1.6.25beta01 [August 11, 2016] Version 1.6.25beta01 [August 12, 2016]
Reject oversized iCCP profile immediately. Reject oversized iCCP profile immediately.
Cleaned up PNG_DEBUG compile of pngtest.c. Cleaned up PNG_DEBUG compile of pngtest.c.
Conditionally compile png_inflate().
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

3
CHANGES
View File

@ -5675,9 +5675,10 @@ Version 1.6.24rc03 [August 2, 2016]
Version 1.6.24[August 4, 2016] Version 1.6.24[August 4, 2016]
No changes. No changes.
Version 1.6.25beta01 [August 11, 2016] Version 1.6.25beta01 [August 12, 2016]
Reject oversized iCCP profile immediately. Reject oversized iCCP profile immediately.
Cleaned up PNG_DEBUG compile of pngtest.c. Cleaned up PNG_DEBUG compile of pngtest.c.
Conditionally compile png_inflate().
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

2
pngrutil.c
View File

@ -461,6 +461,7 @@ png_zlib_inflate(png_structrp png_ptr, int flush)
#endif /* Zlib >= 1.2.4 */ #endif /* Zlib >= 1.2.4 */
#ifdef PNG_READ_COMPRESSED_TEXT_SUPPORTED #ifdef PNG_READ_COMPRESSED_TEXT_SUPPORTED
#if defined(PNG_READ_zTXt_SUPPORTED) || defined (PNG_READ_iTXt_SUPPORTED)
/* png_inflate now returns zlib error codes including Z_OK and Z_STREAM_END to /* png_inflate now returns zlib error codes including Z_OK and Z_STREAM_END to
* allow the caller to do multiple calls if required. If the 'finish' flag is * allow the caller to do multiple calls if required. If the 'finish' flag is
* set Z_FINISH will be passed to the final inflate() call and Z_STREAM_END must * set Z_FINISH will be passed to the final inflate() call and Z_STREAM_END must
@ -590,7 +591,6 @@ png_inflate(png_structrp png_ptr, png_uint_32 owner, int finish,
} }
} }
#if defined(PNG_READ_zTXt_SUPPORTED) || defined (PNG_READ_iTXt_SUPPORTED)
/* /*
* Decompress trailing data in a chunk. The assumption is that read_buffer * Decompress trailing data in a chunk. The assumption is that read_buffer
* points at an allocated area holding the contents of a chunk with a * points at an allocated area holding the contents of a chunk with a