From 923ee398ab41c9a5d037460f0c48fdf948f99963 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Wed, 14 Oct 2015 22:34:06 -0500 Subject: [PATCH] [libpng14] Imported from libpng-1.4.17beta02.tar --- INSTALL | 2 +- LICENSE | 4 ++-- README | 2 +- contrib/pngminim/decoder/gather.sh | 2 +- contrib/pngminim/encoder/gather.sh | 2 +- contrib/pngminim/preader/gather.sh | 2 +- libpng-1.4.17beta02.txt | 6 +++--- libpng.3 | 14 +++++++------- libpngpf.3 | 2 +- png.5 | 2 +- png.c | 4 ++-- png.h | 10 +++++----- pngconf.h | 2 +- pngpriv.h | 2 +- pngset.c | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 2 +- 18 files changed, 32 insertions(+), 32 deletions(-) diff --git a/INSTALL b/INSTALL index a00db0d30..e997c301f 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.4.17beta02 - August 19, 2015 +Installing libpng version 1.4.17beta02 - October 15, 2015 On Unix/Linux and similar systems, you can simply type diff --git a/LICENSE b/LICENSE index 39134823f..08b7c0b63 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.4.17beta02, August 19, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.4.17beta02, October 15, 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 -August 19, 2015 +October 15, 2015 diff --git a/README b/README index b47a6d494..adf94e9ff 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.4.17beta02 - August 19, 2015 (shared library 14.0) +README for libpng version 1.4.17beta02 - October 15, 2015 (shared library 14.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/contrib/pngminim/decoder/gather.sh b/contrib/pngminim/decoder/gather.sh index 4eb1d677d..22015f552 100755 --- a/contrib/pngminim/decoder/gather.sh +++ b/contrib/pngminim/decoder/gather.sh @@ -3,7 +3,7 @@ cp ../../pngminus/png2pnm.c pngm2pnm.c cp ../../../*.h . cp ../../../*.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 e9ccffc77..8e72b4864 100755 --- a/contrib/pngminim/encoder/gather.sh +++ b/contrib/pngminim/encoder/gather.sh @@ -3,7 +3,7 @@ cp ../../pngminus/pnm2png.c pnm2pngm.c cp ../../../*.h . cp ../../../*.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 4207af7b8..1ee964d15 100755 --- a/contrib/pngminim/preader/gather.sh +++ b/contrib/pngminim/preader/gather.sh @@ -4,7 +4,7 @@ cp ../../gregbook/rpng2-x.c ../../gregbook/readpng2.[ch] . cp ../../gregbook/COPYING ../../gregbook/LICENSE . cp ../../../*.h . cp ../../../*.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.4.17beta02.txt b/libpng-1.4.17beta02.txt index 17e3cd96d..7747e9b2c 100644 --- a/libpng-1.4.17beta02.txt +++ b/libpng-1.4.17beta02.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.17beta02 - August 19, 2015 + libpng version 1.4.17beta02 - October 15, 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.4.17beta02 - August 19, 2015 + libpng versions 0.97, January 1998, through 1.4.17beta02 - October 15, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -3284,7 +3284,7 @@ Other rules can be inferred by inspecting the libpng source. XIII. Y2K Compliance in libpng -August 19, 2015 +October 15, 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 2f4eafeee..0f4066f88 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "August 19, 2015" +.TH LIBPNG 3 "October 15, 2015" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.4.17beta02 .SH SYNOPSIS @@ -442,7 +442,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.4.17beta02 - August 19, 2015 + libpng version 1.4.17beta02 - October 15, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -453,7 +453,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.4.17beta02 - August 19, 2015 + libpng versions 0.97, January 1998, through 1.4.17beta02 - October 15, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -3726,7 +3726,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XIII. Y2K Compliance in libpng -August 19, 2015 +October 15, 2015 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -4009,7 +4009,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.17beta02 - August 19, 2015: +Libpng version 1.4.17beta02 - October 15, 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). @@ -4032,7 +4032,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.4.17beta02, August 19, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.4.17beta02, October 15, 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: @@ -4124,7 +4124,7 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -August 19, 2015 +October 15, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 8f4351311..813a5f598 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "August 19, 2015" +.TH LIBPNGPF 3 "October 15, 2015" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.4.17beta02 (private functions) diff --git a/png.5 b/png.5 index 9f4307ba5..7ffc1d337 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "August 19, 2015" +.TH PNG 5 "October 15, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 8d7f0f8ff..ab2e1c2c4 100644 --- a/png.c +++ b/png.c @@ -557,13 +557,13 @@ png_get_copyright(png_const_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.4.17beta02 - August 19, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.4.17beta02 - October 15, 2015" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2015 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.4.17beta02 - August 19, 2015\ + return ((png_charp) "libpng version 1.4.17beta02 - October 15, 2015\ Copyright (c) 1998-2015 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 1fd800f40..ce6cedc38 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.4.17beta02, August 19, 2015 + * libpng version 1.4.17beta02, October 15, 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.4.17beta02, August 19, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.4.17beta02, October 15, 2015: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -215,7 +215,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.0.7, July 1, 2000, through 1.4.17beta02, August 19, 2015, are + * libpng versions 1.0.7, July 1, 2000, through 1.4.17beta02, October 15, 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: @@ -322,7 +322,7 @@ * Y2K compliance in libpng: * ========================= * - * August 19, 2015 + * October 15, 2015 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -386,7 +386,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.4.17beta02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.17beta02 - August 19, 2015\n" + " libpng version 1.4.17beta02 - October 15, 2015\n" #define PNG_LIBPNG_VER_SONUM 14 #define PNG_LIBPNG_VER_DLLNUM 14 diff --git a/pngconf.h b/pngconf.h index b176be67e..6a73e52e1 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.4.17beta02, August 19, 2015 + * libpng version 1.4.17beta02, October 15, 2015 * * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpriv.h b/pngpriv.h index a29f6a570..4c621ef3f 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.4.17beta02 - August 19, 2015 + * libpng version 1.4.17beta02 - October 15, 2015 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2014 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngset.c b/pngset.c index 49a1aaefa..88b503429 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.4.17 [August 19, 2015] + * Last changed in libpng 1.4.17 [October 15, 2015] * Copyright (c) 1998-2015 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/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index ad0becb10..9887d0532 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.4.17beta02 - August 19, 2015 +libpng version 1.4.17beta02 - October 15, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index ef9c8f43b..696c2d7e9 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@