diff --git a/ANNOUNCE b/ANNOUNCE index c50b1a6e8..92ea6a0e5 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.35beta02 - March 6, 2018 +Libpng 1.6.35beta02 - March 28, 2018 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. @@ -37,6 +37,10 @@ Version 1.6.35beta01 [March 6, 2018] Fixed incorrect bitmask for options. Fixed many spelling typos. +Version 1.6.35bet02 [%DATE] + Make png_get_iCCP consistent with man page (allow compression-type argument + to be NULL, bug report by Lenard Szolnoki). + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement diff --git a/CHANGES b/CHANGES index 99f768146..ea4f8165e 100644 --- a/CHANGES +++ b/CHANGES @@ -6053,6 +6053,10 @@ Version 1.6.35beta01 [March 6, 2018] Fixed incorrect bitmask for options. Fixed many spelling typos. +Version 1.6.35beta02 [March 28, 2018] + Make png_get_iCCP consistent with man page (allow compression-type argument + to be NULL, bug report by Lenard Szolnoki). + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement diff --git a/pngget.c b/pngget.c index ae677361b..5c435dcdc 100644 --- a/pngget.c +++ b/pngget.c @@ -1,8 +1,8 @@ /* pngget.c - retrieval of values from info struct * - * Last changed in libpng 1.6.32 [August 24, 2017] - * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson + * Last changed in libpng 1.6.35 [(PENDING RELEASE)] + * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * @@ -741,8 +741,7 @@ png_get_iCCP(png_const_structrp png_ptr, png_inforp info_ptr, if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_iCCP) != 0 && - name != NULL && compression_type != NULL && profile != NULL && - proflen != NULL) + name != NULL && profile != NULL && proflen != NULL) { *name = info_ptr->iccp_name; *profile = info_ptr->iccp_profile; @@ -755,6 +754,7 @@ png_get_iCCP(png_const_structrp png_ptr, png_inforp info_ptr, } return (0); + } #endif