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

[libpng16] Removed a redundant test in png_set_IHDR().

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2013-06-04 15:05:12 -05:00
parent f96251291d
commit 421f95deb5
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ANNOUNCE
View File

@ -1,5 +1,5 @@
Libpng 1.6.3beta07 - May 12, 2013 Libpng 1.6.3beta07 - June 4, 2013
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.
@ -77,7 +77,8 @@ Version 1.6.3beta06 [May 12, 2013]
right zlib header files. right zlib header files.
Separated CPPFLAGS and CFLAGS in contrib/pngminim/*/makefile Separated CPPFLAGS and CFLAGS in contrib/pngminim/*/makefile
Version 1.6.3beta07 [May 12, 2013] Version 1.6.3beta07 [June 4, 2013]
Removed a redundant test in png_set_IHDR().
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

@ -4561,7 +4561,8 @@ Version 1.6.3beta06 [May 12, 2013]
right zlib header files. right zlib header files.
Separated CPPFLAGS and CFLAGS in contrib/pngminim/*/makefile Separated CPPFLAGS and CFLAGS in contrib/pngminim/*/makefile
Version 1.6.3beta07 [May 12, 2013] Version 1.6.3beta07 [June 4, 2013]
Removed a redundant test in png_set_IHDR().
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

11
pngset.c
View File

@ -238,16 +238,7 @@ png_set_IHDR(png_const_structrp png_ptr, png_inforp info_ptr,
info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth); info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth);
/* Check for potential overflow */ info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width);
if (width >
(PNG_UINT_32_MAX >> 3) /* 8-byte RRGGBBAA pixels */
- 48 /* bigrowbuf hack */
- 1 /* filter byte */
- 7*8 /* rounding of width to multiple of 8 pixels */
- 8) /* extra max_pixel_depth pad */
info_ptr->rowbytes = 0;
else
info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width);
} }
#ifdef PNG_oFFs_SUPPORTED #ifdef PNG_oFFs_SUPPORTED