From 4df1247bd628d2f1c5489c9e3e103894e5e69579 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Tue, 27 Jan 2015 07:18:34 -0600 Subject: [PATCH] [libpng14] Imported from libpng-1.4.15beta01.tar --- ANNOUNCE | 4 ++-- CHANGES | 2 +- INSTALL | 2 +- LICENSE | 4 ++-- README | 2 +- libpng-1.4.15beta01.txt | 6 +++--- libpng.3 | 14 +++++++------- libpngpf.3 | 2 +- png.5 | 2 +- png.c | 4 ++-- png.h | 10 +++++----- pngconf.h | 2 +- pngpriv.h | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 2 +- 16 files changed, 31 insertions(+), 31 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 158274e21..96b2a9522 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.4.15beta01 - January 22, 2015 +Libpng 1.4.15beta01 - January 27, 2015 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. @@ -27,7 +27,7 @@ Other information: Changes since the last public release (1.4.14): -version 1.4.15beta01 [January 22, 2015] +version 1.4.15beta01 [January 27, 2015] Restored test for maximum allowed image width that was removed from libpng-1.4.13 (fixes CVE-2014-9495 and CVE-2015-0973). diff --git a/CHANGES b/CHANGES index 183a452ea..f37bc901e 100644 --- a/CHANGES +++ b/CHANGES @@ -2922,7 +2922,7 @@ version 1.4.14rc02 [November 17, 2014] version 1.4.14 [November 20, 2014] No changes. -version 1.4.15beta01 [January 22, 2015] +version 1.4.15beta01 [January 27, 2015] Restored test for maximum allowed image width that was removed from libpng-1.4.13 (fixes CVE-2014-9495 and CVE-2015-0973). diff --git a/INSTALL b/INSTALL index cab10eff3..e96888695 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.4.15beta01 - January 22, 2015 +Installing libpng version 1.4.15beta01 - January 27, 2015 On Unix/Linux and similar systems, you can simply type diff --git a/LICENSE b/LICENSE index d82468f24..27a09f1bb 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.4.15beta01, January 22, 2015, are +libpng versions 1.2.6, August 15, 2004, through 1.4.15beta01, January 27, 2015, are Copyright (c) 2004, 2006-2014 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 -January 22, 2015 +January 27, 2015 diff --git a/README b/README index 7b0c72195..c5eefd1b4 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.4.15beta01 - January 22, 2015 (shared library 14.0) +README for libpng version 1.4.15beta01 - January 27, 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/libpng-1.4.15beta01.txt b/libpng-1.4.15beta01.txt index b2dfaf95e..b3e7c646c 100644 --- a/libpng-1.4.15beta01.txt +++ b/libpng-1.4.15beta01.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.15beta01 - January 22, 2015 + libpng version 1.4.15beta01 - January 27, 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.15beta01 - January 22, 2015 + libpng versions 0.97, January 1998, through 1.4.15beta01 - January 27, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -3316,7 +3316,7 @@ Other rules can be inferred by inspecting the libpng source. XIII. Y2K Compliance in libpng -January 22, 2015 +January 27, 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 1f1f48b3e..b74c8843e 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "January 22, 2015" +.TH LIBPNG 3 "January 27, 2015" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.4.15beta01 .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.15beta01 - January 22, 2015 + libpng version 1.4.15beta01 - January 27, 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.15beta01 - January 22, 2015 + libpng versions 0.97, January 1998, through 1.4.15beta01 - January 27, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -3758,7 +3758,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XIII. Y2K Compliance in libpng -January 22, 2015 +January 27, 2015 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -4035,7 +4035,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.15beta01 - January 22, 2015: +Libpng version 1.4.15beta01 - January 27, 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). @@ -4058,7 +4058,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.4.15beta01, January 22, 2015, are +libpng versions 1.2.6, August 15, 2004, through 1.4.15beta01, January 27, 2015, are Copyright (c) 2004,2006-2007 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 @@ -4157,7 +4157,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -January 22, 2015 +January 27, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index f704d85b1..ce3b9d5e2 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "January 22, 2015" +.TH LIBPNGPF 3 "January 27, 2015" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.4.15beta01 (private functions) diff --git a/png.5 b/png.5 index c98a346e3..ac58344f6 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "January 22, 2015" +.TH PNG 5 "January 27, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 1e3981a1d..507c59fdf 100644 --- a/png.c +++ b/png.c @@ -547,13 +547,13 @@ png_get_copyright(png_const_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.4.15beta01 - January 22, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.4.15beta01 - January 27, 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.15beta01 - January 22, 2015\ + return ((png_charp) "libpng version 1.4.15beta01 - January 27, 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 0266f1eeb..4370e0869 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.4.15beta01 - January 22, 2015 + * libpng version 1.4.15beta01 - January 27, 2015 * Copyright (c) 1998-2011 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.) @@ -11,7 +11,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.15beta01 - January 22, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.4.15beta01 - January 27, 2015: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -208,7 +208,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.4.15beta01, January 22, 2015, are + * libpng versions 1.2.6, August 15, 2004, through 1.4.15beta01, January 27, 2015, are * Copyright (c) 2004, 2006-2013 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: @@ -320,7 +320,7 @@ * Y2K compliance in libpng: * ========================= * - * January 22, 2015 + * January 27, 2015 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -384,7 +384,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.4.15beta01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.15beta01 - January 22, 2015\n" + " libpng version 1.4.15beta01 - January 27, 2015\n" #define PNG_LIBPNG_VER_SONUM 14 #define PNG_LIBPNG_VER_DLLNUM 14 diff --git a/pngconf.h b/pngconf.h index 3b3eebf61..bcadf7e1b 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.4.15beta01 - January 22, 2015 + * libpng version 1.4.15beta01 - January 27, 2015 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2011 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpriv.h b/pngpriv.h index b2890350d..e46d725bc 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.4.15beta01 - January 22, 2015 + * libpng version 1.4.15beta01 - January 27, 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/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index f8a81f1a7..54e61bd89 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.4.15beta01 - January 22, 2015 +libpng version 1.4.15beta01 - January 27, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index b742c7b26..f39d1d106 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@