[libpng16] Fixed ICC profile parsing and sRGB profile recognition

and moved checksum-icc.c from contrib/libtests to contrib/tools.
This commit is contained in:
John Bowler 2012-03-28 09:51:43 -05:00 committed by Glenn Randers-Pehrson
parent c1217ee280
commit 13a87d9682
4 changed files with 6 additions and 8 deletions

View File

@ -1,5 +1,5 @@
Libpng 1.6.0beta20 - March 22, 2012
Libpng 1.6.0beta20 - March 28, 2012
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.
@ -339,11 +339,11 @@ Version 1.6.0beta19 [March 18,2012]
Avoid the double gamma correction warning in the simplified API.
This allows the --strict option to pass in the pngstest checks
Version 1.6.0beta20 [March 22, 2012]
Version 1.6.0beta20 [March 28, 2012]
Changed chunk handler warnings into benign errors, incrementally load iCCP
Recognize known sRGB ICC profiles while reading and handle them as if the
sRGB chunk had appeared instead.
Added checksum-icc.c to contrib/libtests
Added checksum-icc.c to contrib/tools
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit

View File

@ -4090,11 +4090,11 @@ Version 1.6.0beta19 [March 18, 2012]
Avoid the double gamma correction warning in the simplified API.
This allows the --strict option to pass in the pngstest checks
Version 1.6.0beta20 [March 22, 2012]
Version 1.6.0beta20 [March 28, 2012]
Changed chunk handler warnings into benign errors, incrementally load iCCP
Recognize known sRGB ICC profiles while reading and handle them as if the
sRGB chunk had appeared instead.
Added checksum-icc.c to contrib/libtests
Added checksum-icc.c to contrib/tools
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit

View File

@ -1435,7 +1435,7 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
memcpy(profile, profile_header,
sizeof profile_header);
size = (sizeof profile_header) + 12 * tag_count;
size = 12 * tag_count;
ret = png_inflate_read(png_ptr, local_buffer,
sizeof local_buffer, &length,
@ -1516,8 +1516,6 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
png_colorspace_sync(png_ptr,
info_ptr);
png_free(png_ptr, profile);
return;
}
}