diff --git a/ANNOUNCE b/ANNOUNCE index 17487381..87d6dd89 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.2.41beta08 - October 30, 2009 +Libpng 1.2.41beta09 - October 30, 2009 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,36 +9,36 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.2.41beta08.tar.xz (LZMA-compressed, recommended) - libpng-1.2.41beta08.tar.gz - libpng-1.2.41beta08.tar.bz2 + libpng-1.2.41beta09.tar.xz (LZMA-compressed, recommended) + libpng-1.2.41beta09.tar.gz + libpng-1.2.41beta09.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.41beta08-no-config.tar.xz (LZMA-compressed, recommended) - libpng-1.2.41beta08-no-config.tar.gz - libpng-1.2.41beta08-no-config.tar.bz2 + libpng-1.2.41beta09-no-config.tar.xz (LZMA-compressed, recommended) + libpng-1.2.41beta09-no-config.tar.gz + libpng-1.2.41beta09-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1241b08.zip - lp1241b08.7z - lp1241b08.tar.bz2 + lp1241b09.zip + lp1241b09.7z + lp1241b09.tar.bz2 Project files - libpng-1.2.41beta08-project-netware.zip - libpng-1.2.41beta08-project-wince.zip + libpng-1.2.41beta09-project-netware.zip + libpng-1.2.41beta09-project-wince.zip Other information: - libpng-1.2.41beta08-README.txt - libpng-1.2.41beta08-KNOWNBUGS.txt - libpng-1.2.41beta08-LICENSE.txt - libpng-1.2.41beta08-Y2K-compliance.txt - libpng-1.2.41beta08-[previous version]-diff.txt + libpng-1.2.41beta09-README.txt + libpng-1.2.41beta09-KNOWNBUGS.txt + libpng-1.2.41beta09-LICENSE.txt + libpng-1.2.41beta09-Y2K-compliance.txt + libpng-1.2.41beta09-[previous version]-diff.txt Changes since the last public release (1.2.40): @@ -81,6 +81,10 @@ version 1.2.41beta08 [October 30, 2009] Ported functions from libpng-1.4.0rc01: png_calloc(), png_get_io_state(), png_get_io_chunk_name(), png_set_premultiply_alpha, and png_do_read_premultiply_alpha(). + Relocated png_do_chop() ahead of building gamma tables in pngrtran.c + This avoids building 16-bit gamma tables unnecessarily. + +version 1.2.41beta09 [October 30, 2009] Send comments/corrections/commendations to png-mng-implement at lists.sf.net diff --git a/CHANGES b/CHANGES index 7d3eedf4..ead784e2 100644 --- a/CHANGES +++ b/CHANGES @@ -2511,6 +2511,10 @@ version 1.2.41beta08 [October 30, 2009] Ported functions from libpng-1.4.0rc01: png_calloc(), png_get_io_state(), png_get_io_chunk_name(), png_set_premultiply_alpha, and png_do_read_premultiply_alpha(). + Relocated png_do_chop() ahead of building gamma tables in pngrtran.c + This avoids building 16-bit gamma tables unnecessarily. + +version 1.2.41beta09 [October 30, 2009] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/INSTALL b/INSTALL index dc6cb6ad..0645ed28 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.2.41beta08 - October 30, 2009 +Installing libpng version 1.2.41beta09 - October 30, 2009 On Unix/Linux and similar systems, you can simply type @@ -44,7 +44,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.2.41beta08" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.2.41beta09" or "lpng109" and "zlib-1.2.1" or "zlib121") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: @@ -101,9 +101,9 @@ include CMakeLists.txt => "cmake" script makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF makefile symbol versioning, - gcc, creates libpng12.so.0.1.2.41beta08) + gcc, creates libpng12.so.0.1.2.41beta09) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.41beta08) + (gcc, creates libpng12.so.0.1.2.41beta09) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr (Requires ansi2knr.c from @@ -125,14 +125,14 @@ include makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.sggcc => Silicon Graphics (gcc, - creates libpng12.so.0.1.2.41beta08) + creates libpng12.so.0.1.2.41beta09) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.41beta08) + creates libpng12.so.0.1.2.41beta09) makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc, - creates libpng12.so.0.1.2.41beta08) + creates libpng12.so.0.1.2.41beta09) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.41beta08) + creates libpng12.so.0.1.2.41beta09) 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/KNOWNBUG b/KNOWNBUG index 6078db7c..bb860dd0 100644 --- a/KNOWNBUG +++ b/KNOWNBUG @@ -1,5 +1,5 @@ -Known bugs in libpng version 1.2.41beta08 +Known bugs in libpng version 1.2.41beta09 1. February 23, 2006: The custom makefiles don't build libpng with -lz. diff --git a/LICENSE b/LICENSE index daa24c1c..e890df28 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.2.41beta08, October 30, 2009, are +libpng versions 1.2.6, August 15, 2004, through 1.2.41beta09, October 30, 2009, are Copyright (c) 2004, 2006-2009 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/Makefile.am b/Makefile.am index d86ca172..e5a9fd26 100644 --- a/Makefile.am +++ b/Makefile.am @@ -86,7 +86,7 @@ EXTRA_DIST= \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.2.41beta08.txt pngvcrd.c + example.c libpng-1.2.41beta09.txt pngvcrd.c CLEANFILES= pngout.png libpng12.pc libpng12-config libpng.vers \ libpng.sym diff --git a/Makefile.in b/Makefile.in index 58d62a1a..4681d030 100644 --- a/Makefile.in +++ b/Makefile.in @@ -352,7 +352,7 @@ EXTRA_DIST = \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.2.41beta08.txt pngvcrd.c + example.c libpng-1.2.41beta09.txt pngvcrd.c CLEANFILES = pngout.png libpng12.pc libpng12-config libpng.vers \ libpng.sym diff --git a/README b/README index c482fe0e..b6c913be 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.2.41beta08 - October 30, 2009 (shared library 12.0) +README for libpng version 1.2.41beta09 - October 30, 2009 (shared library 12.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. @@ -194,11 +194,11 @@ Files in this distribution: descrip.mms => VMS makefile for MMS or MMK makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF makefile symbol versioning, - gcc, creates libpng12.so.0.1.2.41beta08) + gcc, creates libpng12.so.0.1.2.41beta09) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.41beta08) + (gcc, creates libpng12.so.0.1.2.41beta09) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.41beta08, + (gcc, creates libpng12.so.0.1.2.41beta09, uses assembler code tuned for Intel MMX platform) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with @@ -220,12 +220,12 @@ Files in this distribution: makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX (cc, creates static lib) makefile.sggcc => Silicon Graphics - (gcc, creates libpng12.so.0.1.2.41beta08) + (gcc, creates libpng12.so.0.1.2.41beta09) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.41beta08) + (gcc, creates libpng12.so.0.1.2.41beta09) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.41beta08) + (gcc, creates libpng12.so.0.1.2.41beta09) 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/Y2KINFO b/Y2KINFO index 9306cbd4..b4701c65 100644 --- a/Y2KINFO +++ b/Y2KINFO @@ -7,7 +7,7 @@ an official declaration. This is your unofficial assurance that libpng from version 0.71 and - upward through 1.2.41beta08 are Y2K compliant. It is my belief that earlier + upward through 1.2.41beta09 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 diff --git a/configure b/configure index 6b72abd5..01bcd91a 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.64 for libpng 1.2.41beta08. +# Generated by GNU Autoconf 2.64 for libpng 1.2.41beta09. # # Report bugs to . # @@ -698,8 +698,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.2.41beta08' -PACKAGE_STRING='libpng 1.2.41beta08' +PACKAGE_VERSION='1.2.41beta09' +PACKAGE_STRING='libpng 1.2.41beta09' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1432,7 +1432,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.2.41beta08 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.41beta09 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1502,7 +1502,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.2.41beta08:";; + short | recursive ) echo "Configuration of libpng 1.2.41beta09:";; esac cat <<\_ACEOF @@ -1609,7 +1609,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.2.41beta08 +libpng configure 1.2.41beta09 generated by GNU Autoconf 2.64 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2034,7 +2034,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.2.41beta08, which was +It was created by libpng $as_me 1.2.41beta09, which was generated by GNU Autoconf 2.64. Invocation command line was $ $0 $@ @@ -2842,7 +2842,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.2.41beta08' + VERSION='1.2.41beta09' cat >>confdefs.h <<_ACEOF @@ -2906,7 +2906,7 @@ fi -PNGLIB_VERSION=1.2.41beta08 +PNGLIB_VERSION=1.2.41beta09 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=41 @@ -12047,7 +12047,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.2.41beta08, which was +This file was extended by libpng $as_me 1.2.41beta09, which was generated by GNU Autoconf 2.64. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12111,7 +12111,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -libpng config.status 1.2.41beta08 +libpng config.status 1.2.41beta09 configured by $0, generated by GNU Autoconf 2.64, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index bee34a5a..edec2689 100644 --- a/configure.ac +++ b/configure.ac @@ -18,12 +18,12 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.2.41beta08], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.41beta09], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.41beta08 +PNGLIB_VERSION=1.2.41beta09 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=41 diff --git a/libpng-1.2.41beta08.txt b/libpng-1.2.41beta09.txt similarity index 99% rename from libpng-1.2.41beta08.txt rename to libpng-1.2.41beta09.txt index e0893171..5b5378fb 100644 --- a/libpng-1.2.41beta08.txt +++ b/libpng-1.2.41beta09.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.41beta08 - October 30, 2009 + libpng version 1.2.41beta09 - October 30, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 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.2.41beta08 - October 30, 2009 + libpng versions 0.97, January 1998, through 1.2.41beta09 - October 30, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -3152,7 +3152,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.2.41beta08 are Y2K compliant. It is my belief that earlier +upward through 1.2.41beta09 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 79c6bb15..1d44f900 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "October 30, 2009" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.41beta08 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.41beta09 .SH SYNOPSIS \fI\fB @@ -821,7 +821,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.2.41beta08 - October 30, 2009 + libpng version 1.2.41beta09 - October 30, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -832,7 +832,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.2.41beta08 - October 30, 2009 + libpng versions 0.97, January 1998, through 1.2.41beta09 - October 30, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -3973,7 +3973,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.2.41beta08 are Y2K compliant. It is my belief that earlier +upward through 1.2.41beta09 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 @@ -4257,7 +4257,7 @@ the first widely used release: 1.0.49 10 10049 10.so.0.49[.0] 1.2.40 13 10240 12.so.0.40[.0] 1.0.50 10 10050 10.so.0.50[.0] - 1.2.41beta01-08 13 10241 12.so.0.41[.0] + 1.2.41beta01-09 13 10241 12.so.0.41[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -4313,7 +4313,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.41beta08 - October 30, 2009: +Libpng version 1.2.41beta09 - October 30, 2009: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -4336,7 +4336,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.2.41beta08, October 30, 2009, are +libpng versions 1.2.6, August 15, 2004, through 1.2.41beta09, October 30, 2009, are Copyright (c) 2004,2006-2008 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 2ed38fd3..30ee47b6 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "October 30, 2009" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.41beta08 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.41beta09 (private functions) .SH SYNOPSIS \fB#include \fP diff --git a/png.c b/png.c index 16201a8a..6a5969f8 100644 --- a/png.c +++ b/png.c @@ -16,7 +16,7 @@ #include "png.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_2_41beta08 Your_png_h_is_not_version_1_2_41beta08; +typedef version_1_2_41beta09 Your_png_h_is_not_version_1_2_41beta09; /* Version information for C files. This had better match the version * string defined in png.h. @@ -722,13 +722,13 @@ png_get_copyright(png_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version x 1.2.41beta08 - October 30, 2009" PNG_STRING_NEWLINE \ + "libpng version x 1.2.41beta09 - October 30, 2009" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2009 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.2.41beta08 - October 30, 2009\ + return ((png_charp) "libpng version 1.2.41beta09 - October 30, 2009\ Copyright (c) 1998-2009 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 34ccc8e2..93e17f68 100644 --- a/png.h +++ b/png.h @@ -1,6 +1,6 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.41beta08 - October 30, 2009 + * libpng version 1.2.41beta09 - October 30, 2009 * Copyright (c) 1998-2009 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.) @@ -10,7 +10,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.2.41beta08 - October 30, 2009: Glenn + * libpng versions 0.97, January 1998, through 1.2.41beta09 - October 30, 2009: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -245,7 +245,7 @@ * 1.2.40rc01 13 10240 12.so.0.40[.0] * 1.0.49 10 10049 10.so.0.49[.0] * 1.2.40 13 10240 12.so.0.40[.0] - * 1.2.41beta01-08 13 10241 12.so.0.41[.0] + * 1.2.41beta01-09 13 10241 12.so.0.41[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -277,7 +277,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.2.41beta08, October 30, 2009, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.41beta09, October 30, 2009, are * Copyright (c) 2004, 2006-2009 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: @@ -395,7 +395,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.2.41beta08 are Y2K compliant. It is my belief that earlier + * upward through 1.2.41beta09 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 @@ -451,9 +451,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.41beta08" +#define PNG_LIBPNG_VER_STRING "1.2.41beta09" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.41beta08 - October 30, 2009\n" + " libpng version 1.2.41beta09 - October 30, 2009\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 @@ -466,7 +466,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 08 +#define PNG_LIBPNG_VER_BUILD 09 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -1518,7 +1518,7 @@ struct png_struct_def /* New member added in libpng-1.2.30 */ png_charp chunkdata; /* buffer for reading chunk data */ -/* New member added in libpng-1.4.0 */ +/* New member added in libpng-1.2.41 */ #ifdef PNG_IO_STATE_SUPPORTED png_uint_32 io_state; #endif @@ -1528,7 +1528,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_2_41beta08; +typedef png_structp version_1_2_41beta09; typedef png_struct FAR * FAR * png_structpp; @@ -2796,7 +2796,7 @@ extern PNG_EXPORT(png_uint_32,png_get_user_height_max) PNGARG((png_structp png_ptr)); #endif -/* Added in libpng-1.4.0 */ +/* Added in libpng-1.2.41 */ #ifdef PNG_IO_STATE_SUPPORTED extern PNG_EXPORT(png_uint_32,png_get_io_state) PNGARG((png_structp png_ptr)); diff --git a/pngconf.h b/pngconf.h index 943f32af..b1c0c29a 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.41beta08 - October 30, 2009 + * libpng version 1.2.41beta09 - October 30, 2009 * Copyright (c) 1998-2009 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 baf84e5e..37136bd1 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1689,4 +1689,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_2_41beta08 your_png_h_is_not_version_1_2_41beta08; +typedef version_1_2_41beta09 your_png_h_is_not_version_1_2_41beta09; diff --git a/projects/xcode/libpng.xcodeproj/project.pbxproj b/projects/xcode/libpng.xcodeproj/project.pbxproj index 896627f7..f13ee88c 100644 --- a/projects/xcode/libpng.xcodeproj/project.pbxproj +++ b/projects/xcode/libpng.xcodeproj/project.pbxproj @@ -222,7 +222,7 @@ COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 3; DYLIB_CURRENT_VERSION = 3; - FRAMEWORK_VERSION = 1.2.41beta08; + FRAMEWORK_VERSION = 1.2.41beta09; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; INFOPLIST_FILE = Info.plist; @@ -240,7 +240,7 @@ buildSettings = { DYLIB_COMPATIBILITY_VERSION = 3; DYLIB_CURRENT_VERSION = 3; - FRAMEWORK_VERSION = 1.2.41beta08; + FRAMEWORK_VERSION = 1.2.41beta09; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; INFOPLIST_FILE = Info.plist; diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 558a0c29..aa7ca1f4 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -195,7 +195,7 @@ configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 0.${PNGLIB_RELEASE}.1.2.41beta08 +# VERSION 0.${PNGLIB_RELEASE}.1.2.41beta09 VERSION 0.${PNGLIB_RELEASE}.0 SOVERSION 0 CLEAN_DIRECT_OUTPUT 1) diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index 66b84391..60ffdcc3 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.2.41beta08 +version=1.2.41beta09 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 44f1bbd3..458b17ba 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng12 Name: libpng Description: Loads and saves PNG files -Version: 1.2.41beta08 +Version: 1.2.41beta09 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 19923e0f..1ae2477e 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.41beta08 +PNGMIN = 1.2.41beta09 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index b4cacc9c..2abb63b1 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.41beta08 +PNGMIN = 1.2.41beta09 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 1a24984a..1f8ec58b 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -23,7 +23,7 @@ LN_SF = ln -f -s LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.41beta08 +PNGMIN = 1.2.41beta09 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index ac285eef..4b05fa14 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.41beta08 +PNGMIN = 1.2.41beta09 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 1ab66db2..4ea39a2d 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -77,7 +77,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 CYGDLL = 12 -PNGMIN = 1.2.41beta08 +PNGMIN = 1.2.41beta09 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 11e81eba..1d58eca8 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -22,7 +22,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 12 -PNGMIN = 1.2.41beta08 +PNGMIN = 1.2.41beta09 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 5a26e076..8967d373 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.41beta08 +PNGMIN = 1.2.41beta09 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index f8d6f160..5a64f740 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.41beta08 +PNGMIN = 1.2.41beta09 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 17db15cd..022dca99 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -17,7 +17,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.41beta08 +PNGMIN = 1.2.41beta09 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 0ddf61d8..3aecf1f6 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -21,7 +21,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.41beta08 +PNGMIN = 1.2.41beta09 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 5fc4074d..774b6af6 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.41beta08 +PNGMIN = 1.2.41beta09 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 5d6a7393..94592acd 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -21,7 +21,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.41beta08 +PNGMIN = 1.2.41beta09 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 18cd717e..72581372 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.41beta08 +PNGMIN = 1.2.41beta09 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 603caaa9..947e3af0 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -77,7 +77,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 MINGDLL = 12 -PNGMIN = 1.2.41beta08 +PNGMIN = 1.2.41beta09 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 09ca604a..9ca3898e 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng12 LIB= png12 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.41beta08 +SHLIB_MINOR= 1.2.41beta09 SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngwtran.c pngmem.c pngerror.c pngpread.c diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd index 7eb2dac7..5412bd28 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.2.41beta08 +SHLIB_MINOR= 1.2.41beta09 SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngwtran.c pngmem.c pngerror.c pngpread.c diff --git a/scripts/makefile.nommx b/scripts/makefile.nommx index 3b5a3694..60ae338f 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.41beta08 +PNGMIN = 1.2.41beta09 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index bf27c8d7..417c71c8 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.41beta08 +SHLIB_MINOR= 1.2.41beta09 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 1da23a0d..cade4eb5 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.41beta08 +PNGMIN = 1.2.41beta09 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 637753a0..1533b890 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -9,7 +9,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.41beta08 +PNGMIN = 1.2.41beta09 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index d09a10e6..847b69e7 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -9,7 +9,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.41beta08 +PNGMIN = 1.2.41beta09 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 8ab804e3..135d94a2 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -11,7 +11,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.41beta08 +PNGMIN = 1.2.41beta09 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 9b47471a..dc7d3be6 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.41beta08 +PNGMIN = 1.2.41beta09 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index 91d10612..581ecb15 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.41beta08 +PNGMIN = 1.2.41beta09 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index d5a747ae..0de2e787 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.41beta08 +; Version 1.2.41beta09 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index 3eee23de..7abea5ca 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.41beta08 +;Version 1.2.41beta09 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3