From 96861728724bff9c2a0fef8a632664234bb26e56 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Fri, 25 Dec 2009 14:22:08 -0600 Subject: [PATCH] [master] Swapped PNG_UNKNOWN_CHUNKS_SUPPORTED and PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngset.c to be consistent with other changes in version 1.2.38. --- ANNOUNCE | 41 +++++++++++++++++++++++------------------ CHANGES | 6 +++++- pngset.c | 6 +++--- 3 files changed, 31 insertions(+), 22 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index ba0156ba..9def3873 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.2.42rc02 - December 23, 2009 +Libpng 1.2.42rc03 - December 25, 2009 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. @@ -9,36 +9,36 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.2.42rc02.tar.xz (LZMA-compressed, recommended) - libpng-1.2.42rc02.tar.gz - libpng-1.2.42rc02.tar.bz2 + libpng-1.2.42rc03.tar.xz (LZMA-compressed, recommended) + libpng-1.2.42rc03.tar.gz + libpng-1.2.42rc03.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.42rc02-no-config.tar.xz (LZMA-compressed, recommended) - libpng-1.2.42rc02-no-config.tar.gz - libpng-1.2.42rc02-no-config.tar.bz2 + libpng-1.2.42rc03-no-config.tar.xz (LZMA-compressed, recommended) + libpng-1.2.42rc03-no-config.tar.gz + libpng-1.2.42rc03-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1242r02.zip - lp1242r02.7z - lp1242r02.tar.bz2 + lp1242r03.zip + lp1242r03.7z + lp1242r03.tar.bz2 Project files - libpng-1.2.42rc02-project-netware.zip - libpng-1.2.42rc02-project-wince.zip + libpng-1.2.42rc03-project-netware.zip + libpng-1.2.42rc03-project-wince.zip Other information: - libpng-1.2.42rc02-README.txt - libpng-1.2.42rc02-KNOWNBUGS.txt - libpng-1.2.42rc02-LICENSE.txt - libpng-1.2.42rc02-Y2K-compliance.txt - libpng-1.2.42rc02-[previous version]-diff.txt + libpng-1.2.42rc03-README.txt + libpng-1.2.42rc03-KNOWNBUGS.txt + libpng-1.2.42rc03-LICENSE.txt + libpng-1.2.42rc03-Y2K-compliance.txt + libpng-1.2.42rc03-[previous version]-diff.txt Changes since the last public release (1.2.41): @@ -61,10 +61,15 @@ version 1.2.42beta02 [December 11, 2009] version 1.2.42rc01 [December 17, 2009] No changes. -version 1.2.42rc02 [December 23, 2009] +version 1.2.42rc02 [December 22, 2009] Renamed libpng-pc.in back to libpng.pc.in and revised CMakeLists.txt (revising changes made in 1.2.41beta17 and 1.2.41rc01) +version 1.2.42rc03 [December 25, 2009] + Swapped PNG_UNKNOWN_CHUNKS_SUPPORTED and PNG_HANDLE_AS_UNKNOWN_SUPPORTED + in pngset.c to be consistent with other changes in version 1.2.38. + +version 1.0.52 and 1.2.42 [December 25, 2009] Send comments/corrections/commendations to png-mng-implement at lists.sf.net diff --git a/CHANGES b/CHANGES index 0f2b3b73..72566d1b 100644 --- a/CHANGES +++ b/CHANGES @@ -2624,10 +2624,14 @@ version 1.2.42beta02 [December 11, 2009] version 1.2.42rc01 [December 17, 2009] No changes. -version 1.2.42rc02 [December 23, 2009] +version 1.2.42rc02 [December 22, 2009] Renamed libpng-pc.in back to libpng.pc.in and revised CMakeLists.txt (revising changes made in 1.2.41beta17 and 1.2.41rc01) +version 1.2.42rc03 [December 25, 2009] + Swapped PNG_UNKNOWN_CHUNKS_SUPPORTED and PNG_HANDLE_AS_UNKNOWN_SUPPORTED + in pngset.c to be consistent with other changes in version 1.2.38. + 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/pngset.c b/pngset.c index dcc3973b..9ed09a34 100644 --- a/pngset.c +++ b/pngset.c @@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.2.41 [December 23, 2009] + * Last changed in libpng 1.2.42 [December 25, 2009] * Copyright (c) 1998-2009 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.) @@ -960,7 +960,7 @@ png_set_sPLT(png_structp png_ptr, } #endif /* PNG_sPLT_SUPPORTED */ -#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED +#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED void PNGAPI png_set_unknown_chunks(png_structp png_ptr, png_infop info_ptr, png_unknown_chunkp unknowns, int num_unknowns) @@ -1066,7 +1066,7 @@ png_permit_mng_features (png_structp png_ptr, png_uint_32 mng_features) } #endif -#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED +#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED void PNGAPI png_set_keep_unknown_chunks(png_structp png_ptr, int keep, png_bytep chunk_list, int num_chunks)