diff --git a/CHANGES b/CHANGES index 1cef0c291..7753acf38 100644 --- a/CHANGES +++ b/CHANGES @@ -5033,9 +5033,10 @@ Version 1.6.14rc02 [October 17, 2014] Version 1.6.14 [October 23, 2014] No changes. -Version 1.6.15beta01 [October 27, 2014] +Version 1.6.15beta01 [October 29, 2014] Changed "if (!x)" to "if (x == 0)" and "if (x)" to "if (x !== 0)" Simplified png_free_data(). + Added missing "ptr = NULL" after some instances of png_free(). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/INSTALL b/INSTALL index 547c28474..61ea59147 100644 --- a/INSTALL +++ b/INSTALL @@ -394,7 +394,7 @@ CFLAGS="-Wall -O -funroll-loops \ --with-pkgconfigdir=/usr/lib/pkgconfig --includedir=/usr/include You can alternatively specify --includedir=/usr/include, /usr/local/include, -/usr/include/libpng%NN%, or whatever. +/usr/include/libpng16, or whatever. If you find that the configure script is out-of-date or is not supporting your platform properly, try running autogen.sh to regenerate "configure", diff --git a/LICENSE b/LICENSE index d15b8af92..afd824724 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.15beta01, October 23, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.15beta01, October 29, 2014, 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 -October 23, 2014 +October 29, 2014 diff --git a/README b/README index 38f9d4021..1e640fa8a 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.15beta01 - October 23, 2014 (shared library 16.0) +README for libpng version 1.6.15beta01 - October 29, 2014 (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/libpng-manual.txt b/libpng-manual.txt index 3ca6225fe..7e650e8c5 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.15beta01 - October 23, 2014 + libpng version 1.6.15beta01 - October 29, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 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.15beta01 - October 23, 2014 + libpng versions 0.97, January 1998, through 1.6.15beta01 - October 29, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5277,7 +5277,7 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -October 23, 2014 +October 29, 2014 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 31763e692..46ac34f1e 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "October 23, 2014" +.TH LIBPNG 3 "October 29, 2014" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.15beta01 .SH SYNOPSIS @@ -504,7 +504,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.15beta01 - October 23, 2014 + libpng version 1.6.15beta01 - October 29, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -515,7 +515,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.15beta01 - October 23, 2014 + libpng versions 0.97, January 1998, through 1.6.15beta01 - October 29, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5781,7 +5781,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -October 23, 2014 +October 29, 2014 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -6090,7 +6090,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.15beta01 - October 23, 2014: +Libpng version 1.6.15beta01 - October 29, 2014: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6113,7 +6113,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.15beta01, October 23, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.15beta01, October 29, 2014, 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 @@ -6212,7 +6212,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -October 23, 2014 +October 29, 2014 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 57a6400fd..afd53a5ab 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "October 23, 2014" +.TH LIBPNGPF 3 "October 29, 2014" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.15beta01 (private functions) diff --git a/png.5 b/png.5 index 474df9109..d519c53f3 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "October 23, 2014" +.TH PNG 5 "October 29, 2014" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.h b/png.h index 347044e85..349e0a8dd 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.15beta01 - October 23, 2014 + * libpng version 1.6.15beta01 - October 29, 2014 * Copyright (c) 1998-2014 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.6.15beta01 - October 23, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.6.15beta01 - October 29, 2014: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -238,7 +238,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.15beta01, October 23, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.15beta01, October 29, 2014, 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: @@ -350,7 +350,7 @@ * Y2K compliance in libpng: * ========================= * - * October 23, 2014 + * October 29, 2014 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -420,7 +420,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.6.15beta01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.15beta01 - October 23, 2014\n" + " libpng version 1.6.15beta01 - October 29, 2014\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 diff --git a/pngconf.h b/pngconf.h index 1710e71bd..73d45dcc1 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.15beta01 - October 23, 2014 + * libpng version 1.6.15beta01 - October 29, 2014 * * 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 8eb5f6e30..d45bf9f8f 100644 --- a/pngset.c +++ b/pngset.c @@ -661,6 +661,7 @@ png_set_iCCP(png_const_structrp png_ptr, png_inforp info_ptr, if (new_iccp_profile == NULL) { png_free(png_ptr, new_iccp_name); + new_iccp_name = NULL; png_benign_error(png_ptr, "Insufficient memory to process iCCP profile"); return; @@ -1041,6 +1042,7 @@ png_set_sPLT(png_const_structrp png_ptr, if (np->entries == NULL) { png_free(png_ptr, np->name); + np->name = NULL; break; } diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index c51886796..fed5b30d5 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.15beta01 - October 23, 2014 +libpng version 1.6.15beta01 - October 29, 2014 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 1b075c91b..0656b3a97 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@