From f512ca7625f20cdcfaba661e252ad323b5119905 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 2 May 2011 12:21:42 -0500 Subject: [PATCH] [master] Bump to version 1.4.8beta01 --- ANNOUNCE | 22 ++++++++++++-------- CHANGES | 2 +- CMakeLists.txt | 4 ++-- INSTALL | 4 ++-- LICENSE | 4 ++-- README | 12 +++++------ configure | 24 +++++++++++----------- configure.ac | 6 +++--- libpng-1.4.7.txt => libpng-1.4.8beta01.txt | 10 ++++----- libpng.3 | 21 ++++++++++--------- libpngpf.3 | 4 ++-- png.5 | 2 +- png.c | 6 +++--- png.h | 23 +++++++++++---------- pngconf.h | 2 +- pngget.c | 2 +- pngmem.c | 2 +- pngpriv.h | 2 +- pngrtran.c | 2 +- pngtest.c | 2 +- pngtrans.c | 2 +- pngwutil.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.cegcc | 2 +- scripts/makefile.linux | 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 +- 35 files changed, 101 insertions(+), 95 deletions(-) rename libpng-1.4.7.txt => libpng-1.4.8beta01.txt (99%) diff --git a/ANNOUNCE b/ANNOUNCE index 08b9d83b5..f342df566 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,31 +1,35 @@ -Libpng 1.4.7 - April 10, 2011 +Libpng 1.4.8beta01 - May 2, 2011 -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.4.7.tar.xz (LZMA-compressed, recommended) - libpng-1.4.7.tar.gz - libpng-1.4.7.tar.bz2 + 1.4.8beta01.tar.xz (LZMA-compressed, recommended) + 1.4.8beta01.tar.gz + 1.4.8beta01.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lpng147.7z (LZMA-compressed, recommended) - lpng147.zip + lp148b01.7z (LZMA-compressed, recommended) + lp148b01.zip Other information: - libpng-1.4.7-README.txt - libpng-1.4.7-LICENSE.txt + 1.4.8beta01-README.txt + 1.4.8beta01-LICENSE.txt Changes since the last public release (1.4.6): +version 1.4.7rc01 [April 9, 2010] Relocated misplaced new declarations in pngwutil.c. +` +version 1.4.7 [May 2, 2011] Disabled PNG_PEDANTIC_WARNINGS for all MSC versions as in libpng-1.4.5. Send comments/corrections/commendations to glennrp at users.sourceforge.net diff --git a/CHANGES b/CHANGES index 6574a0bea..6e0007003 100644 --- a/CHANGES +++ b/CHANGES @@ -2791,7 +2791,7 @@ version 1.4.6 [April 8, 2011] version 1.4.7rc01 [April 9, 2011] Relocated misplaced new declarations in pngwutil.c. -version 1.4.7 [April 10, 2011] +version 1.4.7 [May 2, 2011] Disabled PNG_PEDANTIC_WARNINGS for all MSC versions as in libpng-1.4.5. diff --git a/CMakeLists.txt b/CMakeLists.txt index ec44fc3fc..4acae2d3e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,7 @@ enable_testing() set(PNGLIB_MAJOR 1) set(PNGLIB_MINOR 4) -set(PNGLIB_RELEASE 7) +set(PNGLIB_RELEASE 8) set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR}) set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE}) @@ -255,7 +255,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.7 +# VERSION 14.${PNGLIB_RELEASE}.1.4.8beta01 VERSION 14.${PNGLIB_RELEASE}.0 SOVERSION 14 CLEAN_DIRECT_OUTPUT 1) diff --git a/INSTALL b/INSTALL index efe3b358e..90fdf9deb 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.4.7 - April 10, 2011 +Installing libpng version 1.4.8beta01 - May 2, 2011 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.7" or "libpng14" and "zlib-1.2.3" +might be called "libpng-1.4.8beta01" 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 4915b9440..a86dfaef5 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.7, April 10, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.4.8beta01, May 2, 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 @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -April 10, 2011 +May 2, 2011 diff --git a/README b/README index fe1b500e0..ee705a45f 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.4.7 - April 10, 2011 (shared library 14.0) +README for libpng version 1.4.8beta01 - May 2, 2011 (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.7) + (gcc, creates libpng14.so.14.1.4.8beta01) makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.7) + (gcc, creates libpng14.so.14.1.4.8beta01) 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.7) + (gcc, creates libpng14.so.14.1.4.8beta01) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng14.so.14.1.4.7) + (gcc, creates libpng14.so.14.1.4.8beta01) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng14.so.14.1.4.7) + (gcc, creates libpng14.so.14.1.4.8beta01) 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 f24d61288..0afa3a241 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.7. +# Generated by GNU Autoconf 2.65 for libpng 1.4.8beta01. # # Report bugs to . # @@ -562,8 +562,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.4.7' -PACKAGE_STRING='libpng 1.4.7' +PACKAGE_VERSION='1.4.8beta01' +PACKAGE_STRING='libpng 1.4.8beta01' 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.7 to adapt to many kinds of systems. +\`configure' configures libpng 1.4.8beta01 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.7:";; + short | recursive ) echo "Configuration of libpng 1.4.8beta01:";; 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.7 +libpng configure 1.4.8beta01 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.7, which was +It was created by libpng $as_me 1.4.8beta01, 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.7' + VERSION='1.4.8beta01' cat >>confdefs.h <<_ACEOF @@ -2764,10 +2764,10 @@ fi -PNGLIB_VERSION=1.4.7 +PNGLIB_VERSION=1.4.8beta01 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 -PNGLIB_RELEASE=7 +PNGLIB_RELEASE=8 @@ -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.7, which was +This file was extended by libpng $as_me 1.4.8beta01, 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.7 +libpng config.status 1.4.8beta01 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 3ea68aa05..671ec660f 100644 --- a/configure.ac +++ b/configure.ac @@ -16,17 +16,17 @@ dnl should not be necessary to regenerate configure if the time dnl stamps are correct AC_PREREQ(2.59) -AC_INIT([libpng], [1.4.7], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.4.8beta01], [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.7 +PNGLIB_VERSION=1.4.8beta01 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 -PNGLIB_RELEASE=7 +PNGLIB_RELEASE=8 dnl End of version number stuff diff --git a/libpng-1.4.7.txt b/libpng-1.4.8beta01.txt similarity index 99% rename from libpng-1.4.7.txt rename to libpng-1.4.8beta01.txt index ac420234d..4c0e732cd 100644 --- a/libpng-1.4.7.txt +++ b/libpng-1.4.8beta01.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.7 - April 10, 2011 + libpng version 1.4.8beta01 - May 2, 2011 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.7 - April 10, 2011 + libpng versions 0.97, January 1998, through 1.4.8beta01 - May 2, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -905,7 +905,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.7, not all possible expansions are supported. +As of libpng version 1.4.8beta01, 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 @@ -3307,13 +3307,13 @@ Other rules can be inferred by inspecting the libpng source. XIII. Y2K Compliance in libpng -April 10, 2011 +May 2, 2011 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.7 are Y2K compliant. It is my belief that earlier +upward through 1.4.8beta01 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 339aaa635..80a0da430 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "April 10, 2011" +.TH LIBPNG 3 "May 2, 2011" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.7 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.8beta01 .SH SYNOPSIS \fI\fB @@ -895,7 +895,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.4.7 - April 10, 2011 + libpng version 1.4.8beta01 - May 2, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -906,7 +906,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.4.7 - April 10, 2011 + libpng versions 0.97, January 1998, through 1.4.8beta01 - May 2, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -1800,7 +1800,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.7, not all possible expansions are supported. +As of libpng version 1.4.8beta01, 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 @@ -4202,13 +4202,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XIII. Y2K Compliance in libpng -April 10, 2011 +May 2, 2011 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.7 are Y2K compliant. It is my belief that earlier +upward through 1.4.8beta01 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 @@ -4405,6 +4405,7 @@ the first widely used release: 1.4.6 14 10406 14.so.14.6[.0] 1.4.7rc01 14 10407 14.so.14.7[.0] 1.4.7 14 10407 14.so.14.7[.0] + 1.4.8beta01 14 10408 14.so.14.8[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -4460,7 +4461,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.7 - April 10, 2011: +Libpng version 1.4.8beta01 - May 2, 2011: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -4483,7 +4484,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.4.7, April 10, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.4.8beta01, May 2, 2011, 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 @@ -4582,7 +4583,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -April 10, 2011 +May 2, 2011 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 0b1d39f16..31b4da37e 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "April 10, 2011" +.TH LIBPNGPF 3 "May 2, 2011" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.7 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.8beta01 (private functions) .SH SYNOPSIS \fB#include \fP diff --git a/png.5 b/png.5 index 7289bdc7e..df069d458 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "April 10, 2011" +.TH PNG 5 "May 2, 2011" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 2316a8e25..0d5b881f6 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_7 Your_png_h_is_not_version_1_4_7; +typedef version_1_4_8beta01 Your_png_h_is_not_version_1_4_8beta01; /* 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_const_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.4.7 - April 10, 2011" PNG_STRING_NEWLINE \ + "libpng version 1.4.8beta01 - May 2, 2011" 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.7 - April 10, 2011\ + return ((png_charp) "libpng version 1.4.8beta01 - May 2, 2011\ 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 21b670be7..f44338381 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.4.7 - April 10, 2011 + * libpng version 1.4.8beta01 - May 2, 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.4.7 - April 10, 2011: Glenn + * libpng versions 0.97, January 1998, through 1.4.8beta01 - May 2, 2011: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -158,6 +158,7 @@ * 1.4.6 14 10406 14.so.14.6[.0] * 1.4.7rc01 14 10407 14.so.14.7[.0] * 1.4.7 14 10407 14.so.14.7[.0] + * 1.4.8beta01 14 10408 14.so.14.8[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -189,7 +190,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.4.7, April 10, 2011, are + * libpng versions 1.2.6, August 15, 2004, through 1.4.8beta01, May 2, 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: @@ -301,13 +302,13 @@ * Y2K compliance in libpng: * ========================= * - * April 10, 2011 + * May 2, 2011 * * 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.7 are Y2K compliant. It is my belief that earlier + * upward through 1.4.8beta01 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 @@ -363,9 +364,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.4.7" +#define PNG_LIBPNG_VER_STRING "1.4.8beta01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.7 - April 10, 2011\n" + " libpng version 1.4.8beta01 - May 2, 2011\n" #define PNG_LIBPNG_VER_SONUM 14 #define PNG_LIBPNG_VER_DLLNUM 14 @@ -373,12 +374,12 @@ /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ #define PNG_LIBPNG_VER_MAJOR 1 #define PNG_LIBPNG_VER_MINOR 4 -#define PNG_LIBPNG_VER_RELEASE 7 +#define PNG_LIBPNG_VER_RELEASE 8 /* 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 @@ -403,7 +404,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 10407 /* 1.4.7 */ +#define PNG_LIBPNG_VER 10408 /* 1.4.8 */ #ifndef PNG_VERSION_INFO_ONLY /* Include the compression library's header */ @@ -1489,7 +1490,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_7; +typedef png_structp version_1_4_8beta01; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngconf.h b/pngconf.h index 397b75fa2..3fc1926d8 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.4.7 - April 10, 2011 + * libpng version 1.4.8beta01 - May 2, 2011 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2011 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngget.c b/pngget.c index cd2054ce8..152dead8d 100644 --- a/pngget.c +++ b/pngget.c @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * Last changed in libpng 1.4.6 [April 10, 2011] + * Last changed in libpng 1.4.6 [April 8, 2010] * 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.) diff --git a/pngmem.c b/pngmem.c index 911f36881..44a555916 100644 --- a/pngmem.c +++ b/pngmem.c @@ -1,7 +1,7 @@ /* pngmem.c - stub functions for memory allocation * - * Last changed in libpng 1.4.6 [April 10, 2011] + * Last changed in libpng 1.4.6 [April 8, 2010] * 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.) diff --git a/pngpriv.h b/pngpriv.h index 44197cabc..f61146d7f 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.4.7 - April 10, 2011 + * libpng version 1.4.8beta01 - May 2, 2011 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2011 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrtran.c b/pngrtran.c index a475f9a9a..df4920ca5 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.6 [%RDATE%] + * Last changed in libpng 1.4.6 [April 8, 2010] * 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.) diff --git a/pngtest.c b/pngtest.c index ba4c4c74a..5a315e6c8 100644 --- a/pngtest.c +++ b/pngtest.c @@ -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_7 your_png_h_is_not_version_1_4_7; +typedef version_1_4_8beta01 your_png_h_is_not_version_1_4_8beta01; diff --git a/pngtrans.c b/pngtrans.c index 05eb2d05a..d19834386 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -1,7 +1,7 @@ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * - * Last changed in libpng 1.4.6 [April 10, 2011] + * Last changed in libpng 1.4.6 [ April 8, 2010] * 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.) diff --git a/pngwutil.c b/pngwutil.c index f97c3d157..1077cf4d1 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * Last changed in libpng 1.4.1 [February 25, 2010] + * Last changed in libpng 1.4.7 [April 8, 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/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 244925607..9280525c8 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.4.7 - April 10, 2011 +libpng version 1.4.8beta01 - May 2, 2011 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 8471f9b55..685a82e90 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@