From e3b92b1766120663c4e6e95abc93b6a000d934c9 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Fri, 23 Oct 2015 06:34:11 -0500 Subject: [PATCH] [libpng12] Imported from libpng-1.2.54beta01.tar --- INSTALL | 2 +- LICENSE | 4 ++-- README | 4 ++-- Y2KINFO | 2 +- contrib/pngminim/decoder/gather.sh | 3 +-- contrib/pngminim/encoder/gather.sh | 3 +-- contrib/pngminim/preader/gather.sh | 3 +-- libpng-1.2.54beta01.txt | 6 +++--- libpng.3 | 14 +++++++------- libpngpf.3 | 2 +- png.5 | 2 +- png.h | 10 +++++----- pngconf.h | 2 +- scripts/README.txt | 2 +- 14 files changed, 28 insertions(+), 31 deletions(-) diff --git a/INSTALL b/INSTALL index 72e9b7a1..e6b6ff2a 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.2.54beta01 - May 9, 2015 +Installing libpng version 1.2.54beta01 - October 23, 2015 On Unix/Linux and similar systems, you can simply type diff --git a/LICENSE b/LICENSE index 2ad56471..cbc99e4c 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.2.54beta01, July 13, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.2.54beta01, October 23, 2015, are Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals added to the list of Contributing Authors: @@ -102,4 +102,4 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -July 13, 2015 +October 23, 2015 diff --git a/README b/README index 503b3c26..923c12b0 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.2.54beta01 - May 9, 2015 (shared library 12.0) +README for libpng version 1.2.54beta01 - October 23, 2015 (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. @@ -135,7 +135,7 @@ and ...". If in doubt, send questions to me. I'll bounce them to others, if necessary. Please do not send suggestions on how to change PNG. We have -been discussing PNG for nineteen years now, and it is official and +been discussing PNG for twenty years now, and it is official and finished. If you have suggestions for libpng, however, I'll gladly listen. Even if your suggestion is not used immediately, it may be used later. diff --git a/Y2KINFO b/Y2KINFO index d71568fe..c79410cd 100644 --- a/Y2KINFO +++ b/Y2KINFO @@ -1,7 +1,7 @@ Y2K compliance in libpng: ========================= - May 9, 2015 + October 23, 2015 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. diff --git a/contrib/pngminim/decoder/gather.sh b/contrib/pngminim/decoder/gather.sh index 913b78de..841b1349 100755 --- a/contrib/pngminim/decoder/gather.sh +++ b/contrib/pngminim/decoder/gather.sh @@ -1,8 +1,7 @@ cp ../../pngminus/png2pnm.c pngm2pnm.c cp ../../../*.h . cp ../../../*.c . -rm pnggccrd.c pngvcrd.c -rm example.c pngtest.c pngpread.c pngw*.c +rm -f example.c pngtest.c pngpread.c pngw*.c pnggccrd.c pngvcrd.c # change the following 2 lines if zlib is somewhere else cp ../../../../zlib/*.h . cp ../../../../zlib/*.c . diff --git a/contrib/pngminim/encoder/gather.sh b/contrib/pngminim/encoder/gather.sh index 61d0b13e..7d635445 100755 --- a/contrib/pngminim/encoder/gather.sh +++ b/contrib/pngminim/encoder/gather.sh @@ -1,8 +1,7 @@ cp ../../pngminus/pnm2png.c pnm2pngm.c cp ../../../*.h . cp ../../../*.c . -rm pnggccrd.c pngvcrd.c -rm example.c pngtest.c pngr*.c pngpread.c +rm -f example.c pngtest.c pngpread.c pngr*.c pnggccrd.c pngvcrd.c # Change the next 2 lines if zlib is somewhere else. cp ../../../../zlib/*.h . cp ../../../../zlib/*.c . diff --git a/contrib/pngminim/preader/gather.sh b/contrib/pngminim/preader/gather.sh index 357bb9a7..eecab9b3 100755 --- a/contrib/pngminim/preader/gather.sh +++ b/contrib/pngminim/preader/gather.sh @@ -2,8 +2,7 @@ cp ../../gregbook/rpng2-x.c ../../gregbook/readpng2.[ch] . cp ../../gregbook/COPYING ../../gregbook/LICENSE . cp ../../../*.h . cp ../../../*.c . -rm pnggccrd.c pngvcrd.c -rm example.c pngtest.c pngw*.c +rm -f example.c pngtest.c pngw*.c pnggccrd.c pngvcrd.c # change the following 2 lines if zlib is somewhere else cp ../../../../zlib/*.h . cp ../../../../zlib/*.c . diff --git a/libpng-1.2.54beta01.txt b/libpng-1.2.54beta01.txt index 14b061d8..8586af23 100644 --- a/libpng-1.2.54beta01.txt +++ b/libpng-1.2.54beta01.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.54beta01 - August 11, 2015 + libpng version 1.2.54beta01 - October 23, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 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.54beta01 - August 11, 2015 + libpng versions 0.97, January 1998, through 1.2.54beta01 - October 23, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -3152,7 +3152,7 @@ Other rules can be inferred by inspecting the libpng source. XIII. Y2K Compliance in libpng -August 11, 2015 +October 23, 2015 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 8c072725..701c9c1d 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "August 11, 2015" +.TH LIBPNG 3 "October 23, 2015" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.2.54beta01 .SH SYNOPSIS @@ -410,7 +410,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.54beta01 - August 11, 2015 + libpng version 1.2.54beta01 - October 23, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -421,7 +421,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.2.54beta01 - August 11, 2015 + libpng versions 0.97, January 1998, through 1.2.54beta01 - October 23, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -3562,7 +3562,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XIII. Y2K Compliance in libpng -August 11, 2015 +October 23, 2015 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -3959,7 +3959,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.54beta01 - August 11, 2015: +Libpng version 1.2.54beta01 - October 23, 2015: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -3982,7 +3982,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.2.54beta01, August 11, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.2.54beta01, October 23, 2015, are Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals added to the list of Contributing Authors: @@ -4074,7 +4074,7 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -August 11, 2015 +October 23, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index e3280f6b..6bef5ceb 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "August 11, 2015" +.TH LIBPNGPF 3 "October 23, 2015" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.2.54beta01 (private functions) diff --git a/png.5 b/png.5 index 4903dfdb..3135d362 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "August 11, 2015" +.TH PNG 5 "October 23, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.h b/png.h index 3988fe0b..faf69b6e 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.54beta01, July 13, 2015 + * libpng version 1.2.54beta01, October 23, 2015 * * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -12,7 +12,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.54beta01, July 13, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.2.54beta01, October 23, 2015: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -330,7 +330,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.0.7, July 1, 2000, through 1.2.54beta01, July 13, 2015, are + * libpng versions 1.0.7, July 1, 2000, through 1.2.54beta01, October 23, 2015, are * Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.0.6 * with the following individuals added to the list of Contributing Authors: @@ -437,7 +437,7 @@ * Y2K compliance in libpng: * ========================= * - * July 13, 2015 + * October 23, 2015 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -501,7 +501,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.2.54beta01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.54beta01 - July 13, 2015\n" + " libpng version 1.2.54beta01 - October 23, 2015\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 diff --git a/pngconf.h b/pngconf.h index bd2072ef..821c5a24 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.54beta01, May 9, 2015 + * libpng version 1.2.54beta01, October 23, 2015 * * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/scripts/README.txt b/scripts/README.txt index ea43ea51..70b59dc7 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,5 +1,5 @@ -Makefiles for libpng version 1.2.54beta01 - May 9, 2015 +Makefiles for libpng version 1.2.54beta01 - October 23, 2015 makefile.linux => Linux/ELF makefile (gcc, creates libpng12.so.0.1.2.54beta01)