From 434801a39c8f8883fe5257db02bed70052b3b6b4 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Fri, 2 Mar 2012 22:38:50 -0600 Subject: [PATCH] [libpng16] Bump version to 1.6.0beta16 --- LICENSE | 4 ++-- README | 2 +- contrib/pngminim/decoder/pngusr.dfa | 1 - libpng-manual.txt | 15 ++++++++++++--- libpng.3 | 27 ++++++++++++++++++++------- libpngpf.3 | 2 +- png.5 | 2 +- png.c | 4 ++-- pngconf.h | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 2 +- scripts/symbols.def | 1 + 13 files changed, 44 insertions(+), 22 deletions(-) diff --git a/LICENSE b/LICENSE index dc7a1179c..0e1bf07ae 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.6.0beta16, March 2, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.6.0beta16, March 3, 2012, are Copyright (c) 2004, 2006-2011 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 -March 2, 2012 +March 3, 2012 diff --git a/README b/README index 881bd1e31..f537d7f6e 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.0beta16 - March 2, 2012 (shared library 16.0) +README for libpng version 1.6.0beta16 - March 3, 2012 (shared library 16.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/pngusr.dfa b/contrib/pngminim/decoder/pngusr.dfa index e8f200238..cae307f39 100644 --- a/contrib/pngminim/decoder/pngusr.dfa +++ b/contrib/pngminim/decoder/pngusr.dfa @@ -38,4 +38,3 @@ option STDIO on option READ_EXPAND on option READ_STRIP_16_TO_8 on option USER_LIMITS on -@#define PNG_SECURE diff --git a/libpng-manual.txt b/libpng-manual.txt index 119c7d678..bc5adcdc7 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.6.0beta16 - March 2, 2012 + libpng version 1.6.0beta16 - March 3, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 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.6.0beta16 - March 2, 2012 + libpng versions 0.97, January 1998, through 1.6.0beta16 - March 3, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -4824,6 +4824,15 @@ XII. Changes to Libpng from version 1.5.x to 1.6.x A "simplified API" has been added (see documentation in png.h and a simple example in contrib/examples/pngtopng.c) +Checking for invalid palette index on read or write was added. This is +enabled by default but can be disabled in each png_ptr with + + png_set_check_for_invalid_index(png_ptr, allowed); + + allowed - one of + 0: disable + 1: enable + Starting with libpng-1.6.0, you can configure libpng to prefix all exported symbols. @@ -4993,7 +5002,7 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -March 2, 2012 +March 3, 2012 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 c4737818c..0937d1cb5 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "March 2, 2012" +.TH LIBPNG 3 "March 3, 2012" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta16 .SH SYNOPSIS @@ -578,6 +578,10 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta16 \fI\fB +\fBvoid png_set_check_for_invalid_index(png_structrp \fP\fIpng_ptr\fP\fB, int \fIallowed\fP\fB);\fP + +\fI\fB + \fBvoid png_set_cHRM (png_structp \fP\fIpng_ptr\fP\fB, png_infop \fP\fIinfo_ptr\fP\fB, double \fP\fIwhite_x\fP\fB, double \fP\fIwhite_y\fP\fB, double \fP\fIred_x\fP\fB, double \fP\fIred_y\fP\fB, double \fP\fIgreen_x\fP\fB, double \fP\fIgreen_y\fP\fB, double \fP\fIblue_x\fP\fB, double \fIblue_y\fP\fB);\fP \fI\fB @@ -1003,7 +1007,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.6.0beta16 - March 2, 2012 + libpng version 1.6.0beta16 - March 3, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -1014,7 +1018,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.0beta16 - March 2, 2012 + libpng versions 0.97, January 1998, through 1.6.0beta16 - March 3, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -5828,6 +5832,15 @@ how to do this, and a case where pngusr.h is still required. A "simplified API" has been added (see documentation in png.h and a simple example in contrib/examples/pngtopng.c) +Checking for invalid palette index on read or write was added. This is +enabled by default but can be disabled in each png_ptr with + + png_set_check_for_invalid_index(png_ptr, allowed); + + allowed - one of + 0: disable + 1: enable + Starting with libpng-1.6.0, you can configure libpng to prefix all exported symbols. @@ -5997,7 +6010,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -March 2, 2012 +March 3, 2012 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -6265,7 +6278,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.0beta16 - March 2, 2012: +Libpng version 1.6.0beta16 - March 3, 2012: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6288,7 +6301,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.0beta16, March 2, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.6.0beta16, March 3, 2012, 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 @@ -6387,7 +6400,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 2, 2012 +March 3, 2012 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index e83f041bf..8dc6f7470 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "March 2, 2012" +.TH LIBPNGPF 3 "March 3, 2012" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta16 (private functions) diff --git a/png.5 b/png.5 index 7645a7d31..1c3e0b0eb 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "March 2, 2012" +.TH PNG 5 "March 3, 2012" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index b49498382..809b888a8 100644 --- a/png.c +++ b/png.c @@ -762,13 +762,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.0beta16 - March 2, 2012" PNG_STRING_NEWLINE \ + "libpng version 1.6.0beta16 - March 3, 2012" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2012 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.6.0beta16 - March 2, 2012\ + return "libpng version 1.6.0beta16 - March 3, 2012\ Copyright (c) 1998-2012 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; diff --git a/pngconf.h b/pngconf.h index 47b7a60f8..bd7b89b02 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.0beta16 - March 2, 2012 + * libpng version 1.6.0beta16 - March 3, 2012 * * Copyright (c) 1998-2012 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 94a663362..2bce816c0 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.0beta16 - March 2, 2012 +libpng version 1.6.0beta16 - March 3, 2012 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 3eff7a0e8..60e218d1f 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@