From 6aad6041aab4a930523fd6655f9517617ac88978 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 19 Mar 2012 06:19:40 -0500 Subject: [PATCH] [libpng15] Imported from libpng-1.5.10rc01.tar --- ANNOUNCE | 21 ++++++++++++--------- CHANGES | 5 ++++- CMakeLists.txt | 2 +- LICENSE | 4 ++-- README | 2 +- configure | 22 +++++++++++----------- configure.ac | 4 ++-- libpng-manual.txt | 8 ++++---- libpng.3 | 18 +++++++++--------- libpngpf.3 | 4 ++-- png.5 | 2 +- png.c | 6 +++--- png.h | 20 ++++++++++---------- pngconf.h | 2 +- pngtest.c | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 12 ++++++------ scripts/libpng-config-head.in | 2 +- scripts/libpng.pc.in | 2 +- scripts/makefile.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.openbsd | 2 +- scripts/pnglibconf.h.prebuilt | 2 +- scripts/symbols.def | 2 +- 25 files changed, 79 insertions(+), 73 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index c7acd9397..fd640d1d9 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.10beta05 - March 16, 2012 +Libpng 1.5.10rc01 - March 19, 2012 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. @@ -9,20 +9,20 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.5.10beta05.tar.xz (LZMA-compressed, recommended) - 1.5.10beta05.tar.gz - 1.5.10beta05.tar.bz2 + 1.5.10rc01.tar.xz (LZMA-compressed, recommended) + 1.5.10rc01.tar.gz + 1.5.10rc01.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1510b05.7z (LZMA-compressed, recommended) - lp1510b05.zip + lp1510r01.7z (LZMA-compressed, recommended) + lp1510r01.zip Other information: - 1.5.10beta05-README.txt - 1.5.10beta05-LICENSE.txt + 1.5.10rc01-README.txt + 1.5.10rc01-LICENSE.txt Changes since the last public release (1.5.9): @@ -56,7 +56,7 @@ Version 1.5.10beta04 [March 10, 2012] Fixed CMF optimization of non-IDAT compressed chunks, which was added at libpng-1.5.4. It sometimes produced too small of a window. -Version 1.5.10beta05 [March 16, 2012] +Version 1.5.10beta05 [March 10, 2012] Reject all iCCP chunks after the first, even if the first one is invalid. Issue a png_benign_error() instead of png_warning() about bad palette index. Fixed an off-by-one error in the palette index checking function. @@ -64,6 +64,9 @@ Version 1.5.10beta05 [March 16, 2012] instead of directly assigning string constants to png_textp members. This avoids compiler warnings when -Wwrite-strings is enabled. +Version 1.5.10rc01 [March 19, 2012] + No changes. + 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 218dc5ad8..62230ceff 100644 --- a/CHANGES +++ b/CHANGES @@ -3841,7 +3841,7 @@ Version 1.5.10beta04 [March 10, 2012] Fixed CMF optimization of non-IDAT compressed chunks, which was added at libpng-1.5.4. It sometimes produced too small of a window. -Version 1.5.10beta05 [March 16, 2012] +Version 1.5.10beta05 [March 10, 2012] Reject all iCCP chunks after the first, even if the first one is invalid. Issue a png_benign_error() instead of png_warning() about bad palette index. Fixed an off-by-one error in the palette index checking function. @@ -3849,6 +3849,9 @@ Version 1.5.10beta05 [March 16, 2012] instead of directly assigning string constants to png_textp members. This avoids compiler warnings when -Wwrite-strings is enabled. +Version 1.5.10rc01 [March 19, 2012] + No changes. + 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 e682c0876..012034f4a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -225,7 +225,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.10beta05 +# VERSION 15.${PNGLIB_RELEASE}.1.5.10rc01 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 4ca0dec47..82a508677 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.10beta05, March 10, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.5.10rc01, March 19, 2012, are Copyright (c) 2004, 2006-2011 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 -March 10, 2012 +March 19, 2012 diff --git a/README b/README index 9f17b5398..9ba1be5a2 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.10beta05 - March 10, 2012 (shared library 15.0) +README for libpng version 1.5.10rc01 - March 19, 2012 (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 a52a067a1..0f88a96e1 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.68 for libpng 1.5.10beta05. +# Generated by GNU Autoconf 2.68 for libpng 1.5.10rc01. # # Report bugs to . # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.10beta05' -PACKAGE_STRING='libpng 1.5.10beta05' +PACKAGE_VERSION='1.5.10rc01' +PACKAGE_STRING='libpng 1.5.10rc01' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1321,7 +1321,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.10beta05 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.10rc01 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1391,7 +1391,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.10beta05:";; + short | recursive ) echo "Configuration of libpng 1.5.10rc01:";; esac cat <<\_ACEOF @@ -1502,7 +1502,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.10beta05 +libpng configure 1.5.10rc01 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1925,7 +1925,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.10beta05, which was +It was created by libpng $as_me 1.5.10rc01, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2740,7 +2740,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.10beta05' + VERSION='1.5.10rc01' cat >>confdefs.h <<_ACEOF @@ -2804,7 +2804,7 @@ fi -PNGLIB_VERSION=1.5.10beta05 +PNGLIB_VERSION=1.5.10rc01 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=10 @@ -13417,7 +13417,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.10beta05, which was +This file was extended by libpng $as_me 1.5.10rc01, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13483,7 +13483,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.10beta05 +libpng config.status 1.5.10rc01 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 5e53575f7..75d47de2b 100644 --- a/configure.ac +++ b/configure.ac @@ -18,12 +18,12 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.5.10beta05], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.10rc01], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.10beta05 +PNGLIB_VERSION=1.5.10rc01 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=10 diff --git a/libpng-manual.txt b/libpng-manual.txt index 865f96fa8..f0e94f49d 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.10beta05 - March 10, 2012 + libpng version 1.5.10rc01 - March 19, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 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.10beta05 - March 10, 2012 + libpng versions 0.97, January 1998, through 1.5.10rc01 - March 19, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -4597,13 +4597,13 @@ Other rules can be inferred by inspecting the libpng source. XIV. Y2K Compliance in libpng -March 10, 2012 +March 19, 2012 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.10beta05 are Y2K compliant. It is my belief that earlier +upward through 1.5.10rc01 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that diff --git a/libpng.3 b/libpng.3 index ac3f15f23..e02dbf7f5 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "March 10, 2012" +.TH LIBPNG 3 "March 19, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.10beta05 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.10rc01 .SH SYNOPSIS \fI\fB @@ -981,7 +981,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.10beta05 - March 10, 2012 + libpng version 1.5.10rc01 - March 19, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -992,7 +992,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.10beta05 - March 10, 2012 + libpng versions 0.97, January 1998, through 1.5.10rc01 - March 19, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -5579,13 +5579,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XIV. Y2K Compliance in libpng -March 10, 2012 +March 19, 2012 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.10beta05 are Y2K compliant. It is my belief that earlier +upward through 1.5.10rc01 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that @@ -5853,7 +5853,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.10beta05 - March 10, 2012: +Libpng version 1.5.10rc01 - March 19, 2012: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -5876,7 +5876,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.10beta05, March 10, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.5.10rc01, March 19, 2012, 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 @@ -5975,7 +5975,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 10, 2012 +March 19, 2012 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 0f6aaea0c..34aab114a 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "March 10, 2012" +.TH LIBPNGPF 3 "March 19, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.10beta05 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.10rc01 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index ad82d1a76..82f16caa8 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "March 10, 2012" +.TH PNG 5 "March 19, 2012" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index f93fef76e..ac769eaac 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_10beta05 Your_png_h_is_not_version_1_5_10beta05; +typedef png_libpng_version_1_5_10rc01 Your_png_h_is_not_version_1_5_10rc01; /* 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 @@ -655,13 +655,13 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.10beta05 - March 10, 2012" PNG_STRING_NEWLINE \ + "libpng version 1.5.10rc01 - March 19, 2012" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2011 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.10beta05 - March 10, 2012\ + return "libpng version 1.5.10rc01 - March 19, 2012\ Copyright (c) 1998-2011 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 161802167..6eca5caf9 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.10beta05 - March 10, 2012 + * libpng version 1.5.10rc01 - March 19, 2012 * Copyright (c) 1998-2012 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.10beta05 - March 10, 2012: Glenn + * libpng versions 0.97, January 1998, through 1.5.10rc01 - March 19, 2012: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -204,7 +204,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.10beta05, March 10, 2012, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.10rc01, March 19, 2012, 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: @@ -316,13 +316,13 @@ * Y2K compliance in libpng: * ========================= * - * March 10, 2012 + * March 19, 2012 * * 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.10beta05 are Y2K compliant. It is my belief that + * upward through 1.5.10rc01 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 @@ -380,9 +380,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.10beta05" +#define PNG_LIBPNG_VER_STRING "1.5.10rc01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.10beta05 - March 10, 2012\n" + " libpng version 1.5.10rc01 - March 19, 2012\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -396,7 +396,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 05 +#define PNG_LIBPNG_VER_BUILD 01 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -413,7 +413,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_BETA +#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_RC /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -543,7 +543,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_10beta05; +typedef char* png_libpng_version_1_5_10rc01; /* 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 71d5e6b53..b1d01fbf4 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.10beta05 - March 10, 2012 + * libpng version 1.5.10rc01 - March 19, 2012 * * Copyright (c) 1998-2012 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 12fa42700..8761219b8 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1817,4 +1817,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_5_10beta05 Your_png_h_is_not_version_1_5_10beta05; +typedef png_libpng_version_1_5_10rc01 Your_png_h_is_not_version_1_5_10rc01; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 80642cd12..f975a5704 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.10beta05 - March 10, 2012 +libpng version 1.5.10rc01 - March 19, 2012 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 1e139a807..a7dd1033a 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@