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

[libpng16] Changed PNG_ZLIB_VERNUM to ZLIB_VERNUM in pngpriv.h, pngstruct.h,

Browse Source 
and pngrutil.c.
This commit is contained in:
Glenn Randers-Pehrson 2016-09-19 16:46:54 -05:00
parent cb1787f033
commit 7835716cef
5 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ANNOUNCE
View File

@ -1,4 +1,4 @@
Libpng 1.6.26beta01 - September 12, 2016 Libpng 1.6.26beta01 - September 19, 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,7 +25,7 @@ Other information:
Changes since the last public release (1.6.25): Changes since the last public release (1.6.25):
Version 1.6.26beta01 [September 12, 2016] Version 1.6.26beta01 [September 19, 2016]
Fixed handling zero length IDAT in pngfix (bug report by Agostino Sarubbo, Fixed handling zero length IDAT in pngfix (bug report by Agostino Sarubbo,
bugfix by John Bowler). bugfix by John Bowler).
Do not issue a png_error() on read in png_set_pCAL() because png_handle_pCAL Do not issue a png_error() on read in png_set_pCAL() because png_handle_pCAL
@ -33,6 +33,8 @@ Version 1.6.26beta01 [September 12, 2016]
Conditionally compile png_set_benign_errors() in pngread.c and pngtest.c Conditionally compile png_set_benign_errors() in pngread.c and pngtest.c
Issue a png_benign_error instead of a png_error on ADLER32 mismatch Issue a png_benign_error instead of a png_error on ADLER32 mismatch
while decoding compressed data chunks. while decoding compressed data chunks.
Changed PNG_ZLIB_VERNUM to ZLIB_VERNUM in pngpriv.h, pngstruct.h, and
pngrutil.c.
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

4
CHANGES
View File

@ -5703,7 +5703,7 @@ Version 1.6.25rc05 [August 30, 2016]
Version 1.6.25 [September 1, 2016] Version 1.6.25 [September 1, 2016]
No changes. No changes.
Version 1.6.26beta01 [September 12, 2016] Version 1.6.26beta01 [September 19, 2016]
Fixed handling zero length IDAT in pngfix (bug report by Agostino Sarubbo, Fixed handling zero length IDAT in pngfix (bug report by Agostino Sarubbo,
bugfix by John Bowler). bugfix by John Bowler).
Do not issue a png_error() on read in png_set_pCAL() because png_handle_pCAL Do not issue a png_error() on read in png_set_pCAL() because png_handle_pCAL
@ -5711,6 +5711,8 @@ Version 1.6.26beta01 [September 12, 2016]
Conditionally compile png_set_benign_errors() in pngread.c and pngtest.c Conditionally compile png_set_benign_errors() in pngread.c and pngtest.c
Issue a png_benign_error instead of a png_error on ADLER32 mismatch Issue a png_benign_error instead of a png_error on ADLER32 mismatch
while decoding compressed data chunks. while decoding compressed data chunks.
Changed PNG_ZLIB_VERNUM to ZLIB_VERNUM in pngpriv.h, pngstruct.h, and
pngrutil.c.
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
pngpriv.h
View File

