From 9a80a35f4bfb7e4714122d2a5360c51d4ed9b073 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Wed, 23 Dec 2009 07:35:11 -0600 Subject: [PATCH] [master] Imported from libpng-1.2.42rc02.tar --- ANNOUNCE | 4 ++-- CHANGES | 2 +- INSTALL | 2 +- LICENSE | 4 ++-- README | 2 +- Y2KINFO | 2 +- libpng-1.2.42rc02.txt | 6 +++--- libpng.3 | 18 ++++++++++-------- libpngpf.3 | 2 +- png.5 | 2 +- png.c | 6 +++--- png.h | 14 ++++++++------ pngconf.h | 2 +- pngerror.c | 2 +- pngget.c | 2 +- pngmem.c | 2 +- pngpread.c | 2 +- pngread.c | 2 +- pngrio.c | 2 +- pngrtran.c | 2 +- pngrutil.c | 2 +- pngset.c | 2 +- pngtest.c | 2 +- pngtrans.c | 2 +- pngwio.c | 2 +- pngwrite.c | 2 +- pngwtran.c | 2 +- pngwutil.c | 2 +- scripts/README.txt | 2 +- 29 files changed, 51 insertions(+), 47 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index fc8937734..ba0156baf 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.2.42rc02 - December 22, 2009 +Libpng 1.2.42rc02 - December 23, 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. @@ -61,7 +61,7 @@ version 1.2.42beta02 [December 11, 2009] version 1.2.42rc01 [December 17, 2009] No changes. -version 1.2.42rc02 [December 22, 2009] +version 1.2.42rc02 [December 23, 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) diff --git a/CHANGES b/CHANGES index a3b0e8efc..0f2b3b730 100644 --- a/CHANGES +++ b/CHANGES @@ -2624,7 +2624,7 @@ version 1.2.42beta02 [December 11, 2009] version 1.2.42rc01 [December 17, 2009] No changes. -version 1.2.42rc02 [December 22, 2009] +version 1.2.42rc02 [December 23, 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) diff --git a/INSTALL b/INSTALL index b5b541722..1f22ad7a4 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.2.42rc02 - December 22, 2009 +Installing libpng version 1.2.42rc02 - December 23, 2009 On Unix/Linux and similar systems, you can simply type diff --git a/LICENSE b/LICENSE index 5b803ca1f..ce64a3c39 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.2.42rc02, December 22, 2009, are +libpng versions 1.2.6, August 15, 2004, through 1.2.42rc02, December 23, 2009, are Copyright (c) 2004, 2006-2009 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -December 22, 2009 +December 23, 2009 diff --git a/README b/README index d6015f355..ad01ff457 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.2.42rc02 - December 22, 2009 (shared library 12.0) +README for libpng version 1.2.42rc02 - December 23, 2009 (shared library 12.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. diff --git a/Y2KINFO b/Y2KINFO index cf30f4667..ef17a3b6e 100644 --- a/Y2KINFO +++ b/Y2KINFO @@ -1,7 +1,7 @@ Y2K compliance in libpng: ========================= - December 22, 2009 + December 23, 2009 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. diff --git a/libpng-1.2.42rc02.txt b/libpng-1.2.42rc02.txt index 6ec8bb3c2..0d2b0e7ae 100644 --- a/libpng-1.2.42rc02.txt +++ b/libpng-1.2.42rc02.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.42rc02 - December 22, 2009 + libpng version 1.2.42rc02 - December 23, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.2.42rc02 - December 22, 2009 + libpng versions 0.97, January 1998, through 1.2.42rc02 - December 23, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -3176,7 +3176,7 @@ Other rules can be inferred by inspecting the libpng source. XIII. Y2K Compliance in libpng -December 22, 2009 +December 23, 2009 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. diff --git a/libpng.3 b/libpng.3 index 3f4429a91..f9e1494ce 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "December 22, 2009" +.TH LIBPNG 3 "December 23, 2009" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.2.42rc02 .SH SYNOPSIS @@ -821,7 +821,7 @@ Following is a copy of the libpng.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.2.42rc02 - December 22, 2009 + libpng version 1.2.42rc02 - December 23, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -832,7 +832,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.2.42rc02 - December 22, 2009 + libpng versions 0.97, January 1998, through 1.2.42rc02 - December 23, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -3997,7 +3997,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XIII. Y2K Compliance in libpng -December 22, 2009 +December 23, 2009 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -4293,7 +4293,9 @@ the first widely used release: 1.0.51 10 10051 10.so.0.51[.0] 1.2.41 13 10241 12.so.0.41[.0] 1.2.42beta01-02 13 10242 12.so.0.42[.0] - 1.2.42rc01-02 13 10242 12.so.0.42[.0] + 1.2.42rc01 13 10242 12.so.0.42[.0] + 1.0.52 10 10052 10.so.0.52[.0] + 1.2.42 13 10242 12.so.0.42[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -4349,7 +4351,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.42rc02 - December 22, 2009: +Libpng version 1.2.42rc02 - December 23, 2009: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -4372,7 +4374,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.2.42rc02, December 22, 2009, are +libpng versions 1.2.6, August 15, 2004, through 1.2.42rc02, December 23, 2009, are Copyright (c) 2004,2006-2008 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -4471,7 +4473,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -December 22, 2009 +December 23, 2009 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index fc4388361..1c127cc4d 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "December 22, 2009" +.TH LIBPNGPF 3 "December 23, 2009" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.2.42rc02 (private functions) diff --git a/png.5 b/png.5 index cffa6eb26..4405dbaa4 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "December 22, 2009" +.TH PNG 5 "December 23, 2009" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index eb9f8c31e..be275f298 100644 --- a/png.c +++ b/png.c @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.2.41 [December 22, 2009] + * Last changed in libpng 1.2.41 [December 23, 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.) @@ -723,13 +723,13 @@ png_get_copyright(png_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.2.42rc02 - December 22, 2009" PNG_STRING_NEWLINE \ + "libpng version 1.2.42rc02 - December 23, 2009" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2009 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ PNG_STRING_NEWLINE); #else - return ((png_charp) "libpng version 1.2.42rc02 - December 22, 2009\ + return ((png_charp) "libpng version 1.2.42rc02 - December 23, 2009\ Copyright (c) 1998-2009 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."); diff --git a/png.h b/png.h index c9e2c5805..c9fdd9144 100644 --- a/png.h +++ b/png.h @@ -1,6 +1,6 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.42rc02 - December 22, 2009 + * libpng version 1.2.42rc02 - December 23, 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.) @@ -10,7 +10,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.2.42rc02 - December 22, 2009: Glenn + * libpng versions 0.97, January 1998, through 1.2.42rc02 - December 23, 2009: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -251,7 +251,9 @@ * 1.0.51 10 10051 10.so.0.51[.0] * 1.2.41 13 10241 12.so.0.41[.0] * 1.2.42beta01-02 13 10242 12.so.0.42[.0] - * 1.2.42rc01-02 13 10242 12.so.0.42[.0] + * 1.2.42rc01 13 10242 12.so.0.42[.0] + * 1.0.51 10 10052 10.so.0.52[.0] + * 1.2.42 13 10242 12.so.0.42[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -283,7 +285,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.2.42rc02, December 22, 2009, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.42rc02, December 23, 2009, are * Copyright (c) 2004, 2006-2009 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.2.5 * with the following individual added to the list of Contributing Authors: @@ -395,7 +397,7 @@ * Y2K compliance in libpng: * ========================= * - * December 22, 2009 + * December 23, 2009 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -459,7 +461,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.2.42rc02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.42rc02 - December 22, 2009\n" + " libpng version 1.2.42rc02 - December 23, 2009\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 diff --git a/pngconf.h b/pngconf.h index 87c4c1bc3..cc7c02a2f 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.42rc02 - December 22, 2009 + * libpng version 1.2.42rc02 - December 23, 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.) diff --git a/pngerror.c b/pngerror.c index 539f5a729..84de53951 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * Last changed in libpng 1.2.41 [December 22, 2009] + * Last changed in libpng 1.2.41 [December 23, 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.) diff --git a/pngget.c b/pngget.c index dbefdb9b1..4814b020e 100644 --- a/pngget.c +++ b/pngget.c @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * Last changed in libpng 1.2.41 [December 22, 2009] + * Last changed in libpng 1.2.41 [December 23, 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.) diff --git a/pngmem.c b/pngmem.c index 83427383e..26c6ec2a1 100644 --- a/pngmem.c +++ b/pngmem.c @@ -1,7 +1,7 @@ /* pngmem.c - stub functions for memory allocation * - * Last changed in libpng 1.2.41 [December 22, 2009] + * Last changed in libpng 1.2.41 [December 23, 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.) diff --git a/pngpread.c b/pngpread.c index 38fdabe30..83bad1d8f 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * Last changed in libpng 1.2.41 [December 22, 2009] + * Last changed in libpng 1.2.41 [December 23, 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.) diff --git a/pngread.c b/pngread.c index 62b23af99..f6f5ac403 100644 --- a/pngread.c +++ b/pngread.c @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.2.41 [December 22, 2009] + * Last changed in libpng 1.2.41 [December 23, 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.) diff --git a/pngrio.c b/pngrio.c index 7e2c75964..745337300 100644 --- a/pngrio.c +++ b/pngrio.c @@ -1,7 +1,7 @@ /* pngrio.c - functions for data input * - * Last changed in libpng 1.2.41 [December 22, 2009] + * Last changed in libpng 1.2.41 [December 23, 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.) diff --git a/pngrtran.c b/pngrtran.c index 308797594..9805c39cc 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,7 +1,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.2.41 [December 22, 2009] + * Last changed in libpng 1.2.41 [December 23, 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.) diff --git a/pngrutil.c b/pngrutil.c index 425086591..872638707 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.2.41 [December 22, 2009] + * Last changed in libpng 1.2.41 [December 23, 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.) diff --git a/pngset.c b/pngset.c index b3f4b3f4d..dcc3973b0 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 22, 2009] + * Last changed in libpng 1.2.41 [December 23, 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.) diff --git a/pngtest.c b/pngtest.c index 7b28e4d5b..368a91001 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1,7 +1,7 @@ /* pngtest.c - a simple test program to test libpng * - * Last changed in libpng 1.2.41 [December 22, 2009] + * Last changed in libpng 1.2.41 [December 23, 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.) diff --git a/pngtrans.c b/pngtrans.c index 57f876edf..17d7ccc14 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -1,7 +1,7 @@ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * - * Last changed in libpng 1.2.41 [December 22, 2009] + * Last changed in libpng 1.2.41 [December 23, 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.) diff --git a/pngwio.c b/pngwio.c index 5e9b628b7..bf0d4e418 100644 --- a/pngwio.c +++ b/pngwio.c @@ -1,7 +1,7 @@ /* pngwio.c - functions for data output * - * Last changed in libpng 1.2.41 [December 22, 2009] + * Last changed in libpng 1.2.41 [December 23, 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.) diff --git a/pngwrite.c b/pngwrite.c index ce55118cc..b0da05138 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * Last changed in libpng 1.2.41 [December 22, 2009] + * Last changed in libpng 1.2.41 [December 23, 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.) diff --git a/pngwtran.c b/pngwtran.c index df142f458..a1bc3adc8 100644 --- a/pngwtran.c +++ b/pngwtran.c @@ -1,7 +1,7 @@ /* pngwtran.c - transforms the data in a row for PNG writers * - * Last changed in libpng 1.2.41 [December 22, 2009] + * Last changed in libpng 1.2.41 [December 23, 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.) diff --git a/pngwutil.c b/pngwutil.c index cc0a87857..831d8e6fb 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * Last changed in libpng 1.2.41 [December 22, 2009] + * Last changed in libpng 1.2.41 [December 23, 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.) diff --git a/scripts/README.txt b/scripts/README.txt index eaa8bcca1..fef7e1a1a 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,5 +1,5 @@ -Makefiles for libpng version 1.2.42rc02 - December 22, 2009 +Makefiles for libpng version 1.2.42rc02 - December 23, 2009 makefile.linux => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.42rc02) -- GitLab