diff --git a/ANNOUNCE b/ANNOUNCE index 36f2d5192..523137201 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,30 +1,32 @@ -Libpng 1.5.16 - May 23, 2013 +Libpng 1.5.17beta01 - May 23, 2013 -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.5.16.tar.xz (LZMA-compressed, recommended) - libpng-1.5.16.tar.gz - libpng-1.5.16.tar.bz2 + 1.5.17beta01.tar.xz (LZMA-compressed, recommended) + 1.5.17beta01.tar.gz + 1.5.17beta01.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lpng1516.7z (LZMA-compressed, recommended) - lpng1516.zip + lp1517b01.7z (LZMA-compressed, recommended) + lp1517b01.zip Other information: - libpng-1.5.16-README.txt - libpng-1.5.16-LICENSE.txt + 1.5.17beta01-README.txt + 1.5.17beta01-LICENSE.txt Changes since the last public release (1.5.15): +Version 1.5.16beta01 [April 25, 2013] Corrected a misplaced closing bracket in contrib/libtests/pngvalid.c (Flavio Medeiros). Revised stack marking in arm/filter_neon.S and configure.ac @@ -32,11 +34,19 @@ Changes since the last public release (1.5.15): Previously the ARM NEON specific files were still built if the option was switched 'off' as opposed to being explicitly disabled. Avoid a compiler warning about unused png_ptr in translate_gamma_flags() + +Version 1.5.16beta02 [April 26, 2013] Revise pngtest.c to skip tests of unsupported features. + Regenerated configure files. + +Version 1.5.16beta03 [April 26, 2013] Test for 'arm*' not just 'arm' in the host_cpu configure variable. - Rebuilt the configure scripts. + +Version 1.5.16beta04 [May 1, 2013] Expanded manual paragraph about writing private chunks, particularly the need to call png_set_keep_unknown_chunks() when writing them. + +Version 1.5.16beta05 [May 9, 2013] Updated contrib/pngminus/pnm2png.c (Paul Stewart): Check for EOF Ignore "#" delimited comments in input file to pnm2png.c. @@ -44,6 +54,8 @@ Changes since the last public release (1.5.15): Added a call to png_set_packing() Initialize dimension values so if sscanf fails at least we have known invalid values. + +Version 1.5.16beta06 [May 12, 2013] Allow contrib/pnminus/pnm2png.c to compile without WRITE_INVERT and WRITE_PACK supported (writes error message that it can't read P1 or P4 PBM files). Revised contrib/pngminim/*/makefile to separate CPPFLAGS and CFLAGS, and @@ -51,6 +63,14 @@ Changes since the last public release (1.5.15): Ported contrib/pngminus/pnm2png.c changes back from libpng-1.6.3beta06, to use unsigned long, not png_uint_32 arguments to sscanf(). +Version 1.5.16rc01 [May 16, 2013] + No changes. + +Version 1.5.16 [May 23, 2013] + No changes. + +Version 1.5.17beta01 [May 23, 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 097f90415..c4ed79b7f 100644 --- a/CHANGES +++ b/CHANGES @@ -4111,6 +4111,9 @@ Version 1.5.16rc01 [May 16, 2013] No changes. Version 1.5.16 [May 23, 2013] + No changes. + +Version 1.5.17beta01 [May 23, 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 bea0af53f..dd4fe1928 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,7 @@ enable_testing() set(PNGLIB_MAJOR 1) set(PNGLIB_MINOR 5) -set(PNGLIB_RELEASE 16) +set(PNGLIB_RELEASE 17) set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR}) set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE}) @@ -236,7 +236,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 15.${PNGLIB_RELEASE}.1.5.16 +# VERSION 15.${PNGLIB_RELEASE}.1.5.17beta01 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index f84edc6d1..252fc42ff 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.5.16, May 23, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.5.17beta01, May 23, 2013, are Copyright (c) 2004, 2006-2012 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 e0ee0c159..3eae05d62 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.16 - May 23, 2013 (shared library 15.0) +README for libpng version 1.5.17beta01 - May 23, 2013 (shared library 15.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 b/configure index 433b75738..479988293 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libpng 1.5.16. +# Generated by GNU Autoconf 2.69 for libpng 1.5.17beta01. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.16' -PACKAGE_STRING='libpng 1.5.16' +PACKAGE_VERSION='1.5.17beta01' +PACKAGE_STRING='libpng 1.5.17beta01' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1342,7 +1342,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libpng 1.5.16 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.17beta01 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1412,7 +1412,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.16:";; + short | recursive ) echo "Configuration of libpng 1.5.17beta01:";; esac cat <<\_ACEOF @@ -1533,7 +1533,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.16 +libpng configure 1.5.17beta01 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1956,7 +1956,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libpng $as_me 1.5.16, which was +It was created by libpng $as_me 1.5.17beta01, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2819,7 +2819,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.16' + VERSION='1.5.17beta01' cat >>confdefs.h <<_ACEOF @@ -2889,10 +2889,10 @@ fi -PNGLIB_VERSION=1.5.16 +PNGLIB_VERSION=1.5.17beta01 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 -PNGLIB_RELEASE=16 +PNGLIB_RELEASE=17 @@ -13419,7 +13419,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libpng $as_me 1.5.16, which was +This file was extended by libpng $as_me 1.5.17beta01, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13485,7 +13485,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libpng config.status 1.5.16 +libpng config.status 1.5.17beta01 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index f8dd7e028..01ae724eb 100644 --- a/configure.ac +++ b/configure.ac @@ -18,15 +18,15 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.5.16], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.17beta01], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE([serial-tests]) dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.16 +PNGLIB_VERSION=1.5.17beta01 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 -PNGLIB_RELEASE=16 +PNGLIB_RELEASE=17 dnl End of version number stuff diff --git a/libpng-manual.txt b/libpng-manual.txt index 3fc4f301a..c5e6a21e6 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.5.16 - May 23, 2013 + libpng version 1.5.17beta01 - May 23, 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.5.16 - May 23, 2013 + libpng versions 0.97, January 1998, through 1.5.17beta01 - May 23, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -4661,7 +4661,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.5.16 are Y2K compliant. It is my belief that earlier +upward through 1.5.17beta01 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 that diff --git a/libpng.3 b/libpng.3 index b151afcef..7f9b1a0e3 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "May 23, 2013" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.16 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.17beta01 .SH SYNOPSIS \fB #include \fP @@ -492,7 +492,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.5.16 - May 23, 2013 + libpng version 1.5.17beta01 - May 23, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -503,7 +503,7 @@ Libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.16 - May 23, 2013 + libpng versions 0.97, January 1998, through 1.5.17beta01 - May 23, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5154,7 +5154,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.5.16 are Y2K compliant. It is my belief that earlier +upward through 1.5.17beta01 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 that @@ -5383,6 +5383,7 @@ the first widely used release: 1.5.16beta01-06 15 10516 15.so.15.16[.0] 1.5.16rc01 15 10516 15.so.15.16[.0] 1.5.16 15 10516 15.so.15.16[.0] + 1.5.17beta01 15 10517 15.so.15.17[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -5439,7 +5440,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.16 - May 23, 2013: +Libpng version 1.5.17beta01 - May 23, 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). @@ -5462,7 +5463,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.16, May 23, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.5.17beta01, May 23, 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 diff --git a/libpngpf.3 b/libpngpf.3 index 797154470..2954b6c6f 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "May 23, 2013" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.16 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.17beta01 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index dffcbb672..944b1116e 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_5_16 Your_png_h_is_not_version_1_5_16; +typedef png_libpng_version_1_5_17beta01 Your_png_h_is_not_version_1_5_17beta01; /* 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 @@ -658,13 +658,13 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.16 - May 23, 2013" PNG_STRING_NEWLINE \ + "libpng version 1.5.17beta01 - May 23, 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.5.16 - May 23, 2013\ + return "libpng version 1.5.17beta01 - May 23, 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 c3ac5c7d6..a4650648e 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.16 - May 23, 2013 + * libpng version 1.5.17beta01 - May 23, 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.5.16 - May 23, 2013: Glenn + * libpng versions 0.97, January 1998, through 1.5.17beta01 - May 23, 2013: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -190,6 +190,7 @@ * 1.5.16beta01-06 15 10516 15.so.15.16[.0] * 1.5.16rc01 15 10516 15.so.15.16[.0] * 1.5.16 15 10516 15.so.15.16[.0] + * 1.5.17beta01 15 10517 15.so.15.17[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -221,7 +222,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.16, May 23, 2013, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.17beta01, May 23, 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: @@ -339,7 +340,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.5.16 are Y2K compliant. It is my belief that + * upward through 1.5.17beta01 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 @@ -398,9 +399,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.16" +#define PNG_LIBPNG_VER_STRING "1.5.17beta01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.16 - May 23, 2013\n" + " libpng version 1.5.17beta01 - May 23, 2013\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -408,13 +409,13 @@ /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ #define PNG_LIBPNG_VER_MAJOR 1 #define PNG_LIBPNG_VER_MINOR 5 -#define PNG_LIBPNG_VER_RELEASE 16 +#define PNG_LIBPNG_VER_RELEASE 17 /* 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 @@ -431,7 +432,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. @@ -439,7 +440,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 10516 /* 1.5.16 */ +#define PNG_LIBPNG_VER 10517 /* 1.5.17 */ /* Library configuration: these options cannot be changed after * the library has been built. @@ -561,7 +562,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_5_16; +typedef char* png_libpng_version_1_5_17beta01; /* Three color definitions. The order of the red, green, and blue, (and the * exact size) is not important, although the size of the fields need to diff --git a/pngconf.h b/pngconf.h index 92b1f0162..324afe7db 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.16 - May 23, 2013 + * libpng version 1.5.17beta01 - May 23, 2013 * * 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 e79ef776e..75a6c189c 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1962,4 +1962,4 @@ main(void) #endif /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_5_16 Your_png_h_is_not_version_1_5_16; +typedef png_libpng_version_1_5_17beta01 Your_png_h_is_not_version_1_5_17beta01; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index b4eb04a1a..5e5883081 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.16 - May 23, 2013 +libpng version 1.5.17beta01 - May 23, 2013 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 8a3809fec..059f4ead8 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@