From ff244b6181f2b87ceb5f4d84ca547a394adeb08e Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Wed, 24 Nov 2010 15:01:24 -0600 Subject: [PATCH] [master] Bump to version 1.4.5beta07 --- ANNOUNCE | 20 +++++++++-------- CHANGES | 2 ++ CMakeLists.txt | 2 +- INSTALL | 4 ++-- LICENSE | 4 ++-- README | 12 +++++----- configure | 22 +++++++++---------- configure.ac | 4 ++-- ...-1.4.5beta06.txt => libpng-1.4.5beta07.txt | 10 ++++----- libpng.3 | 22 +++++++++---------- libpngpf.3 | 4 ++-- png.5 | 2 +- png.c | 6 ++--- png.h | 20 ++++++++--------- pngconf.h | 2 +- pngpriv.h | 2 +- pngread.c | 2 +- pngrio.c | 2 +- pngrtran.c | 2 +- pngrutil.c | 2 +- pngset.c | 2 +- pngtest.c | 4 ++-- 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/png32ce.def | 2 +- scripts/pngos2.def | 2 +- scripts/pngwin.def | 2 +- 33 files changed, 94 insertions(+), 90 deletions(-) rename libpng-1.4.5beta06.txt => libpng-1.4.5beta07.txt (99%) diff --git a/ANNOUNCE b/ANNOUNCE index 0bd2a2d76..7ebf2abed 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.4.5beta06 - November 21, 2010 +Libpng 1.4.5beta07 - November 24, 2010 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.4.5beta06.tar.xz (LZMA-compressed, recommended) - 1.4.5beta06.tar.gz - 1.4.5beta06.tar.bz2 + 1.4.5beta07.tar.xz (LZMA-compressed, recommended) + 1.4.5beta07.tar.gz + 1.4.5beta07.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp145b06.zip - lp145b06.7z + lp145b07.zip + lp145b07.7z Other information: - 1.4.5beta06-README.txt - 1.4.5beta06-LICENSE.txt + 1.4.5beta07-README.txt + 1.4.5beta07-LICENSE.txt Changes since the last public release (1.4.4): @@ -46,7 +46,7 @@ version 1.4.5beta04 [November 8, 2010] version 1.4.5rc01 [November 19, 2010] No changes. -version 1.4.5beta05 [November 21, 2010] +version 1.4.5beta05 [November 24, 2010] Removed some extraneous parentheses that appeared in pngrutil.c of libpng-1.4.3beta01 Revised png_get_uint_32, png_get_int_32, png_get_uint_16 (Cosmin) @@ -70,6 +70,8 @@ version 1.4.5beta06 [November 21, 2010] with pngwio.c and pngwutil.c because the 'write' callback and zlib compression both fail to declare their input buffers with 'const'. +version 1.4.5beta07 [November 24, 2010] + Send comments/corrections/commendations to glennrp at users.sourceforge.net or 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 4368e12d3..02144eacc 100644 --- a/CHANGES +++ b/CHANGES @@ -2722,6 +2722,8 @@ version 1.4.5beta06 [November 21, 2010] with pngwio.c and pngwutil.c because the 'write' callback and zlib compression both fail to declare their input buffers with 'const'. +version 1.4.5beta07 [November 24, 2010] + Send comments/corrections/commendations to glennrp at users.sourceforge.net or 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 ef365f091..d8a39cbd2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -252,7 +252,7 @@ install(CODE ${PNG_CONFIG_INSTALL_CODE}) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 14.${PNGLIB_RELEASE}.1.4.5beta06 +# VERSION 14.${PNGLIB_RELEASE}.1.4.5beta07 VERSION 14.${PNGLIB_RELEASE}.0 SOVERSION 14 CLEAN_DIRECT_OUTPUT 1) diff --git a/INSTALL b/INSTALL index 3b5457b32..077bb23bc 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.4.5beta06 - November 21, 2010 +Installing libpng version 1.4.5beta07 - November 24, 2010 On Unix/Linux and similar systems, you can simply type @@ -46,7 +46,7 @@ to have access to the zlib.h and zconf.h include files that correspond to the version of zlib that's installed. You can rename the directories that you downloaded (they -might be called "libpng-1.4.5beta06" or "libpng14" and "zlib-1.2.3" +might be called "libpng-1.4.5beta07" or "libpng14" and "zlib-1.2.3" or "zlib123") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: diff --git a/LICENSE b/LICENSE index 2497463b6..c749ce06d 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.4.5beta06, November 21, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.4.5beta07, November 24, 2010, 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 @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -November 21, 2010 +November 24, 2010 diff --git a/README b/README index 717d965e9..5f12abbc5 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.4.5beta06 - November 21, 2010 (shared library 14.0) +README for libpng version 1.4.5beta07 - November 24, 2010 (shared library 14.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. @@ -185,9 +185,9 @@ Files in this distribution: makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF makefile symbol versioning, - (gcc, creates libpng14.so.14.1.4.5beta06) + (gcc, creates libpng14.so.14.1.4.5beta07) makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.5beta06) + (gcc, creates libpng14.so.14.1.4.5beta07) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr (Requires ansi2knr.c from @@ -209,12 +209,12 @@ Files in this distribution: makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX (cc, creates static lib) makefile.sggcc => Silicon Graphics - (gcc, creates libpng14.so.14.1.4.5beta06) + (gcc, creates libpng14.so.14.1.4.5beta07) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng14.so.14.1.4.5beta06) + (gcc, creates libpng14.so.14.1.4.5beta07) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng14.so.14.1.4.5beta06) + (gcc, creates libpng14.so.14.1.4.5beta07) makefile.32sunu => Sun Ultra 32-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc diff --git a/configure b/configure index d0c8588b3..70b3af89e 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.65 for libpng 1.4.5beta06. +# Generated by GNU Autoconf 2.65 for libpng 1.4.5beta07. # # Report bugs to . # @@ -562,8 +562,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.4.5beta06' -PACKAGE_STRING='libpng 1.4.5beta06' +PACKAGE_VERSION='1.4.5beta07' +PACKAGE_STRING='libpng 1.4.5beta07' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1292,7 +1292,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.4.5beta06 to adapt to many kinds of systems. +\`configure' configures libpng 1.4.5beta07 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1362,7 +1362,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.4.5beta06:";; + short | recursive ) echo "Configuration of libpng 1.4.5beta07:";; esac cat <<\_ACEOF @@ -1467,7 +1467,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.4.5beta06 +libpng configure 1.4.5beta07 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1892,7 +1892,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.4.5beta06, which was +It was created by libpng $as_me 1.4.5beta07, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2700,7 +2700,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.4.5beta06' + VERSION='1.4.5beta07' cat >>confdefs.h <<_ACEOF @@ -2764,7 +2764,7 @@ fi -PNGLIB_VERSION=1.4.5beta06 +PNGLIB_VERSION=1.4.5beta07 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 PNGLIB_RELEASE=5 @@ -12175,7 +12175,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.4.5beta06, which was +This file was extended by libpng $as_me 1.4.5beta07, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12241,7 +12241,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.4.5beta06 +libpng config.status 1.4.5beta07 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index b7cc3da18..2784abe95 100644 --- a/configure.ac +++ b/configure.ac @@ -16,14 +16,14 @@ dnl should not be necessary to regenerate configure if the time dnl stamps are correct AC_PREREQ(2.59) -AC_INIT([libpng], [1.4.5beta06], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.4.5beta07], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE dnl Version number stuff here: -PNGLIB_VERSION=1.4.5beta06 +PNGLIB_VERSION=1.4.5beta07 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 PNGLIB_RELEASE=5 diff --git a/libpng-1.4.5beta06.txt b/libpng-1.4.5beta07.txt similarity index 99% rename from libpng-1.4.5beta06.txt rename to libpng-1.4.5beta07.txt index 5a54dcd14..aa7aef45e 100644 --- a/libpng-1.4.5beta06.txt +++ b/libpng-1.4.5beta07.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.5beta06 - November 21, 2010 + libpng version 1.4.5beta07 - November 24, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.4.5beta06 - November 21, 2010 + libpng versions 0.97, January 1998, through 1.4.5beta07 - November 24, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -903,7 +903,7 @@ things. As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was added. It expands the sample depth without changing tRNS to alpha. -As of libpng version 1.4.5beta06, not all possible expansions are supported. +As of libpng version 1.4.5beta07, not all possible expansions are supported. In the following table, the 01 means grayscale with depth<8, 31 means indexed with depth<8, other numerals represent the color type, "T" means @@ -3297,13 +3297,13 @@ Other rules can be inferred by inspecting the libpng source. XIII. Y2K Compliance in libpng -November 21, 2010 +November 24, 2010 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.4.5beta06 are Y2K compliant. It is my belief that earlier +upward through 1.4.5beta07 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 888e58a45..6a8000e0f 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "November 21, 2010" +.TH LIBPNG 3 "November 24, 2010" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.5beta06 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.5beta07 .SH SYNOPSIS \fI\fB @@ -785,7 +785,7 @@ Following is a copy of the libpng.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.4.5beta06 - November 21, 2010 + libpng version 1.4.5beta07 - November 24, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -796,7 +796,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.4.5beta06 - November 21, 2010 + libpng versions 0.97, January 1998, through 1.4.5beta07 - November 24, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -1688,7 +1688,7 @@ things. As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was added. It expands the sample depth without changing tRNS to alpha. -As of libpng version 1.4.5beta06, not all possible expansions are supported. +As of libpng version 1.4.5beta07, not all possible expansions are supported. In the following table, the 01 means grayscale with depth<8, 31 means indexed with depth<8, other numerals represent the color type, "T" means @@ -4082,13 +4082,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XIII. Y2K Compliance in libpng -November 21, 2010 +November 24, 2010 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.4.5beta06 are Y2K compliant. It is my belief that earlier +upward through 1.4.5beta07 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 @@ -4277,7 +4277,7 @@ the first widely used release: 1.4.4 14 10404 14.so.14.4[.0] 1.4.5beta01-04 14 10405 14.so.14.5[.0] 1.4.5rc01 14 10405 14.so.14.5[.0] - 1.4.5beta05-06 14 10405 14.so.14.5[.0] + 1.4.5beta05-07 14 10405 14.so.14.5[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -4333,7 +4333,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.5beta06 - November 21, 2010: +Libpng version 1.4.5beta07 - November 24, 2010: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -4356,7 +4356,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.4.5beta06, November 21, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.4.5beta07, November 24, 2010, 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 @@ -4455,7 +4455,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -November 21, 2010 +November 24, 2010 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index fcae18463..015e3007b 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "November 21, 2010" +.TH LIBPNGPF 3 "November 24, 2010" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.5beta06 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.5beta07 (private functions) .SH SYNOPSIS \fB#include \fP diff --git a/png.5 b/png.5 index 223e3b641..7bbed7dd2 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "November 21, 2010" +.TH PNG 5 "November 24, 2010" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 0e6f29321..f7c31d533 100644 --- a/png.c +++ b/png.c @@ -17,7 +17,7 @@ #include "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_4_5beta06 Your_png_h_is_not_version_1_4_5beta06; +typedef version_1_4_5beta07 Your_png_h_is_not_version_1_4_5beta07; /* 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 @@ -547,13 +547,13 @@ png_get_copyright(png_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.4.5beta06 - November 21, 2010" PNG_STRING_NEWLINE \ + "libpng version 1.4.5beta07 - November 24, 2010" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2010 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 ((png_charp) "libpng version 1.4.5beta06 - November 21, 2010\ + return ((png_charp) "libpng version 1.4.5beta07 - November 24, 2010\ Copyright (c) 1998-2010 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 895daa776..79081f30f 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.4.5beta06 - November 21, 2010 + * libpng version 1.4.5beta07 - November 24, 2010 * Copyright (c) 1998-2010 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.4.5beta06 - November 21, 2010: Glenn + * libpng versions 0.97, January 1998, through 1.4.5beta07 - November 24, 2010: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -150,7 +150,7 @@ * 1.4.4 14 10404 14.so.14.4[.0] * 1.4.5beta01-04 14 10405 14.so.14.5[.0] * 1.4.5rc01 14 10405 14.so.14.5[.0] - * 1.4.5beta05-06 14 10405 14.so.14.5[.0] + * 1.4.5beta05-07 14 10405 14.so.14.5[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -182,7 +182,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.4.5beta06, November 21, 2010, are + * libpng versions 1.2.6, August 15, 2004, through 1.4.5beta07, November 24, 2010, 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: @@ -294,13 +294,13 @@ * Y2K compliance in libpng: * ========================= * - * November 21, 2010 + * November 24, 2010 * * 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.4.5beta06 are Y2K compliant. It is my belief that earlier + * upward through 1.4.5beta07 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 @@ -356,9 +356,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.4.5beta06" +#define PNG_LIBPNG_VER_STRING "1.4.5beta07" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.5beta06 - November 21, 2010\n" + " libpng version 1.4.5beta07 - November 24, 2010\n" #define PNG_LIBPNG_VER_SONUM 14 #define PNG_LIBPNG_VER_DLLNUM 14 @@ -371,7 +371,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 06 +#define PNG_LIBPNG_VER_BUILD 07 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -1480,7 +1480,7 @@ struct png_struct_def /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -typedef png_structp version_1_4_5beta06; +typedef png_structp version_1_4_5beta07; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngconf.h b/pngconf.h index 24595295e..eace524ef 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.4.5beta06 - November 21, 2010 + * libpng version 1.4.5beta07 - November 24, 2010 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2010 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpriv.h b/pngpriv.h index e6ca46ccf..106f85ed5 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.4.5beta06 - November 21, 2010 + * libpng version 1.4.5beta07 - November 24, 2010 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2010 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngread.c b/pngread.c index b3d13e4da..e99c75ded 100644 --- a/pngread.c +++ b/pngread.c @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.4.5 [November 21, 2010] + * Last changed in libpng 1.4.5 [November 24, 2010] * Copyright (c) 1998-2010 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/pngrio.c b/pngrio.c index fa7942ea5..b267fb27b 100644 --- a/pngrio.c +++ b/pngrio.c @@ -1,7 +1,7 @@ /* pngrio.c - functions for data input * - * Last changed in libpng 1.4.5 [November 21, 2010] + * Last changed in libpng 1.4.5 [November 24, 2010] * Copyright (c) 1998-2010 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/pngrtran.c b/pngrtran.c index 703a8c9ab..5380b1a1c 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,7 +1,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.4.5 [November 21, 2010] + * Last changed in libpng 1.4.5 [November 24, 2010] * Copyright (c) 1998-2010 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/pngrutil.c b/pngrutil.c index e979d24e2..4aa0f76c9 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.4.5 [November 21, 2010] + * Last changed in libpng 1.4.5 [November 24, 2010] * Copyright (c) 1998-2010 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/pngset.c b/pngset.c index 6c92e8dc3..5dddfc8c1 100644 --- a/pngset.c +++ b/pngset.c @@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.4.5 [November 21, 2010] + * Last changed in libpng 1.4.5 [November 24, 2010] * Copyright (c) 1998-2010 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 2f21c2249..89973b658 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1,7 +1,7 @@ /* pngtest.c - a simple test program to test libpng * - * Last changed in libpng 1.4.5 [November 21, 2010] + * Last changed in libpng 1.4.5 [November 24, 2010] * Copyright (c) 1998-2010 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.) @@ -1687,4 +1687,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_4_5beta06 your_png_h_is_not_version_1_4_5beta06; +typedef version_1_4_5beta07 your_png_h_is_not_version_1_4_5beta07; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 11d764be9..18f3436f5 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.4.5beta06 - November 21, 2010 +libpng version 1.4.5beta07 - November 24, 2010 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 661919d44..96326d0b3 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@