diff --git a/ANNOUNCE b/ANNOUNCE index 567b3c407..b29489ab5 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,32 +1,30 @@ -Libpng 1.6.7rc03 - November 7, 2013 +Libpng 1.6.7 - November 14, 2013 -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. +This is a public release of libpng, intended for use in production codes. Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.6.7rc03.tar.xz (LZMA-compressed, recommended) - 1.6.7rc03.tar.gz + libpng-1.6.7.tar.xz (LZMA-compressed, recommended) + libpng-1.6.7.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp167r03.7z (LZMA-compressed, recommended) - lp167r03.zip + lpng167.7z (LZMA-compressed, recommended) + lpng167.zip Other information: - 1.6.7rc03-README.txt - 1.6.7rc03-LICENSE.txt + libpng-1.6.7-README.txt + libpng-1.6.7-LICENSE.txt Gnupg/*.asc (PGP armored detached signatures) Changes since the last public release (1.6.6): -Version 1.6.7beta01 [September 30, 2013] Revised unknown chunk code to correct several bugs in the NO_SAVE_/NO_WRITE combination Allow HANDLE_AS_UNKNOWN to work when other options are configured off. Also @@ -45,8 +43,6 @@ Version 1.6.7beta01 [September 30, 2013] if SAVE_UNKNOWN was not available but did nothing since the callback was never implemented. Merged pngunknown.c with 1.7 version and back ported 1.7 improvements/fixes - -Version 1.6.7beta02 [October 12, 2013] Made changes for compatibility with automake 1.14: 1) Added the 'compile' program to the list of programs that must be cleaned in autogen.sh @@ -71,16 +67,12 @@ Version 1.6.7beta02 [October 12, 2013] condition ? string-literal : string-literal). Make autogen.sh work with automake 1.13 as well as 1.14. Do this by always removing the 1.14 'compile' script but never checking for it. - -Version 1.6.7beta03 [October 19, 2013] Added ARMv8 support (James Yu ). Added file arm/filter_neon_intrinsics.c; enable with -mfpu=neon. Revised pngvalid to generate size images with as many filters as it can manage, limited by the number of rows. Cleaned up ARM NEON compilation handling. The tests are now in pngpriv.h and detect the broken GCC compilers. - -Version 1.6.7beta04 [October 26, 2013] Allow clang derived from older GCC versions to use ARM intrinsics. This causes all clang builds that use -mfpu=neon to use the intrinsics code, not the assembler code. This has only been tested on iOS 7. It may be @@ -89,16 +81,9 @@ Version 1.6.7beta04 [October 26, 2013] or intrinsics to be turned on at compile time during the build by defining PNG_ARM_NEON_IMPLEMENTATION to the correct value (2 or 1). This macro is undefined by default and the build type is selected in pngpriv.h. - -Version 1.6.7rc01 [November 2, 2013] - No changes. - -Version 1.6.7rc02 [November 7, 2013] Fixed #include in filter_neon_intrinsics.c and ctype macros. The ctype char checking macros take an unsigned char argument, not a signed char. -Version 1.6.7rc03 [November 7, 2013] - 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/CHANGES b/CHANGES index 0bbd8873e..953e53ab9 100644 --- a/CHANGES +++ b/CHANGES @@ -4711,7 +4711,7 @@ Version 1.6.7rc02 [November 7, 2013] Fixed #include in filter_neon_intrinsics.c and ctype macros. The ctype char checking macros take an unsigned char argument, not a signed char. -Version 1.6.7rc03 [November 7, 2013] +Version 1.6.7rc03 [November 14, 2013] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b61df4ff..4b4e74c07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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.7rc03 +# VERSION 16.${PNGLIB_RELEASE}.1.6.7 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 8b3dd4eb3..b1b97ea57 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.7rc03, November 7, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.7, November 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 -November 7, 2013 +November 14, 2013 diff --git a/README b/README index 5efbd6ff5..80fc574ad 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.7rc03 - November 7, 2013 (shared library 16.0) +README for libpng version 1.6.7 - November 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/filter_neon.S b/arm/filter_neon.S index c5d0b5313..3d1ccf505 100644 --- a/arm/filter_neon.S +++ b/arm/filter_neon.S @@ -3,7 +3,7 @@ * * Copyright (c) 2013 Glenn Randers-Pehrson * Written by Mans Rullgard, 2011. - * Last changed in libpng 1.6.7 [(PENDING RELEASE)] + * Last changed in libpng 1.6.7 [November 14, 2013] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/arm/filter_neon_intrinsics.c b/arm/filter_neon_intrinsics.c index 2246d7143..e6a0217ab 100644 --- a/arm/filter_neon_intrinsics.c +++ b/arm/filter_neon_intrinsics.c @@ -5,7 +5,7 @@ * Written by James Yu , October 2013. * Based on filter_neon.S, written by Mans Rullgard, 2011. * - * Last changed in libpng 1.6.7 [(PENDING RELEASE)] + * Last changed in libpng 1.6.7 [November 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 8a38fafd2..28200c3f6 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.7rc03],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.7],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -39,7 +39,7 @@ 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.7rc03 +PNGLIB_VERSION=1.6.7 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=7 diff --git a/libpng-manual.txt b/libpng-manual.txt index ba0efe452..bb1702f48 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.7rc03 - November 7, 2013 + libpng version 1.6.7 - November 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.7rc03 - November 7, 2013 + libpng versions 0.97, January 1998, through 1.6.7 - November 14, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5232,13 +5232,13 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -November 7, 2013 +November 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.7rc03 are Y2K compliant. It is my belief that earlier +upward through 1.6.7 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 d9fe8bd1c..861bea61b 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "November 7, 2013" +.TH LIBPNG 3 "November 14, 2013" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.7rc03 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.7 .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.7rc03 - November 7, 2013 + libpng version 1.6.7 - November 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.7rc03 - November 7, 2013 + libpng versions 0.97, January 1998, through 1.6.7 - November 14, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5737,13 +5737,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -November 7, 2013 +November 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.7rc03 are Y2K compliant. It is my belief that earlier +upward through 1.6.7 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 @@ -6023,7 +6023,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.7rc03 - November 7, 2013: +Libpng version 1.6.7 - November 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). @@ -6046,7 +6046,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.7rc03, November 7, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.7, November 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 @@ -6145,7 +6145,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -November 7, 2013 +November 14, 2013 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 24840e2ca..62ed7812c 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "November 7, 2013" +.TH LIBPNGPF 3 "November 14, 2013" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.7rc03 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.7 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 674728cac..978af1c11 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "November 7, 2013" +.TH PNG 5 "November 14, 2013" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 5dfc12a0a..efcc6eead 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_7rc03 Your_png_h_is_not_version_1_6_7rc03; +typedef png_libpng_version_1_6_7 Your_png_h_is_not_version_1_6_7; /* 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.7rc03 - November 7, 2013" PNG_STRING_NEWLINE \ + "libpng version 1.6.7 - November 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.7rc03 - November 7, 2013\ + return "libpng version 1.6.7 - November 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 50a8fb138..55095362b 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.7rc03 - November 7, 2013 + * libpng version 1.6.7 - November 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.7rc03 - November 7, 2013: Glenn + * libpng versions 0.97, January 1998, through 1.6.7 - November 14, 2013: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -216,7 +216,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.7rc03, November 7, 2013, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.7, November 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: @@ -328,13 +328,13 @@ * Y2K compliance in libpng: * ========================= * - * November 7, 2013 + * November 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.7rc03 are Y2K compliant. It is my belief that + * upward through 1.6.7 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 @@ -394,9 +394,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.7rc03" +#define PNG_LIBPNG_VER_STRING "1.6.7" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.7rc03 - November 7, 2013\n" + " libpng version 1.6.7 - November 14, 2013\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -410,7 +410,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 03 +#define PNG_LIBPNG_VER_BUILD 0 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -427,7 +427,7 @@ #define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with PNG_LIBPNG_BUILD_PRIVATE */ -#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_RC +#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -540,7 +540,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_7rc03; +typedef char* png_libpng_version_1_6_7; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 4ce3dfdb8..8064194c0 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.7rc03 - November 7, 2013 + * libpng version 1.6.7 - November 14, 2013 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpriv.h b/pngpriv.h index 2f4028f39..43b2ef4c5 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -6,7 +6,7 @@ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * Last changed in libpng 1.6.7 [(PENDING RELEASE)] + * Last changed in libpng 1.6.7 [November 14, 2013] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/pngrutil.c b/pngrutil.c index e675dad27..2438384dd 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.7 [(PENDING RELEASE)] + * Last changed in libpng 1.6.7 [November 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 41ba6a279..c3fe3204d 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1970,4 +1970,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_7rc03 Your_png_h_is_not_version_1_6_7rc03; +typedef png_libpng_version_1_6_7 Your_png_h_is_not_version_1_6_7; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index e175179bb..c8b1736b0 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.7rc03 - November 7, 2013 +libpng version 1.6.7 - November 14, 2013 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 4e3eb7916..c55d70ce1 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@