diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2008-01-09 23:02:16 -0600 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-04-06 16:15:54 -0500 |
| commit | dbc07e13bb36b94aca5517e1338e0a4a641f2a29 (patch) | |
| tree | 0b9d07981e368ec6b537d4af6abe234264207ef9 | |
| parent | 5ca40ebc22aff23673c9dc6c49bd81c0493fd2e6 (diff) | |
| download | libpng-1.2.25beta02.tar.gz | |
Imported from libpng-1.2.25beta02.tarv1.2.25beta02
50 files changed, 138 insertions, 116 deletions
@@ -1,5 +1,5 @@ -Libpng 1.2.25beta01 - January 9, 2008 +Libpng 1.2.25beta02 - January 10, 2008 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,32 +9,32 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.2.25beta01.tar.gz - libpng-1.2.25beta01.tar.bz2 + libpng-1.2.25beta02.tar.gz + libpng-1.2.25beta02.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.25beta01-no-config.tar.gz - libpng-1.2.25beta01-no-config.tar.bz2 + libpng-1.2.25beta02-no-config.tar.gz + libpng-1.2.25beta02-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1225b01.zip - lp1225b01.tar.bz2 + lp1225b02.zip + lp1225b02.tar.bz2 Project files - libpng-1.2.25beta01-project-netware.zip - libpng-1.2.25beta01-project-wince.zip + libpng-1.2.25beta02-project-netware.zip + libpng-1.2.25beta02-project-wince.zip Other information: - libpng-1.2.25beta01-README.txt - libpng-1.2.25beta01-KNOWNBUGS.txt - libpng-1.2.25beta01-LICENSE.txt - libpng-1.2.25beta01-Y2K-compliance.txt + libpng-1.2.25beta02-README.txt + libpng-1.2.25beta02-KNOWNBUGS.txt + libpng-1.2.25beta02-LICENSE.txt + libpng-1.2.25beta02-Y2K-compliance.txt Changes since the last public release (1.2.23): @@ -60,9 +60,13 @@ version 1.2.24 [December 14, 2007]] Revised gather.sh and makefile.std in contrib/pngminim to avoid compiling unused files. -version 1.2.25beta1 [January 9, 2008] +version 1.2.25beta01 [January 7, 2008] Fixed bug with unknown chunk handling, introduced in version 1.2.17rc2 +version 1.2.25beta02 [January 10, 2008] + Prevent gamma from being applied twice. + + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit @@ -2027,14 +2027,17 @@ version 1.2.24beta02 [November 30, 2007] version 1.2.24rc01 [December 7, 2007] No changes. -version 1.2.24 [January 9, 2008] +version 1.2.24 [December 14, 2007] Make sure not to redefine _BSD_SOURCE in pngconf.h Revised gather.sh and makefile.std in contrib/pngminim to avoid compiling unused files. -version 1.2.25beta1 [January 9, 2008] +version 1.2.25beta01 [January 7, 2008] Fixed bug with unknown chunk handling, introduced in version 1.2.17rc2 +version 1.2.25beta02 [January 10, 2008] + Prevent gamma from being applied twice. + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement @@ -1,5 +1,5 @@ -Installing libpng version 1.2.25beta01 - January 9, 2008 +Installing libpng version 1.2.25beta02 - January 10, 2008 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.25beta01" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.2.25beta02" 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.25beta01) + gcc, creates libpng12.so.0.1.2.25beta02) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.25beta01) + (gcc, creates libpng12.so.0.1.2.25beta02) 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.25beta01) + creates libpng12.so.0.1.2.25beta02) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.25beta01) + creates libpng12.so.0.1.2.25beta02) makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc, - creates libpng12.so.0.1.2.25beta01) + creates libpng12.so.0.1.2.25beta02) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.25beta01) + creates libpng12.so.0.1.2.25beta02) 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 @@ -1,5 +1,5 @@ -Known bugs in libpng version 1.2.25beta01 +Known bugs in libpng version 1.2.25beta02 1. February 23, 2006: The custom makefiles don't build libpng with -lz. @@ -8,7 +8,7 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: If you modify libpng you may insert additional notices immediately following this sentence. -libpng versions 1.2.6, August 15, 2004, through 1.2.25beta01, January 9, 2008, are +libpng versions 1.2.6, August 15, 2004, through 1.2.25beta02, January 10, 2008, 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 @@ -106,4 +106,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -January 9, 2008 +January 10, 2008 @@ -1,4 +1,4 @@ -README for libpng version 1.2.25beta01 - January 9, 2008 (shared library 12.0) +README for libpng version 1.2.25beta02 - January 10, 2008 (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. @@ -190,11 +190,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.25beta01) + gcc, creates libpng12.so.0.1.2.25beta02) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.25beta01) + (gcc, creates libpng12.so.0.1.2.25beta02) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.25beta01, + (gcc, creates libpng12.so.0.1.2.25beta02, 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 @@ -216,12 +216,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.25beta01) + (gcc, creates libpng12.so.0.1.2.25beta02) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.25beta01) + (gcc, creates libpng12.so.0.1.2.25beta02) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.25beta01) + (gcc, creates libpng12.so.0.1.2.25beta02) 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 @@ -1,13 +1,13 @@ Y2K compliance in libpng: ========================= - January 9, 2008 + January 10, 2008 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.25beta01 are Y2K compliant. It is my belief that earlier + upward through 1.2.25beta02 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 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for libpng 1.2.25beta01. +# Generated by GNU Autoconf 2.61 for libpng 1.2.25beta02. # # Report bugs to <png-mng-implement@lists.sourceforge.net>. # @@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.2.25beta01' -PACKAGE_STRING='libpng 1.2.25beta01' +PACKAGE_VERSION='1.2.25beta02' +PACKAGE_STRING='libpng 1.2.25beta02' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' ac_unique_file="pngget.c" @@ -1406,7 +1406,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.25beta01 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.25beta02 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1476,7 +1476,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.2.25beta01:";; + short | recursive ) echo "Configuration of libpng 1.2.25beta02:";; esac cat <<\_ACEOF @@ -1586,7 +1586,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.2.25beta01 +libpng configure 1.2.25beta02 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1600,7 +1600,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.25beta01, which was +It was created by libpng $as_me 1.2.25beta02, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2270,7 +2270,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.2.25beta01' + VERSION='1.2.25beta02' cat >>confdefs.h <<_ACEOF @@ -2441,7 +2441,7 @@ fi -PNGLIB_VERSION=1.2.25beta01 +PNGLIB_VERSION=1.2.25beta02 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=25 @@ -21295,7 +21295,7 @@ exec 6>&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.25beta01, which was +This file was extended by libpng $as_me 1.2.25beta02, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21348,7 +21348,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -libpng config.status 1.2.25beta01 +libpng config.status 1.2.25beta02 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index de1f74506..ef5012482 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.25beta01], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.25beta02], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.25beta01 +PNGLIB_VERSION=1.2.25beta02 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=25 diff --git a/libpng-1.2.25beta01.txt b/libpng-1.2.25beta02.txt index c31d0b5fa..25bf76911 100644 --- a/libpng-1.2.25beta01.txt +++ b/libpng-1.2.25beta02.txt @@ -1,9 +1,9 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.25beta01 - January 9, 2008 + libpng version 1.2.25beta02 - January 10, 2008 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> - Copyright (c) 1998-2007 Glenn Randers-Pehrson + Copyright (c) 1998-2008 Glenn Randers-Pehrson For conditions of distribution and use, see copyright notice in png.h. @@ -2796,13 +2796,13 @@ application: IX. Y2K Compliance in libpng -January 9, 2008 +January 10, 2008 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.25beta01 are Y2K compliant. It is my belief that earlier +upward through 1.2.25beta02 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 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "January 9, 2008" +.TH LIBPNG 3 "January 10, 2008" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.25beta01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.25beta02 .SH SYNOPSIS \fI\fB @@ -821,10 +821,10 @@ 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.25beta01 - January 9, 2008 + libpng version 1.2.25beta02 - January 10, 2008 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> - Copyright (c) 1998-2007 Glenn Randers-Pehrson + Copyright (c) 1998-2008 Glenn Randers-Pehrson For conditions of distribution and use, see copyright notice in png.h. @@ -3617,13 +3617,13 @@ application: .SH IX. Y2K Compliance in libpng -January 9, 2008 +January 10, 2008 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.25beta01 are Y2K compliant. It is my belief that earlier +upward through 1.2.25beta02 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 @@ -3837,7 +3837,7 @@ the first widely used release: 1.2.24beta01-02 13 10224 12.so.0.24[.0] 1.2.24rc01 13 10224 12.so.0.24[.0] 1.2.24 13 10224 12.so.0.24[.0] - 1.2.25beta01 13 10225 12.so.0.25[.0] + 1.2.25beta01-02 13 10225 12.so.0.25[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3893,7 +3893,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.25beta01 - January 9, 2008: +Libpng version 1.2.25beta02 - January 10, 2008: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -3914,8 +3914,8 @@ included in the libpng distribution, the latter shall prevail.) If you modify libpng you may insert additional notices immediately following this sentence. -libpng versions 1.2.6, August 15, 2004, through 1.2.25beta01, January 9, 2008, are -Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are +libpng versions 1.2.6, August 15, 2004, through 1.2.25beta02, January 10, 2008, 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 @@ -4013,7 +4013,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -January 9, 2008 +January 10, 2008 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 00ab041c2..6753ce19c 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "January 9, 2008" +.TH LIBPNGPF 3 "January 10, 2008" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.25beta01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.25beta02 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "January 9, 2008" +.TH PNG 5 "January 10, 2008" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -13,7 +13,7 @@ #include "png.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_2_25beta01 Your_png_h_is_not_version_1_2_25beta01; +typedef version_1_2_25beta02 Your_png_h_is_not_version_1_2_25beta02; /* Version information for C files. This had better match the version * string defined in png.h. */ @@ -693,7 +693,7 @@ png_charp PNGAPI png_get_copyright(png_structp png_ptr) { png_ptr = png_ptr; /* silence compiler warning about unused png_ptr */ - return ((png_charp) "\n libpng version 1.2.25beta01 - January 9, 2008\n\ + return ((png_charp) "\n libpng version 1.2.25beta02 - January 10, 2008\n\ Copyright (c) 1998-2007 Glenn Randers-Pehrson\n\ Copyright (c) 1996-1997 Andreas Dilger\n\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n"); @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.25beta01 - January 9, 2008 + * libpng version 1.2.25beta02 - January 10, 2008 * Copyright (c) 1998-2008 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.) @@ -9,7 +9,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.25beta01 - January 9, 2008: Glenn + * libpng versions 0.97, January 1998, through 1.2.25beta02 - January 10, 2008: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -175,7 +175,7 @@ * 1.2.24beta01-02 13 10224 12.so.0.24[.0] * 1.2.24rc01 13 10224 12.so.0.24[.0] * 1.2.24 13 10224 12.so.0.24[.0] - * 1.2.25beta01 13 10225 12.so.0.25[.0] + * 1.2.25beta01-02 13 10225 12.so.0.25[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -205,7 +205,7 @@ * If you modify libpng you may insert additional notices immediately following * this sentence. * - * libpng versions 1.2.6, August 15, 2004, through 1.2.25beta01, January 9, 2008, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.25beta02, January 10, 2008, 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: @@ -317,13 +317,13 @@ * Y2K compliance in libpng: * ========================= * - * January 9, 2008 + * January 10, 2008 * * 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.25beta01 are Y2K compliant. It is my belief that earlier + * upward through 1.2.25beta02 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 @@ -379,9 +379,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.25beta01" +#define PNG_LIBPNG_VER_STRING "1.2.25beta02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.25beta01 - January 9, 2008\n" + " libpng version 1.2.25beta02 - January 10, 2008\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 @@ -393,7 +393,7 @@ /* This should match the numeric part of the final component of * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 01 +#define PNG_LIBPNG_VER_BUILD 02 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -1431,7 +1431,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_25beta01; +typedef png_structp version_1_2_25beta02; typedef png_struct FAR * FAR * png_structpp; @@ -1,9 +1,9 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.25beta01 - January 9, 2008 + * libpng version 1.2.25beta02 - January 10, 2008 * For conditions of distribution and use, see copyright notice in png.h - * Copyright (c) 1998-2007 Glenn Randers-Pehrson + * Copyright (c) 1998-2008 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/pngpread.c b/pngpread.c index 7f97ed4b8..85ee8f4e2 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * Last changed in libpng 1.2.25 [January 9, 2008] + * Last changed in libpng 1.2.25 [January 10, 2008] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2008 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrtran.c b/pngrtran.c index cda392154..90b0ca6e9 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,9 +1,9 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.2.22 [October 13, 2007] + * Last changed in libpng 1.2.25 [January 10, 2008] * For conditions of distribution and use, see copyright notice in png.h - * Copyright (c) 1998-2007 Glenn Randers-Pehrson + * Copyright (c) 1998-2008 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.) * @@ -964,6 +964,14 @@ png_init_read_transformations(png_structp png_ptr) palette[i].blue = png_ptr->gamma_table[palette[i].blue]; } } + /* Prevent the transformations being done again, and make sure + * that the now spurious alpha channel is stripped - the code + * has just reduced background composition and gamma correction + * to a simply alpha channel strip. + */ + png_ptr->transformations &= ~PNG_BACKGROUND; + png_ptr->transformations &= ~PNG_GAMMA; + png_ptr->transformations |= PNG_STRIP_ALPHA; } /* if (png_ptr->background_gamma_type!=PNG_BACKGROUND_GAMMA_UNKNOWN) */ else @@ -1038,6 +1046,9 @@ png_init_read_transformations(png_structp png_ptr) palette[i].green = png_ptr->gamma_table[palette[i].green]; palette[i].blue = png_ptr->gamma_table[palette[i].blue]; } + + /* Done the gamma correction. */ + png_ptr->transformations &= ~PNG_GAMMA; } } #if defined(PNG_READ_BACKGROUND_SUPPORTED) @@ -1075,6 +1086,10 @@ png_init_read_transformations(png_structp png_ptr) png_ptr->trans[i], back.blue); } } + + /* Handled alpha, still need to strip the channel. */ + png_ptr->transformations &= ~PNG_BACKGROUND; + png_ptr->transformations |= PNG_STRIP_ALPHA; } #endif /* PNG_READ_BACKGROUND_SUPPORTED */ diff --git a/pngrutil.c b/pngrutil.c index 1bb11d208..2da686280 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.2.25 [January 9, 2008] + * Last changed in libpng 1.2.25 [January 10, 2008] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2008 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1553,4 +1553,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_25beta01 your_png_h_is_not_version_1_2_25beta01; +typedef version_1_2_25beta02 your_png_h_is_not_version_1_2_25beta02; diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index dc251992c..eae9b72c0 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -169,7 +169,7 @@ configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in # SET UP LINKS set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 0.${PNGLIB_RELEASE}.1.2.25beta01 +# VERSION 0.${PNGLIB_RELEASE}.1.2.25beta02 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 ca8bf7448..f214e164d 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.25beta01 +version=1.2.25beta02 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc-configure.in b/scripts/libpng.pc-configure.in index 6db1814ea..ad7293821 100644 --- a/scripts/libpng.pc-configure.in +++ b/scripts/libpng.pc-configure.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng12 Name: libpng Description: Loads and saves PNG files -Version: 1.2.25beta01 +Version: 1.2.25beta02 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} @LIBPNG_NO_MMX@ diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index b4b6ffc48..ee7878ed7 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.25beta01 +Version: 1.2.25beta02 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 5ea4eaf5b..02df74aec 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.25beta01 +PNGMIN = 1.2.25beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index c5dda5ec0..89639c8b4 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.25beta01 +PNGMIN = 1.2.25beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 3aa56e3ce..a20b37eea 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -20,7 +20,7 @@ LN_SF = ln -f -s LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.25beta01 +PNGMIN = 1.2.25beta02 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index c07b714c9..7bb74051b 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.25beta01 +PNGMIN = 1.2.25beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 2cf9028c8..e5363b1a8 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -74,7 +74,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 CYGDLL = 12 -PNGMIN = 1.2.25beta01 +PNGMIN = 1.2.25beta02 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 855a60d37..4c66a521d 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.25beta01 +PNGMIN = 1.2.25beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 68d15e08f..02ea46ac9 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.25beta01 +PNGMIN = 1.2.25beta02 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 594437018..a98fa9dfa 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.25beta01 +PNGMIN = 1.2.25beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index e91897368..d38a831b5 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -14,7 +14,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.25beta01 +PNGMIN = 1.2.25beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 58e1320c1..59df2c74a 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.25beta01 +PNGMIN = 1.2.25beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index ccd7da3f0..373ccd6aa 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.25beta01 +PNGMIN = 1.2.25beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index be9f050d9..1776cf84a 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.25beta01 +PNGMIN = 1.2.25beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 347e35df8..c9701b2ac 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -6,7 +6,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.25beta01 +PNGMIN = 1.2.25beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 785c65c5c..43a549396 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -74,7 +74,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 MINGDLL = 12 -PNGMIN = 1.2.25beta01 +PNGMIN = 1.2.25beta02 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 58d2b55cb..e44089496 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng12 LIB= png12 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.25beta01 +SHLIB_MINOR= 1.2.25beta02 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 de84ec8f5..3277b1ef7 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.2.25beta01 +SHLIB_MINOR= 1.2.25beta02 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 8ed03b136..c158b438b 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -7,7 +7,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.25beta01 +PNGMIN = 1.2.25beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 588ce6e29..b1d471b92 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -8,7 +8,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.25beta01 +SHLIB_MINOR= 1.2.25beta02 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index ba61890e8..a94a69d4e 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.25beta01 +PNGMIN = 1.2.25beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 10516a110..340385bbd 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.25beta01 +PNGMIN = 1.2.25beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 1c881b816..633dd891e 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.25beta01 +PNGMIN = 1.2.25beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 0b7e73370..d3981e927 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.25beta01 +PNGMIN = 1.2.25beta02 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 751c59dae..033e90229 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.25beta01 +PNGMIN = 1.2.25beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index a6f012c8e..466ea9f2e 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.25beta01 +PNGMIN = 1.2.25beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 8d6727869..e9173acea 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.25beta01 +; Version 1.2.25beta02 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index 7b2016a98..54749e672 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.25beta01 +;Version 1.2.25beta02 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 |