diff --git a/CMakeLists.txt b/CMakeLists.txt index 6bc105891..c07f808ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -264,7 +264,7 @@ install(CODE ${PNG_CONFIG_INSTALL_CODE}) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 15.${PNGLIB_RELEASE}.1.5.1beta03 +# VERSION 15.${PNGLIB_RELEASE}.1.5.1beta04 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index bb168572c..9ba9d7d1f 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.1beta03, January 15, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.5.1beta04, January 15, 2011, are Copyright (c) 2004, 2006-2010 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 8e2b1c17e..fffbf0427 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.1beta03 - January 15, 2011 (shared library 15.0) +README for libpng version 1.5.1beta04 - January 15, 2011 (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 6f83310d9..a2ab29ce2 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.1beta03 +# Generated by GNU Autoconf 2.68 for libpng 1.5.1beta04 # # Report bugs to . # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.1beta03' -PACKAGE_STRING='libpng 1.5.1beta03' +PACKAGE_VERSION='1.5.1beta04' +PACKAGE_STRING='libpng 1.5.1beta04' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1306,7 +1306,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.1beta03 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.1beta04 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1376,7 +1376,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.1beta03:";; + short | recursive ) echo "Configuration of libpng 1.5.1beta04:";; esac cat <<\_ACEOF @@ -1484,7 +1484,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.1beta03 +libpng configure 1.5.1beta04 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1907,7 +1907,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.1beta03, which was +It was created by libpng $as_me 1.5.1beta04, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2722,7 +2722,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.1beta03' + VERSION='1.5.1beta04' cat >>confdefs.h <<_ACEOF @@ -2786,7 +2786,7 @@ fi -PNGLIB_VERSION=1.5.1beta03 +PNGLIB_VERSION=1.5.1beta04 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=1 @@ -12993,7 +12993,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.1beta03, which was +This file was extended by libpng $as_me 1.5.1beta04, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13059,7 +13059,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.1beta03 +libpng config.status 1.5.1beta04 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 740e5f1c5..f999b203a 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.1beta03], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.1beta04], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.1beta03 +PNGLIB_VERSION=1.5.1beta04 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=1 diff --git a/libpngpf.3 b/libpngpf.3 index e27b2aa38..7553863c3 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "January 15, 2011" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.1beta03 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.1beta04 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index 993921fef..a71a9fd5c 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_1beta03 Your_png_h_is_not_version_1_5_1beta03; +typedef png_libpng_version_1_5_1beta04 Your_png_h_is_not_version_1_5_1beta04; /* 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 @@ -555,13 +555,13 @@ png_get_copyright(png_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.1beta03 - January 15, 2011" PNG_STRING_NEWLINE \ + "libpng version 1.5.1beta04 - January 15, 2011" 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.1beta03 - January 15, 2011\ + return "libpng version 1.5.1beta04 - January 15, 2011\ 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 dd47979e0..e0ad92beb 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.1beta03 - January 15, 2011 + * libpng version 1.5.1beta04 - January 15, 2011 * Copyright (c) 1998-2011 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.1beta03 - January 15, 2011: Glenn + * libpng versions 0.97, January 1998, through 1.5.1beta04 - January 15, 2011: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -177,7 +177,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.1beta03, January 15, 2011, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.1beta04, January 15, 2011, 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: @@ -295,7 +295,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.5.1beta03 are Y2K compliant. It is my belief that + * upward through 1.5.1beta04 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 @@ -351,9 +351,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.1beta03" +#define PNG_LIBPNG_VER_STRING "1.5.1beta04" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.1beta03 - January 15, 2011\n" + " libpng version 1.5.1beta04 - January 15, 2011\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -366,7 +366,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 03 +#define PNG_LIBPNG_VER_BUILD 04 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -508,7 +508,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_1beta03; +typedef char* png_libpng_version_1_5_1beta04; /* 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 83bcc8048..d7747b1e0 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.1beta03 - (PENDING RELEASE) + * libpng version 1.5.1beta04 - (PENDING RELEASE) * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index f5117dd95..9c9039585 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1784,4 +1784,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_1beta03 Your_png_h_is_not_version_1_5_1beta03; +typedef png_libpng_version_1_5_1beta04 Your_png_h_is_not_version_1_5_1beta04; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 8044b6149..cd63a23d6 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.1beta03 - January 15, 2011 +libpng version 1.5.1beta04 - January 15, 2011 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index c35d8f5d1..27f746a19 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@