diff --git a/ANNOUNCE b/ANNOUNCE index a9b2a606..9cb3ca01 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.2.27beta01 - April 12, 2008 +Libpng 1.2.27beta02 - April 14, 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,37 +9,37 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.2.27beta01.tar.gz - libpng-1.2.27beta01.tar.lzma + libpng-1.2.27beta02.tar.gz + libpng-1.2.27beta02.tar.lzma (Get the lzma codec from ). - libpng-1.2.27beta01.tar.bz2 + libpng-1.2.27beta02.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.27beta01-no-config.tar.gz - libpng-1.2.27beta01-no-config.tar.lzma - libpng-1.2.27beta01-no-config.tar.bz2 + libpng-1.2.27beta02-no-config.tar.gz + libpng-1.2.27beta02-no-config.tar.lzma + libpng-1.2.27beta02-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1227b01.zip - lp1227b01.7z - lp1227b01.tar.bz2 + lp1227b02.zip + lp1227b02.7z + lp1227b02.tar.bz2 Project files - libpng-1.2.27beta01-project-netware.zip - libpng-1.2.27beta01-project-wince.zip + libpng-1.2.27beta02-project-netware.zip + libpng-1.2.27beta02-project-wince.zip Other information: - libpng-1.2.27beta01-README.txt - libpng-1.2.27beta01-KNOWNBUGS.txt - libpng-1.2.27beta01-LICENSE.txt - libpng-1.2.27beta01-Y2K-compliance.txt - libpng-1.2.27beta01-[previous version]-diff.txt + libpng-1.2.27beta02-README.txt + libpng-1.2.27beta02-KNOWNBUGS.txt + libpng-1.2.27beta02-LICENSE.txt + libpng-1.2.27beta02-Y2K-compliance.txt + libpng-1.2.27beta02-[previous version]-diff.txt Changes since the last public release (1.2.26): @@ -51,6 +51,10 @@ version 1.2.27beta01 [April 12, 2008] Reject tRNS chunk with out-of-range samples instead of masking off the invalid high bits as done in since libpng-1.2.19beta5. +version 1.2.27rc01 [April 14, 2008] + Revised documentation about unknown chunk and user chunk handling. + Keep tRNS chunk with out-of-range samples and issue a png_warning(). + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index ac44681b..a2d71222 100644 --- a/CHANGES +++ b/CHANGES @@ -2111,6 +2111,10 @@ version 1.2.27beta01 [April 12, 2008] Reject tRNS chunk with out-of-range samples instead of masking off the invalid high bits as done in since libpng-1.2.19beta5. +version 1.2.27beta02 [April 14, 2008] + Revised documentation about unknown chunk and user chunk handling. + Keep tRNS chunk with out-of-range samples and issue a png_warning(). + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement diff --git a/INSTALL b/INSTALL index 22c7022f..5c781389 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.2.27beta01 - April 12, 2008 +Installing libpng version 1.2.27beta02 - April 14, 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.27beta01" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.2.27beta02" 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.27beta01) + gcc, creates libpng12.so.0.1.2.27beta02) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.27beta01) + (gcc, creates libpng12.so.0.1.2.27beta02) 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.27beta01) + creates libpng12.so.0.1.2.27beta02) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.27beta01) + creates libpng12.so.0.1.2.27beta02) makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc, - creates libpng12.so.0.1.2.27beta01) + creates libpng12.so.0.1.2.27beta02) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.27beta01) + creates libpng12.so.0.1.2.27beta02) 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 1d31ea73..c3758351 100644 --- a/KNOWNBUG +++ b/KNOWNBUG @@ -1,5 +1,5 @@ -Known bugs in libpng version 1.2.27beta01 +Known bugs in libpng version 1.2.27beta02 1. February 23, 2006: The custom makefiles don't build libpng with -lz. diff --git a/LICENSE b/LICENSE index edc0d4fe..ca567a0c 100644 --- a/LICENSE +++ b/LICENSE @@ -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.27beta01, April 12, 2008, are +libpng versions 1.2.6, August 15, 2004, through 1.2.27beta02, April 14, 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 -April 12, 2008 +April 14, 2008 diff --git a/README b/README index 15b6a282..aed645e7 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.2.27beta01 - April 12, 2008 (shared library 12.0) +README for libpng version 1.2.27beta02 - April 14, 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. @@ -191,11 +191,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.27beta01) + gcc, creates libpng12.so.0.1.2.27beta02) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.27beta01) + (gcc, creates libpng12.so.0.1.2.27beta02) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.27beta01, + (gcc, creates libpng12.so.0.1.2.27beta02, 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 @@ -217,12 +217,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.27beta01) + (gcc, creates libpng12.so.0.1.2.27beta02) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.27beta01) + (gcc, creates libpng12.so.0.1.2.27beta02) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.27beta01) + (gcc, creates libpng12.so.0.1.2.27beta02) 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 cb482675..53a1ac55 100644 --- a/Y2KINFO +++ b/Y2KINFO @@ -1,13 +1,13 @@ Y2K compliance in libpng: ========================= - April 12, 2008 + April 14, 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.27beta01 are Y2K compliant. It is my belief that earlier + upward through 1.2.27beta02 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 33e8a49d..9f3df3a0 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.61 for libpng 1.2.27beta01. +# Generated by GNU Autoconf 2.61 for libpng 1.2.27beta02. # # Report bugs to . # @@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.2.27beta01' -PACKAGE_STRING='libpng 1.2.27beta01' +PACKAGE_VERSION='1.2.27beta02' +PACKAGE_STRING='libpng 1.2.27beta02' 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.27beta01 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.27beta02 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.27beta01:";; + short | recursive ) echo "Configuration of libpng 1.2.27beta02:";; 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.27beta01 +libpng configure 1.2.27beta02 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.27beta01, which was +It was created by libpng $as_me 1.2.27beta02, 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.27beta01' + VERSION='1.2.27beta02' cat >>confdefs.h <<_ACEOF @@ -2441,7 +2441,7 @@ fi -PNGLIB_VERSION=1.2.27beta01 +PNGLIB_VERSION=1.2.27beta02 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=27 @@ -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.27beta01, which was +This file was extended by libpng $as_me 1.2.27beta02, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21348,7 +21348,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -libpng config.status 1.2.27beta01 +libpng config.status 1.2.27beta02 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 a0591136..28010f44 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.27beta01], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.27beta02], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.27beta01 +PNGLIB_VERSION=1.2.27beta02 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=27 diff --git a/libpng-1.2.27beta01.txt b/libpng-1.2.27beta02.txt similarity index 99% rename from libpng-1.2.27beta01.txt rename to libpng-1.2.27beta02.txt index 9be287f1..0d1c611c 100644 --- a/libpng-1.2.27beta01.txt +++ b/libpng-1.2.27beta02.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.27beta01 - April 12, 2008 + libpng version 1.2.27beta02 - April 14, 2008 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2008 Glenn Randers-Pehrson @@ -47,12 +47,14 @@ a W3C Recommendation and as an ISO Standard (ISO/IEC 15948:2003 (E)) at The W3C and ISO documents have identical technical content. The PNG-1.2 specification is available at - +. It is technically equivalent +to the PNG specification (second edition) but has some additional material. The PNG-1.0 specification is available as RFC 2083 and as a -W3C Recommendation . Some -additional chunks are described in the special-purpose public chunks +W3C Recommendation . + +Some additional chunks are described in the special-purpose public chunks documents at . Other information @@ -260,15 +262,19 @@ input stream. You must supply the function png_unknown_chunkp chunk); { /* The unknown chunk structure contains your - chunk data: */ + chunk data, along with similar data for any other + unknown chunks: */ + png_byte name[5]; png_byte *data; png_size_t size; + /* Note that libpng has already taken care of the CRC handling */ - /* put your code here. Return one of the - following: */ + /* put your code here. Search for your chunk in the + unknown chunk structure, process it, and return one + of the following: */ return (-n); /* chunk had an error */ return (0); /* did not recognize */ @@ -337,13 +343,13 @@ Unknown-chunk handling Now you get to set the way the library processes unknown chunks in the input PNG stream. Both known and unknown chunks will be read. Normal behavior is that known chunks will be parsed into information in -various info_ptr members; unknown chunks will be discarded. To change +various info_ptr members while unknown chunks will be discarded. To change this, you can call: png_set_keep_unknown_chunks(png_ptr, keep, chunk_list, num_chunks); - keep - 0: do not handle as unknown - 1: do not keep + keep - 0: default unknown chunk handling + 1: ignore; do not keep 2: keep only if safe-to-copy 3: keep even if unsafe-to-copy You can use these definitions: @@ -1779,6 +1785,11 @@ Some of the more important parts of the png_info are: can also be PNG_INTRAPIXEL_DIFFERENCING) +If you call png_set_IHDR(), the call must appear before any of the +other png_set_*() functions, which might require access to some of +the IHDR settings. The remaining png_set_*() functions can be called +in any order. + png_set_PLTE(png_ptr, info_ptr, palette, num_palette); palette - the palette for the file @@ -2832,13 +2843,13 @@ application: IX. Y2K Compliance in libpng -April 12, 2008 +April 14, 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.27beta01 are Y2K compliant. It is my belief that earlier +upward through 1.2.27beta02 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 90685e12..1bbeda42 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "April 12, 2008" +.TH LIBPNG 3 "April 14, 2008" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.27beta01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.27beta02 .SH SYNOPSIS \fB #include \fP @@ -410,7 +410,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.27beta01 - April 12, 2008 + libpng version 1.2.27beta02 - April 14, 2008 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2008 Glenn Randers-Pehrson @@ -457,12 +457,14 @@ a W3C Recommendation and as an ISO Standard (ISO/IEC 15948:2003 (E)) at The W3C and ISO documents have identical technical content. The PNG-1.2 specification is available at - +. It is technically equivalent +to the PNG specification (second edition) but has some additional material. The PNG-1.0 specification is available as RFC 2083 and as a -W3C Recommendation . Some -additional chunks are described in the special-purpose public chunks +W3C Recommendation . + +Some additional chunks are described in the special-purpose public chunks documents at . Other information @@ -670,15 +672,19 @@ input stream. You must supply the function png_unknown_chunkp chunk); { /* The unknown chunk structure contains your - chunk data: */ + chunk data, along with similar data for any other + unknown chunks: */ + png_byte name[5]; png_byte *data; png_size_t size; + /* Note that libpng has already taken care of the CRC handling */ - /* put your code here. Return one of the - following: */ + /* put your code here. Search for your chunk in the + unknown chunk structure, process it, and return one + of the following: */ return (-n); /* chunk had an error */ return (0); /* did not recognize */ @@ -747,13 +753,13 @@ If you need to retrieve the limits that are being applied, use Now you get to set the way the library processes unknown chunks in the input PNG stream. Both known and unknown chunks will be read. Normal behavior is that known chunks will be parsed into information in -various info_ptr members; unknown chunks will be discarded. To change +various info_ptr members while unknown chunks will be discarded. To change this, you can call: png_set_keep_unknown_chunks(png_ptr, keep, chunk_list, num_chunks); - keep - 0: do not handle as unknown - 1: do not keep + keep - 0: default unknown chunk handling + 1: ignore; do not keep 2: keep only if safe-to-copy 3: keep even if unsafe-to-copy You can use these definitions: @@ -2189,6 +2195,11 @@ Some of the more important parts of the png_info are: can also be PNG_INTRAPIXEL_DIFFERENCING) +If you call png_set_IHDR(), the call must appear before any of the +other png_set_*() functions, which might require access to some of +the IHDR settings. The remaining png_set_*() functions can be called +in any order. + png_set_PLTE(png_ptr, info_ptr, palette, num_palette); palette - the palette for the file @@ -3242,13 +3253,13 @@ application: .SH IX. Y2K Compliance in libpng -April 12, 2008 +April 14, 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.27beta01 are Y2K compliant. It is my belief that earlier +upward through 1.2.27beta02 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 @@ -3470,7 +3481,7 @@ the first widely used release: 1.2.26rc01 13 10226 12.so.0.26[.0] 1.2.26 13 10226 12.so.0.26[.0] 1.0.32 10 10032 10.so.0.32[.0] - 1.2.27beta01 13 10227 12.so.0.27[.0] + 1.2.27beta01-02 13 10227 12.so.0.27[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3526,7 +3537,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.27beta01 - April 12, 2008: +Libpng version 1.2.27beta02 - April 14, 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). @@ -3547,7 +3558,7 @@ 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.27beta01, April 12, 2008, are +libpng versions 1.2.6, August 15, 2004, through 1.2.27beta02, April 14, 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 @@ -3646,7 +3657,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -April 12, 2008 +April 14, 2008 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 1863f73c..a6a10520 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "April 12, 2008" +.TH LIBPNGPF 3 "April 14, 2008" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.27beta01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.27beta02 (private functions) .SH SYNOPSIS \fB#include \fP diff --git a/png.5 b/png.5 index bf92d1d0..cb8b0173 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "April 12, 2008" +.TH PNG 5 "April 14, 2008" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index bafc0df6..c849c0d9 100644 --- a/png.c +++ b/png.c @@ -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_27beta01 Your_png_h_is_not_version_1_2_27beta01; +typedef version_1_2_27beta02 Your_png_h_is_not_version_1_2_27beta02; /* 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.27beta01 - April 12, 2008\n\ + return ((png_charp) "\n libpng version 1.2.27beta02 - April 14, 2008\n\ Copyright (c) 1998-2008 Glenn Randers-Pehrson\n\ Copyright (c) 1996-1997 Andreas Dilger\n\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n"); diff --git a/png.h b/png.h index f01c770e..3c5fc2db 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.27beta01 - April 12, 2008 + * libpng version 1.2.27beta02 - April 14, 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.27beta01 - April 12, 2008: Glenn + * libpng versions 0.97, January 1998, through 1.2.27beta02 - April 14, 2008: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -183,7 +183,7 @@ * 1.2.26rc01 13 10226 12.so.0.26[.0] * 1.2.26 13 10226 12.so.0.26[.0] * 1.0.32 10 10032 10.so.0.32[.0] - * 1.2.27beta01 13 10227 12.so.0.27[.0] + * 1.2.27beta01-02 13 10227 12.so.0.27[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -193,7 +193,7 @@ * to the source version x.y.z (leading zeros in y and z). Beta versions * were given the previous public release number plus a letter, until * version 1.0.6j; from then on they were given the upcoming public - * release number plus "betaNN" or "rcN". + * release number plus "betaNN" or "rcNN". * * Binary incompatibility exists only when applications make direct access * to the info_ptr or png_ptr members through png.h, and the compiled @@ -213,7 +213,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.27beta01, April 12, 2008, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.27beta02, April 14, 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: @@ -325,13 +325,13 @@ * Y2K compliance in libpng: * ========================= * - * April 12, 2008 + * April 14, 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.27beta01 are Y2K compliant. It is my belief that earlier + * upward through 1.2.27beta02 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 @@ -387,9 +387,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.27beta01" +#define PNG_LIBPNG_VER_STRING "1.2.27beta02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.27beta01 - April 12, 2008\n" + " libpng version 1.2.27beta02 - April 14, 2008\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 @@ -401,7 +401,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 @@ -1442,7 +1442,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_27beta01; +typedef png_structp version_1_2_27beta02; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngconf.h b/pngconf.h index 8fd9d2c9..c60bb52d 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.27beta01 - April 12, 2008 + * libpng version 1.2.27beta02 - April 14, 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/pngpread.c b/pngpread.c index adeb6501..d3d8933a 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.27 [April 12, 2008] + * Last changed in libpng 1.2.27 [April 14, 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 c020b51b..2d2b98ba 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -967,7 +967,7 @@ png_init_read_transformations(png_structp png_ptr) /* 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. + * to a simple alpha channel strip. */ png_ptr->transformations &= ~PNG_BACKGROUND; png_ptr->transformations &= ~PNG_GAMMA; diff --git a/pngrutil.c b/pngrutil.c index d12b2877..4f480987 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.27 [April 12, 2008] + * Last changed in libpng 1.2.27 [April 14, 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/pngset.c b/pngset.c index 7bc9f850..496bb525 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.2.27 [April 12, 2008] + * Last changed in libpng 1.2.27 [April 14, 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) @@ -947,8 +947,7 @@ png_set_tRNS(png_structp png_ptr, png_infop info_ptr, (int)trans_values->blue > sample_max))) { png_warning(png_ptr, - "Ignoring tRNS chunk with out-of-range samples for bit_depth"); - return; + "tRNS chunk has out-of-range samples for bit_depth"); } png_memcpy(&(info_ptr->trans_values), trans_values, png_sizeof(png_color_16)); diff --git a/pngtest.c b/pngtest.c index e048532c..61f41064 100644 --- a/pngtest.c +++ b/pngtest.c @@ -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_27beta01 your_png_h_is_not_version_1_2_27beta01; +typedef version_1_2_27beta02 your_png_h_is_not_version_1_2_27beta02; diff --git a/pngwrite.c b/pngwrite.c index bc2a4efc..20db17b6 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * Last changed in libpng 1.2.25 [February 18, 2008] + * Last changed in libpng 1.2.27 [April 14, 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/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index f238d839..e5d8d99e 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.27beta01 +# VERSION 0.${PNGLIB_RELEASE}.1.2.27beta02 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 53d76d04..282f7cbb 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.27beta01 +version=1.2.27beta02 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc-configure.in b/scripts/libpng.pc-configure.in index 687f3b72..ab8c94f1 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.27beta01 +Version: 1.2.27beta02 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} @LIBPNG_NO_MMX@ diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index d38a0734..e1b5feb8 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.27beta01 +Version: 1.2.27beta02 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index f557915f..fe952ded 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.27beta01 +PNGMIN = 1.2.27beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 343de2c5..28c05d20 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.27beta01 +PNGMIN = 1.2.27beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 6a67f32a..ff07b403 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.27beta01 +PNGMIN = 1.2.27beta02 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 728ca26a..7422257c 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.27beta01 +PNGMIN = 1.2.27beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 2656a167..8ed2e830 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.27beta01 +PNGMIN = 1.2.27beta02 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index d8245df8..f4daa9e3 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.27beta01 +PNGMIN = 1.2.27beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index c117823f..afc9b9d8 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.27beta01 +PNGMIN = 1.2.27beta02 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index c9c750e8..0a70c876 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.27beta01 +PNGMIN = 1.2.27beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 9fc24618..a45c59be 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -14,7 +14,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.27beta01 +PNGMIN = 1.2.27beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 9e674a3f..3df81ec3 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.27beta01 +PNGMIN = 1.2.27beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 53f4996a..6d25c636 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.27beta01 +PNGMIN = 1.2.27beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 8d09ecca..07d48583 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.27beta01 +PNGMIN = 1.2.27beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 403c90f6..a7850580 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -6,7 +6,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.27beta01 +PNGMIN = 1.2.27beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 148b237f..0e01041a 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.27beta01 +PNGMIN = 1.2.27beta02 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 07149f3e..b8a3b2c9 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.27beta01 +SHLIB_MINOR= 1.2.27beta02 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 bee275ef..0b0ac944 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.27beta01 +SHLIB_MINOR= 1.2.27beta02 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 99705834..994e58a3 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -7,7 +7,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.27beta01 +PNGMIN = 1.2.27beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index fed4e6be..9fbbbbea 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.27beta01 +SHLIB_MINOR= 1.2.27beta02 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 7030a385..5085c2c0 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.27beta01 +PNGMIN = 1.2.27beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 651f8865..59ec6630 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.27beta01 +PNGMIN = 1.2.27beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 753f029b..a253dbf8 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.27beta01 +PNGMIN = 1.2.27beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index f5a70816..000a4925 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.27beta01 +PNGMIN = 1.2.27beta02 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index a69d8d9a..b4b34d74 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.27beta01 +PNGMIN = 1.2.27beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index 24e5dc93..4524bc24 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.27beta01 +PNGMIN = 1.2.27beta02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index db6c5768..574467e0 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.27beta01 +; Version 1.2.27beta02 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index a75f8a67..8aef024b 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.27beta01 +;Version 1.2.27beta02 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3