diff --git a/ANNOUNCE b/ANNOUNCE index 581bd99bf..ec2626faa 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1018,6 +1018,8 @@ Version 1.7.0beta69 [November 24, 2015] had bugs which were likely to expose end cases of rgb-to-gray conversion errors. This might possibly explain some of the machine math dependencies we are seeing. + Temporarily disabled filter selection while writing, and temporarily + replaced pngtest.png accordingly. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 2d43a8ddc..0f042e6c8 100644 --- a/CHANGES +++ b/CHANGES @@ -5317,6 +5317,8 @@ Version 1.7.0beta69 [November 24, 2015] had bugs which were likely to expose end cases of rgb-to-gray conversion errors. This might possibly explain some of the machine math dependencies we are seeing. + Temporarily disabled filter selection while writing, and temporarily + replaced pngtest.png accordingly. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/LICENSE b/LICENSE index 9f552d0d0..32998382c 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.7.0beta69, November 13, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.7.0beta69, November 24, 2015, are Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals @@ -109,4 +109,4 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -November 13, 2015 +November 24, 2015 diff --git a/README b/README index dae7e9b2c..f8012ac37 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.7.0beta69 - November 13, 2015 (shared library 17.0) +README for libpng version 1.7.0beta69 - November 24, 2015 (shared library 17.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/libtests/pngvalid.c b/contrib/libtests/pngvalid.c index ad1a5f785..4d8da5f01 100644 --- a/contrib/libtests/pngvalid.c +++ b/contrib/libtests/pngvalid.c @@ -1,7 +1,7 @@ /* pngvalid.c - validate libpng by constructing then reading png files. * - * Last changed in libpng 1.5.24 [(PENDING RELEASE)] + * Last changed in libpng 1.5.25 [RDATE%] * Copyright (c) 2014-2015 Glenn Randers-Pehrson * Written by John Cunningham Bowler * diff --git a/libpng-manual.txt b/libpng-manual.txt index fdaf75292..bdf4c0beb 100644 --- a/libpng-manual.txt +++ b/libpng-manual.txt @@ -1,6 +1,6 @@ libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.7.0beta69 - November 13, 2015 + libpng version 1.7.0beta69 - November 24, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.7.0beta69 - November 13, 2015 + libpng versions 0.97, January 1998, through 1.7.0beta69 - November 24, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson diff --git a/libpng.3 b/libpng.3 index 8daf5f4b4..bea85607e 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "November 13, 2015" +.TH LIBPNG 3 "November 24, 2015" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta69 .SH SYNOPSIS @@ -498,7 +498,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng. .SH LIBPNG.TXT libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.7.0beta69 - November 13, 2015 + libpng version 1.7.0beta69 - November 24, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -509,7 +509,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.7.0beta69 - November 13, 2015 + libpng versions 0.97, January 1998, through 1.7.0beta69 - November 24, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5980,7 +5980,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.7.0beta69 - November 13, 2015: +Libpng version 1.7.0beta69 - November 24, 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). @@ -6005,7 +6005,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.7.0beta69, November 13, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.7.0beta69, November 24, 2015, are Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals @@ -6104,7 +6104,7 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -November 13, 2015 +November 24, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index e77f3f660..2dc4c1c47 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "November 13, 2015" +.TH LIBPNGPF 3 "November 24, 2015" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta69 (private functions) diff --git a/png.5 b/png.5 index e7bfffd00..55f856eb6 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "November 13, 2015" +.TH PNG 5 "November 24, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 3c311ebcc..8ac41158e 100644 --- a/png.c +++ b/png.c @@ -711,13 +711,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.7.0beta69 - November 23, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.7.0beta69 - November 24, 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 "libpng version 1.7.0beta69 - November 23, 2015\ + return "libpng version 1.7.0beta69 - November 24, 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 093973f54..2b1dce37b 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.7.0beta69, November 23, 2015 + * libpng version 1.7.0beta69, November 24, 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.89, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.7.0beta69, November 23, 2015: + * libpng versions 0.97, January 1998, through 1.7.0beta69, November 24, 2015: * Glenn Randers-Pehrson. * See also "Contributing Authors", below. */ @@ -25,7 +25,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.0.7, July 1, 2000, through 1.7.0beta69, November 23, 2015, are + * libpng versions 1.0.7, July 1, 2000, through 1.7.0beta69, November 24, 2015, are * Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, are * derived from libpng-1.0.6, and are distributed according to the same * disclaimer and license as libpng-1.0.6 with the following individuals @@ -218,7 +218,7 @@ * Y2K compliance in libpng: * ========================= * - * November 23, 2015 + * November 24, 2015 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -288,7 +288,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.7.0beta69" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.7.0beta69 - November 23, 2015\n" + " libpng version 1.7.0beta69 - November 24, 2015\n" #define PNG_LIBPNG_VER_SONUM 17 #define PNG_LIBPNG_VER_DLLNUM 17 diff --git a/pngconf.h b/pngconf.h index 4156a6fa0..e64387bac 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.7.0beta69, November 23, 2015 + * libpng version 1.7.0beta69, November 24, 2015 * * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 29d5b1ccd..886808a50 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.7.0 [(PENDING RELEASE)] + * Last changed in libpng 1.5.25 [(PENDING RELEASE)] * 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 d1b66260f..fe444eeca 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.7.0beta69 - November 13, 2015 +libpng version 1.7.0beta69 - November 24, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 0ee55dfdc..63fb8a5d0 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@