diff --git a/ANNOUNCE b/ANNOUNCE index ecc043db1..98b269fd3 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,63 +1,32 @@ -Libpng 1.6.9 - February 6, 2014 +Libpng 1.6.10beta01 - February 6, 2014 -This is a public release of libpng, intended for use in production codes. +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. Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.6.9.tar.xz (LZMA-compressed, recommended) - libpng-1.6.9.tar.gz + 1.6.10beta01.tar.xz (LZMA-compressed, recommended) + 1.6.10beta01.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lpng169.7z (LZMA-compressed, recommended) - lpng169.zip + lp1610b01.7z (LZMA-compressed, recommended) + lp1610b01.zip Other information: - libpng-1.6.9-README.txt - libpng-1.6.9-LICENSE.txt + 1.6.10beta01-README.txt + 1.6.10beta01-LICENSE.txt Gnupg/*.asc (PGP armored detached signatures) -Changes since the last public release (1.6.8): - Bookkeeping: Moved functions around (no changes). Moved transform - function definitions before the place where they are called so that - they can be masde static. Move the intrapixel functions and the - grayscale palette builder out of the png?tran.c files. The latter - isn't a transform function and is no longer used internally, and the - former MNG specific functions are better placed in pngread/pngwrite.c - Made transform implementation functions static. This makes the internal - functions called by png_do_{read|write}_transformations static. On an - x86-64 DLL build (Gentoo Linux) this reduces the size of the text - segment of the DLL by 1208 bytes, about 0.6%. It also simplifies - maintenance by removing the declarations from pngpriv.h and allowing - easier changes to the internal interfaces. - Rebuilt configure scripts with automake-1.14.1 and autoconf-2.69 - in the tar distributions. - Added checks for libpng 1.5 to pngvalid.c. This supports the use of - this version of pngvalid in libpng 1.5 - Merged with pngvalid.c from libpng-1.7 changes to create a single - pngvalid.c - Removed #error macro from contrib/tools/pngfix.c (Thomas Klausner). - Merged pngrio.c, pngtrans.c, pngwio.c, and pngerror.c with libpng-1.7.0 - Merged libpng-1.7.0 changes to make no-interlace configurations work - with test programs. - Revised pngvalid.c to support libpng 1.5, which does not support the - PNG_MAXIMUM_INFLATE_WINDOW option, so #define it out when appropriate in - pngvalid.c - Allow unversioned links created on install to be disabled in configure. - In configure builds 'make install' changes/adds links like png.h - and libpng.a to point to the newly installed, versioned, files (e.g. - libpng17/png.h and libpng17.a). Three new configure options and some - rearrangement of Makefile.am allow creation of these links to be disabled. - Removed potentially misleading warning from png_check_IHDR(). - Updated scripts/makefile.* to use CPPFLAGS (Cosmin). - Added clang attribute support (Cosmin). - Quiet an uninitialized memory warning from VC2013 in png_get_png(). +Changes since the last public release (1.6.9): + +Version 1.6.10beta01 [February 6, 2014] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 99c954d2f..37a9b739a 100644 --- a/CHANGES +++ b/CHANGES @@ -4800,6 +4800,8 @@ Version 1.6.9rc02 [January 30, 2014] Version 1.6.9 [February 6, 2014] +Version 1.6.10beta01 [February 6, 2014] + 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 ce5ca6986..ed143d109 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ enable_testing() set(PNGLIB_MAJOR 1) set(PNGLIB_MINOR 6) -set(PNGLIB_RELEASE 9) +set(PNGLIB_RELEASE 10) 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.9 +# VERSION 16.${PNGLIB_RELEASE}.1.6.10beta01 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index cfab9c639..fb5062e03 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.9, February 6, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.10beta01, February 6, 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 diff --git a/README b/README index 1aefa24de..d29052c7a 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.9 - February 6, 2014 (shared library 16.0) +README for libpng version 1.6.10beta01 - February 6, 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/configure.ac b/configure.ac index 8061aba60..369dd6cee 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.9],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.10beta01],[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.9 +PNGLIB_VERSION=1.6.10beta01 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 -PNGLIB_RELEASE=9 +PNGLIB_RELEASE=10 dnl End of version number stuff diff --git a/contrib/libtests/pngvalid.c b/contrib/libtests/pngvalid.c index 7347c1b5d..bf7ab6901 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.18 [February 6, 2014] + * Last changed in libpng 1.6.9 [February 6, 2014] * Copyright (c) 2014 Glenn Randers-Pehrson * Written by John Cunningham Bowler * diff --git a/libpng-manual.txt b/libpng-manual.txt index c854b4c68..bcad6df18 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.9 - February 6, 2014 + libpng version 1.6.10beta01 - February 6, 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.9 - February 6, 2014 + libpng versions 0.97, January 1998, through 1.6.10beta01 - February 6, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5244,7 +5244,7 @@ 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.9 are Y2K compliant. It is my belief that earlier +upward through 1.6.10beta01 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 f80ca41da..10277d638 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "February 6, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.9 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.10beta01 .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.9 - February 6, 2014 + libpng version 1.6.10beta01 - February 6, 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.9 - February 6, 2014 + libpng versions 0.97, January 1998, through 1.6.10beta01 - February 6, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5749,7 +5749,7 @@ 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.9 are Y2K compliant. It is my belief that earlier +upward through 1.6.10beta01 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 @@ -5980,6 +5980,7 @@ the first widely used release: 1.6.9beta01-04 16 10609 16.so.16.9[.0] 1.6.9rc01-02 16 10609 16.so.16.9[.0] 1.6.9 16 10609 16.so.16.9[.0] + 1.6.10beta01 16 10610 16.so.16.10[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -6036,7 +6037,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.9 - February 6, 2014: +Libpng version 1.6.10beta01 - February 6, 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). @@ -6059,7 +6060,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.9, February 6, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.10beta01, February 6, 2014, 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 diff --git a/libpngpf.3 b/libpngpf.3 index ef0fb869b..4c51ec1f6 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "February 6, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.9 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.10beta01 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index 3db9ad41e..659ab079b 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_9 Your_png_h_is_not_version_1_6_9; +typedef png_libpng_version_1_6_10beta01 Your_png_h_is_not_version_1_6_10beta01; /* 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 @@ -773,13 +773,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.9 - February 6, 2014" PNG_STRING_NEWLINE \ + "libpng version 1.6.10beta01 - February 6, 2014" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2014 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.9 - February 6, 2014\ + return "libpng version 1.6.10beta01 - February 6, 2014\ Copyright (c) 1998-2014 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 b572dc732..63365d557 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.9 - February 6, 2014 + * libpng version 1.6.10beta01 - February 6, 2014 * 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.9 - February 6, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.6.10beta01 - February 6, 2014: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -192,6 +192,7 @@ * 1.6.9beta01-04 16 10609 16.so.16.9[.0] * 1.6.9rc01-02 16 10609 16.so.16.9[.0] * 1.6.9 16 10609 16.so.16.9[.0] + * 1.6.10beta01 16 10610 16.so.16.10[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -223,7 +224,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.9, February 6, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.10beta01, February 6, 2014, 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: @@ -341,7 +342,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.6.9 are Y2K compliant. It is my belief that + * upward through 1.6.10beta01 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 @@ -401,9 +402,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.9" +#define PNG_LIBPNG_VER_STRING "1.6.10beta01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.9 - February 6, 2014\n" + " libpng version 1.6.10beta01 - February 6, 2014\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -411,13 +412,13 @@ /* 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 9 +#define PNG_LIBPNG_VER_RELEASE 10 /* This should match the numeric part of the final component of * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 0 +#define PNG_LIBPNG_VER_BUILD 01 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -434,7 +435,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_STABLE +#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -442,7 +443,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 10609 /* 1.6.9 */ +#define PNG_LIBPNG_VER 10610 /* 1.6.10 */ /* Library configuration: these options cannot be changed after * the library has been built. @@ -547,7 +548,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_9; +typedef char* png_libpng_version_1_6_10beta01; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 7ce5c65a0..211ef5f36 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.9 - February 6, 2014 + * libpng version 1.6.10beta01 - February 6, 2014 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 2c69f33e6..ed6523d6e 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1991,4 +1991,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_9 Your_png_h_is_not_version_1_6_9; +typedef png_libpng_version_1_6_10beta01 Your_png_h_is_not_version_1_6_10beta01; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index d88d98c38..976017630 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.9 - February 6, 2014 +libpng version 1.6.10beta01 - February 6, 2014 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 9d894dd1a..990756764 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@