minecraft-pi-reborn/libpng
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[master] Reverted recent test in png_get_IHDR().

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2009-09-30 14:35:05 -05:00
parent f12abe957d
commit 26cc10a00c
3 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ANNOUNCE
View File

@ -42,12 +42,15 @@ Other information:
Changes since the last public release (1.2.40): Changes since the last public release (1.2.40):
version 1.2.41beta01 [September 30, 2009] version 1.2.41beta01 [September 25, 2009]
Moved redundant IHDR checking into new png_check_IHDR() in png.c Moved redundant IHDR checking into new png_check_IHDR() in png.c
and report all errors found in the IHDR data. and report all errors found in the IHDR data.
Eliminated useless call to png_check_cHRM() from pngset.c Eliminated useless call to png_check_cHRM() from pngset.c
Expanded TAB characters in pngrtran.c Expanded TAB characters in pngrtran.c
version 1.2.41beta02 [September 30, 2009]
Revised png_check_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

5
CHANGES
View File

@ -2472,12 +2472,15 @@ version 1.2.40 and 1.0.49 [September 30, 2009]
version 1.0.50 [September 10, 2009] version 1.0.50 [September 10, 2009]
Removed some editing cruft from pngset.c and pngwutil.c. Removed some editing cruft from pngset.c and pngwutil.c.
version 1.2.41beta01 [September 30, 2009] version 1.2.41beta01 [September 25, 2009]
Moved redundant IHDR checking into new png_check_IHDR() in png.c Moved redundant IHDR checking into new png_check_IHDR() in png.c
and report all errors found in the IHDR data. and report all errors found in the IHDR data.
Eliminated useless call to png_check_cHRM() from pngset.c Eliminated useless call to png_check_cHRM() from pngset.c
Expanded TAB characters in pngrtran.c Expanded TAB characters in pngrtran.c
version 1.2.41beta02 [September 30, 2009]
Revised png_check_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
https://lists.sourceforge.net/lists/listinfo/png-mng-implement https://lists.sourceforge.net/lists/listinfo/png-mng-implement

13
pngget.c
View File

@ -577,19 +577,6 @@ png_get_IHDR(png_structp png_ptr, png_infop info_ptr,
height == NULL || bit_depth == NULL || color_type == NULL) height == NULL || bit_depth == NULL || color_type == NULL)
return (0); return (0);
#ifdef PNG_DEBUG
/* Test to make sure the user isn't trying to stuff height into
* a 16-bit int (assuming height immediately follows width).
*/
*width = 0;
*height = PNG_UINT_31_MAX;
if (*width != 0)
{
png_warning(png_ptr,
"Application's height variable cannot hold a 32-bit value");
}
#endif
*width = info_ptr->width; *width = info_ptr->width;
*height = info_ptr->height; *height = info_ptr->height;
*bit_depth = info_ptr->bit_depth; *bit_depth = info_ptr->bit_depth;