diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2018-03-28 18:02:32 -0500 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2018-03-28 18:02:32 -0500 |
commit | 7784cd3f6fba5008a83c869e401cb92e338b2c62 (patch) | |
tree | 38456f498527dfdbdb21ac777797e95a6c95d3ff /pngget.c | |
parent | cde1e1fe79974a37d7ef255a44dae3bfd1b34a0f (diff) | |
download | libpng-7784cd3f6fba5008a83c869e401cb92e338b2c62.tar.gz |
[libpng16] Fix png_get_iCCP() to allow null compression-type
Diffstat (limited to 'pngget.c')
-rw-r--r-- | pngget.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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 |