diff --git a/ANNOUNCE b/ANNOUNCE index 5557ad285..f4d2fcebb 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.6.4 - September 12, 2013 +Libpng 1.6.5 - September 14, 2013 This is a public release of libpng, intended for use in production codes. @@ -8,28 +8,24 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.6.4.tar.xz (LZMA-compressed, recommended) - libpng-1.6.4.tar.gz + libpng-1.6.5.tar.xz (LZMA-compressed, recommended) + libpng-1.6.5.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lpng164.7z (LZMA-compressed, recommended) - lpng164.zip + lpng165.7z (LZMA-compressed, recommended) + lpng165.zip Other information: - libpng-1.6.4-README.txt - libpng-1.6.4-LICENSE.txt + libpng-1.6.5-README.txt + libpng-1.6.5-LICENSE.txt Gnupg/*.asc (PGP armored detached signatures) -Changes since the last public release (1.6.3): - Added information about png_set_options() to the manual. - Delay calling png_init_filter_functions() until a row with nonzero filter - is found. - Fixed inconsistent conditional compilation of png_chunk_unknown_handling() - prototype, definition, and usage. Made it depend on - PNG_HANDLE_AS_UNKNOWN_SUPPORTED everywhere. +Changes since the last public release (1.6.4): + + No changes. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index e8ec99804..3ab18d574 100644 --- a/CHANGES +++ b/CHANGES @@ -4634,6 +4634,9 @@ Version 1.6.4rc01 [September 5, 2013] Version 1.6.4 [September 12, 2013] No changes. +Version 1.6.5 [September 14, 2013] + Removed two stray lines of code from arm/arm_init.c. + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e90a3079..8d9e98e40 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ enable_testing() set(PNGLIB_MAJOR 1) set(PNGLIB_MINOR 6) -set(PNGLIB_RELEASE 4) +set(PNGLIB_RELEASE 5) set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR}) set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE}) @@ -252,7 +252,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 16.${PNGLIB_RELEASE}.1.6.4 +# VERSION 16.${PNGLIB_RELEASE}.1.6.5 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 8dfa45982..170e89423 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.4, September 12, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.5, September 14, 2013, 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 @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -September 12, 2013 +September 14, 2013 diff --git a/README b/README index 13bde2fe9..37cc9b313 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.4 - September 12, 2013 (shared library 16.0) +README for libpng version 1.6.5 - September 14, 2013 (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/arm/arm_init.c b/arm/arm_init.c index 17aa010ae..d26b8843c 100644 --- a/arm/arm_init.c +++ b/arm/arm_init.c @@ -3,7 +3,7 @@ * * Copyright (c) 2013 Glenn Randers-Pehrson * Written by Mans Rullgard, 2011. - * Last changed in libpng 1.5.17 [July 18, 2013] + * Last changed in libpng 1.6.5 [September 14, 2013] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/configure.ac b/configure.ac index a9e3f5bd8..aaa298f86 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_PREREQ([2.68]) dnl Version number stuff here: -AC_INIT([libpng],[1.6.4],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.5],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -39,10 +39,10 @@ dnl automake, so the following is not necessary (and is not defined anyway): dnl AM_PREREQ([1.11.2]) dnl stop configure from automagically running automake -PNGLIB_VERSION=1.6.4 +PNGLIB_VERSION=1.6.5 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 -PNGLIB_RELEASE=4 +PNGLIB_RELEASE=5 dnl End of version number stuff diff --git a/libpng-manual.txt b/libpng-manual.txt index 9ad084f18..a6ae666c7 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.4 - September 12, 2013 + libpng version 1.6.5 - September 14, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 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.4 - September 12, 2013 + libpng versions 0.97, January 1998, through 1.6.5 - September 14, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5229,13 +5229,13 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -September 12, 2013 +September 14, 2013 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.6.4 are Y2K compliant. It is my belief that earlier +upward through 1.6.5 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has two year fields. One is a 2-byte unsigned integer diff --git a/libpng.3 b/libpng.3 index 348f5d180..5ad1b88ff 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "September 12, 2013" +.TH LIBPNG 3 "September 14, 2013" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.4 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.5 .SH SYNOPSIS \fB #include \fP @@ -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.4 - September 12, 2013 + libpng version 1.6.5 - September 14, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 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.4 - September 12, 2013 + libpng versions 0.97, January 1998, through 1.6.5 - September 14, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5734,13 +5734,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -September 12, 2013 +September 14, 2013 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.6.4 are Y2K compliant. It is my belief that earlier +upward through 1.6.5 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has two year fields. One is a 2-byte unsigned integer @@ -5960,6 +5960,7 @@ the first widely used release: 1.6.4beta01-02 16 10604 16.so.16.4[.0] 1.6.4rc01 16 10604 16.so.16.4[.0] 1.6.4 16 10604 16.so.16.4[.0] + 1.6.5 16 10605 16.so.16.5[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -6016,7 +6017,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.4 - September 12, 2013: +Libpng version 1.6.5 - September 14, 2013: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6039,7 +6040,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.4, September 12, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.5, September 14, 2013, 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 @@ -6138,7 +6139,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -September 12, 2013 +September 14, 2013 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index ad3fbc60a..06a937e7f 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "September 12, 2013" +.TH LIBPNGPF 3 "September 14, 2013" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.4 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.5 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 9862904af..9820c47f4 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "September 12, 2013" +.TH PNG 5 "September 14, 2013" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 09d671c69..5a175c610 100644 --- a/png.c +++ b/png.c @@ -14,7 +14,7 @@ #include "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_4 Your_png_h_is_not_version_1_6_4; +typedef png_libpng_version_1_6_5 Your_png_h_is_not_version_1_6_5; /* Tells libpng that we have already handled the first "num_bytes" bytes * of the PNG file signature. If the PNG data is embedded into another @@ -768,13 +768,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.4 - September 12, 2013" PNG_STRING_NEWLINE \ + "libpng version 1.6.5 - September 14, 2013" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2013 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.4 - September 12, 2013\ + return "libpng version 1.6.5 - September 14, 2013\ Copyright (c) 1998-2013 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 229769e0b..144c5cfb3 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.4 - September 12, 2013 + * libpng version 1.6.5 - September 14, 2013 * Copyright (c) 1998-2013 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.4 - September 12, 2013: Glenn + * libpng versions 0.97, January 1998, through 1.6.5 - September 14, 2013: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -181,6 +181,7 @@ * 1.6.4beta01-02 16 10604 16.so.16.4[.0] * 1.6.4rc01 16 10604 16.so.16.4[.0] * 1.6.4 16 10604 16.so.16.4[.0] + * 1.6.5 16 10605 16.so.16.5[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -212,7 +213,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.4, September 12, 2013, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.5, September 14, 2013, 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: @@ -324,13 +325,13 @@ * Y2K compliance in libpng: * ========================= * - * September 12, 2013 + * September 14, 2013 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.6.4 are Y2K compliant. It is my belief that + * upward through 1.6.5 are Y2K compliant. It is my belief that * earlier versions were also Y2K compliant. * * Libpng only has two year fields. One is a 2-byte unsigned integer @@ -390,9 +391,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.4" +#define PNG_LIBPNG_VER_STRING "1.6.5" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.4 - September 12, 2013\n" + " libpng version 1.6.5 - September 14, 2013\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -400,7 +401,7 @@ /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ #define PNG_LIBPNG_VER_MAJOR 1 #define PNG_LIBPNG_VER_MINOR 6 -#define PNG_LIBPNG_VER_RELEASE 4 +#define PNG_LIBPNG_VER_RELEASE 5 /* This should match the numeric part of the final component of * PNG_LIBPNG_VER_STRING, omitting any leading zero: @@ -431,7 +432,7 @@ * version 1.0.0 was mis-numbered 100 instead of 10000). From * version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release */ -#define PNG_LIBPNG_VER 10604 /* 1.6.4 */ +#define PNG_LIBPNG_VER 10605 /* 1.6.5 */ /* Library configuration: these options cannot be changed after * the library has been built. @@ -536,7 +537,7 @@ extern "C" { /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -typedef char* png_libpng_version_1_6_4; +typedef char* png_libpng_version_1_6_5; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index dc7bccb0f..6f8031266 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.4 - September 12, 2013 + * libpng version 1.6.5 - September 14, 2013 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrtran.c b/pngrtran.c index bc9be39fb..fae598fee 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,7 +1,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.6.4 [September 12, 2013] + * Last changed in libpng 1.6.4 [September 14, 2013] * Copyright (c) 1998-2013 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/pngrutil.c b/pngrutil.c index 587feb8a4..35d7ae7d1 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.6.4 [September 12, 2013] + * Last changed in libpng 1.6.4 [September 14, 2013] * Copyright (c) 1998-2013 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/pngtest.c b/pngtest.c index 4ca894b2f..8369f4918 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1968,4 +1968,4 @@ main(void) #endif /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_4 Your_png_h_is_not_version_1_6_4; +typedef png_libpng_version_1_6_5 Your_png_h_is_not_version_1_6_5; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 1a0af8db8..693e928b2 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.4 - September 12, 2013 +libpng version 1.6.5 - September 14, 2013 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 7a7dd14de..f1bf2a07a 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@