@ -1263,7 +1263,7 @@ PNG_INTERNAL_FUNCTION(void,png_read_finish_row,(png_structrp png_ptr),
/* Initialize the row buffers, etc. */ /* Initialize the row buffers, etc. */
PNG_INTERNAL_FUNCTION(void,png_read_start_row,(png_structrp png_ptr),PNG_EMPTY); PNG_INTERNAL_FUNCTION(void,png_read_start_row,(png_structrp png_ptr),PNG_EMPTY);
#if PNG_ZLIB_VERNUM >= 0x1240 #if ZLIB_VERNUM >= 0x1240
PNG_INTERNAL_FUNCTION(int,png_zlib_inflate,(png_structrp png_ptr, int flush), PNG_INTERNAL_FUNCTION(int,png_zlib_inflate,(png_structrp png_ptr, int flush),
PNG_EMPTY); PNG_EMPTY);
# define PNG_INFLATE(pp, flush) png_zlib_inflate(pp, flush) # define PNG_INFLATE(pp, flush) png_zlib_inflate(pp, flush)

10
pngrutil.c
View File

@ -370,7 +370,7 @@ png_inflate_claim(png_structrp png_ptr, png_uint_32 owner)
*/ */
{ {
int ret; /* zlib return code */ int ret; /* zlib return code */
#if PNG_ZLIB_VERNUM >= 0x1240 #if ZLIB_VERNUM >= 0x1240
# if defined(PNG_SET_OPTION_SUPPORTED) && defined(PNG_MAXIMUM_INFLATE_WINDOW) # if defined(PNG_SET_OPTION_SUPPORTED) && defined(PNG_MAXIMUM_INFLATE_WINDOW)
int window_bits; int window_bits;
@ -402,7 +402,7 @@ png_inflate_claim(png_structrp png_ptr, png_uint_32 owner)
if ((png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) != 0) if ((png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) != 0)
{ {
#if PNG_ZLIB_VERNUM < 0x1240 #if ZLIB_VERNUM < 0x1240
ret = inflateReset(&png_ptr->zstream); ret = inflateReset(&png_ptr->zstream);
#else #else
ret = inflateReset2(&png_ptr->zstream, window_bits); ret = inflateReset2(&png_ptr->zstream, window_bits);
@ -411,7 +411,7 @@ png_inflate_claim(png_structrp png_ptr, png_uint_32 owner)
else else
{ {
#if PNG_ZLIB_VERNUM < 0x1240 #if ZLIB_VERNUM < 0x1240
ret = inflateInit(&png_ptr->zstream); ret = inflateInit(&png_ptr->zstream);
#else #else
ret = inflateInit2(&png_ptr->zstream, window_bits); ret = inflateInit2(&png_ptr->zstream, window_bits);
@ -435,7 +435,7 @@ png_inflate_claim(png_structrp png_ptr, png_uint_32 owner)
#endif #endif
} }
#if PNG_ZLIB_VERNUM >= 0x1240 #if ZLIB_VERNUM >= 0x1240
/* Handle the start of the inflate stream if we called inflateInit2(strm,0); /* Handle the start of the inflate stream if we called inflateInit2(strm,0);
* in this case some zlib versions skip validation of the CINFO field and, in * in this case some zlib versions skip validation of the CINFO field and, in
* certain circumstances, libpng may end up displaying an invalid image, in * certain circumstances, libpng may end up displaying an invalid image, in
@ -4103,7 +4103,7 @@ png_read_IDAT_data(png_structrp png_ptr, png_bytep output,
if (output != NULL) if (output != NULL)
{ {
if(!strncmp(png_ptr->zstream.msg,"incorrect data check",20)) if(!strncmp(png_ptr->zstream.msg,"incorrect data check",20))
png_chunk_benign_error(png_ptr, png_ptr->zstream.msg); png_chunk_benign_error(png_ptr, "ADLER32 checksum mismatch");
else else
png_chunk_error(png_ptr, png_ptr->zstream.msg); png_chunk_error(png_ptr, png_ptr->zstream.msg);
} }

2
pngstruct.h
View File

@ -263,7 +263,7 @@ struct png_struct_def
/* pixel depth used for the row buffers */ /* pixel depth used for the row buffers */
png_byte transformed_pixel_depth; png_byte transformed_pixel_depth;
/* pixel depth after read/write transforms */ /* pixel depth after read/write transforms */
#if PNG_ZLIB_VERNUM >= 0x1240 #if ZLIB_VERNUM >= 0x1240
png_byte zstream_start; /* at start of an input zlib stream */ png_byte zstream_start; /* at start of an input zlib stream */
#endif /* Zlib >= 1.2.4 */ #endif /* Zlib >= 1.2.4 */
#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED) #if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)