diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2008-03-26 09:53:56 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-04-06 16:16:27 -0500 |
| commit | b8f615d7a164bf476241662ee3fc8f278de529ec (patch) | |
| tree | 5306bcb9cc173c86f83b632028e5a38425ab6877 | |
| parent | 35d97eb5c51a0ba99a2e22724e62fe8b56383d12 (diff) | |
| download | libpng-1.2.26rc01.tar.gz | |
Imported from libpng-1.2.26rc01.tarv1.2.26rc01
51 files changed, 132 insertions, 116 deletions
@@ -1,5 +1,5 @@ -Libpng 1.2.26beta06 - March 20, 2008 +Libpng 1.2.26rc01 - March 26, 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.26beta06.tar.gz - libpng-1.2.26beta06.tar.lzma + libpng-1.2.26rc01.tar.gz + libpng-1.2.26rc01.tar.lzma (Get the lzma codec from <http://tukaani.org/lzma>). - libpng-1.2.26beta06.tar.bz2 + libpng-1.2.26rc01.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.26beta06-no-config.tar.gz - libpng-1.2.26beta06-no-config.tar.lzma - libpng-1.2.26beta06-no-config.tar.bz2 + libpng-1.2.26rc01-no-config.tar.gz + libpng-1.2.26rc01-no-config.tar.lzma + libpng-1.2.26rc01-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1226b06.zip - lp1226b06.7z - lp1226b06.tar.bz2 + lp1226r01.zip + lp1226r01.7z + lp1226r01.tar.bz2 Project files - libpng-1.2.26beta06-project-netware.zip - libpng-1.2.26beta06-project-wince.zip + libpng-1.2.26rc01-project-netware.zip + libpng-1.2.26rc01-project-wince.zip Other information: - libpng-1.2.26beta06-README.txt - libpng-1.2.26beta06-KNOWNBUGS.txt - libpng-1.2.26beta06-LICENSE.txt - libpng-1.2.26beta06-Y2K-compliance.txt - libpng-1.2.26beta06-[previous version]-diff.txt + libpng-1.2.26rc01-README.txt + libpng-1.2.26rc01-KNOWNBUGS.txt + libpng-1.2.26rc01-LICENSE.txt + libpng-1.2.26rc01-Y2K-compliance.txt + libpng-1.2.26rc01-[previous version]-diff.txt Changes since the last public release (1.2.25): @@ -61,9 +61,12 @@ version 1.2.26beta04 [March 18, 2008] version 1.2.26beta05 [March 19, 2008] Removed extra png_free() added in libpng-1.2.26beta04. -version 1.2.26beta06 [March 20, 2008] +version 1.2.26beta06 [March 19, 2008] Avoid reallocating big_row_buf and prev_row when the size does not increase. +version 1.2.26rc01 [March 26, 2008] + Ifdef out some code that is unused when interlacing is not supported. + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit @@ -2094,9 +2094,12 @@ version 1.2.26beta04 [March 18, 2008] version 1.2.26beta05 [March 19, 2008] Removed extra png_free() added in libpng-1.2.26beta04. -version 1.2.26beta06 [March 20, 2008] +version 1.2.26beta06 [March 19, 2008] Avoid reallocating big_row_buf and prev_row when the size does not increase. +version 1.2.26rc01 [March 26, 2008] + Ifdef out some code that is unused when interlacing is not supported. + 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.26beta06 - March 20, 2008 +Installing libpng version 1.2.26rc01 - March 26, 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.26beta06" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.2.26rc01" 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.26beta06) + gcc, creates libpng12.so.0.1.2.26rc01) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.26beta06) + (gcc, creates libpng12.so.0.1.2.26rc01) 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.26beta06) + creates libpng12.so.0.1.2.26rc01) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.26beta06) + creates libpng12.so.0.1.2.26rc01) makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc, - creates libpng12.so.0.1.2.26beta06) + creates libpng12.so.0.1.2.26rc01) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.26beta06) + creates libpng12.so.0.1.2.26rc01) 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.26beta06 +Known bugs in libpng version 1.2.26rc01 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.26beta06, March 20, 2008, are +libpng versions 1.2.6, August 15, 2004, through 1.2.26rc01, March 26, 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 -March 20, 2008 +March 26, 2008 @@ -1,4 +1,4 @@ -README for libpng version 1.2.26beta06 - March 20, 2008 (shared library 12.0) +README for libpng version 1.2.26rc01 - March 26, 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.26beta06) + gcc, creates libpng12.so.0.1.2.26rc01) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.26beta06) + (gcc, creates libpng12.so.0.1.2.26rc01) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.26beta06, + (gcc, creates libpng12.so.0.1.2.26rc01, 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.26beta06) + (gcc, creates libpng12.so.0.1.2.26rc01) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.26beta06) + (gcc, creates libpng12.so.0.1.2.26rc01) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.26beta06) + (gcc, creates libpng12.so.0.1.2.26rc01) 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: ========================= - March 20, 2008 + March 26, 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.26beta06 are Y2K compliant. It is my belief that earlier + upward through 1.2.26rc01 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.26beta06. +# Generated by GNU Autoconf 2.61 for libpng 1.2.26rc01. # # 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.26beta06' -PACKAGE_STRING='libpng 1.2.26beta06' +PACKAGE_VERSION='1.2.26rc01' +PACKAGE_STRING='libpng 1.2.26rc01' 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.26beta06 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.26rc01 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.26beta06:";; + short | recursive ) echo "Configuration of libpng 1.2.26rc01:";; 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.26beta06 +libpng configure 1.2.26rc01 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.26beta06, which was +It was created by libpng $as_me 1.2.26rc01, 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.26beta06' + VERSION='1.2.26rc01' cat >>confdefs.h <<_ACEOF @@ -2441,7 +2441,7 @@ fi -PNGLIB_VERSION=1.2.26beta06 +PNGLIB_VERSION=1.2.26rc01 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=26 @@ -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.26beta06, which was +This file was extended by libpng $as_me 1.2.26rc01, 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.26beta06 +libpng config.status 1.2.26rc01 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 3bb683048..f08460c53 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.26beta06], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.26rc01], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.26beta06 +PNGLIB_VERSION=1.2.26rc01 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=26 diff --git a/libpng-1.2.26beta06.txt b/libpng-1.2.26rc01.txt index cf760c688..86fce0788 100644 --- a/libpng-1.2.26beta06.txt +++ b/libpng-1.2.26rc01.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.26beta06 - March 20, 2008 + libpng version 1.2.26rc01 - March 26, 2008 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2008 Glenn Randers-Pehrson @@ -2796,13 +2796,13 @@ application: IX. Y2K Compliance in libpng -March 20, 2008 +March 26, 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.26beta06 are Y2K compliant. It is my belief that earlier +upward through 1.2.26rc01 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 "March 20, 2008" +.TH LIBPNG 3 "March 26, 2008" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.26beta06 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.26rc01 .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.26beta06 - March 20, 2008 + libpng version 1.2.26rc01 - March 26, 2008 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2008 Glenn Randers-Pehrson @@ -3617,13 +3617,13 @@ application: .SH IX. Y2K Compliance in libpng -March 20, 2008 +March 26, 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.26beta06 are Y2K compliant. It is my belief that earlier +upward through 1.2.26rc01 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 @@ -3841,7 +3841,8 @@ the first widely used release: 1.2.25rc01-02 13 10225 12.so.0.25[.0] 1.0.31 10 10031 10.so.0.31[.0] 1.2.25 13 10225 12.so.0.25[.0] - 1.2.26beta01-04 13 10226 12.so.0.26[.0] + 1.2.26beta01-06 13 10226 12.so.0.26[.0] + 1.2.26rc01 13 10226 12.so.0.26[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3897,7 +3898,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.26beta06 - March 20, 2008: +Libpng version 1.2.26rc01 - March 26, 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). @@ -3918,7 +3919,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.26beta06, March 20, 2008, are +libpng versions 1.2.6, August 15, 2004, through 1.2.26rc01, March 26, 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 @@ -4017,7 +4018,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 20, 2008 +March 26, 2008 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 73bcfae49..cca2ec91a 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "March 20, 2008" +.TH LIBPNGPF 3 "March 26, 2008" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.26beta06 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.26rc01 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "March 20, 2008" +.TH PNG 5 "March 26, 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_26beta06 Your_png_h_is_not_version_1_2_26beta06; +typedef version_1_2_26rc01 Your_png_h_is_not_version_1_2_26rc01; /* 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.26beta06 - March 20, 2008\n\ + return ((png_charp) "\n libpng version 1.2.26rc01 - March 26, 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"); @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.26beta06 - March 20, 2008 + * libpng version 1.2.26rc01 - March 26, 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.26beta06 - March 20, 2008: Glenn + * libpng versions 0.97, January 1998, through 1.2.26rc01 - March 26, 2008: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -179,7 +179,8 @@ * 1.2.25rc01-02 13 10225 12.so.0.25[.0] * 1.0.31 10 10031 10.so.0.31[.0] * 1.2.25 13 10225 12.so.0.25[.0] - * 1.2.26beta01-04 13 10226 12.so.0.26[.0] + * 1.2.26beta01-06 13 10226 12.so.0.26[.0] + * 1.2.26rc01 13 10226 12.so.0.26[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -209,7 +210,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.26beta06, March 20, 2008, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.26rc01, March 26, 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: @@ -321,13 +322,13 @@ * Y2K compliance in libpng: * ========================= * - * March 20, 2008 + * March 26, 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.26beta06 are Y2K compliant. It is my belief that earlier + * upward through 1.2.26rc01 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 @@ -383,9 +384,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.26beta06" +#define PNG_LIBPNG_VER_STRING "1.2.26rc01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.26beta06 - March 20, 2008\n" + " libpng version 1.2.26rc01 - March 26, 2008\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 @@ -397,7 +398,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 06 +#define PNG_LIBPNG_VER_BUILD 01 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -414,7 +415,7 @@ #define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with PNG_LIBPNG_BUILD_PRIVATE */ -#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA +#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_RC /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -1438,7 +1439,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_26beta06; +typedef png_structp version_1_2_26rc01; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.26beta06 - March 20, 2008 + * libpng version 1.2.26rc01 - March 26, 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) @@ -1,7 +1,7 @@ /* pngmem.c - stub functions for memory allocation * - * Last changed in libpng 1.2.26 [March 20, 2008] + * Last changed in libpng 1.2.26 [March 26, 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 5e570c079..57fe4dc87 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.26 [March 20, 2008] + * Last changed in libpng 1.2.26 [March 26, 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/pngrutil.c b/pngrutil.c index 9e5372b90..15a7f24e0 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.26 [March 20, 2008] + * Last changed in libpng 1.2.26 [March 26, 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) @@ -2851,6 +2851,7 @@ void /* PRIVATE */ png_read_finish_row(png_structp png_ptr) { #ifdef PNG_USE_LOCAL_ARRAYS +#ifdef PNG_READ_INTERLACING_SUPPORTED /* arrays to facilitate easy interlacing - use pass (0 - 6) as index */ /* start of interlace block */ @@ -2864,6 +2865,7 @@ png_read_finish_row(png_structp png_ptr) /* offset to next interlace block in the y direction */ PNG_CONST int png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2}; +#endif /* PNG_READ_INTERLACING_SUPPORTED */ #endif png_debug(1, "in png_read_finish_row\n"); @@ -2871,6 +2873,7 @@ png_read_finish_row(png_structp png_ptr) if (png_ptr->row_number < png_ptr->num_rows) return; +#ifdef PNG_READ_INTERLACING_SUPPORTED if (png_ptr->interlaced) { png_ptr->row_number = 0; @@ -2905,6 +2908,7 @@ png_read_finish_row(png_structp png_ptr) if (png_ptr->pass < 7) return; } +#endif /* PNG_READ_INTERLACING_SUPPORTED */ if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED)) { @@ -2979,6 +2983,7 @@ void /* PRIVATE */ png_read_start_row(png_structp png_ptr) { #ifdef PNG_USE_LOCAL_ARRAYS +#ifdef PNG_READ_INTERLACING_SUPPORTED /* arrays to facilitate easy interlacing - use pass (0 - 6) as index */ /* start of interlace block */ @@ -2993,6 +2998,7 @@ png_read_start_row(png_structp png_ptr) /* offset to next interlace block in the y direction */ PNG_CONST int png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2}; #endif +#endif int max_pixel_depth; png_uint_32 row_bytes; @@ -3000,6 +3006,7 @@ png_read_start_row(png_structp png_ptr) png_debug(1, "in png_read_start_row\n"); png_ptr->zstream.avail_in = 0; png_init_read_transformations(png_ptr); +#ifdef PNG_READ_INTERLACING_SUPPORTED if (png_ptr->interlaced) { if (!(png_ptr->transformations & PNG_INTERLACE)) @@ -3020,6 +3027,7 @@ png_read_start_row(png_structp png_ptr) png_error(png_ptr, "Rowbytes overflow in png_read_start_row"); } else +#endif /* PNG_READ_INTERLACING_SUPPORTED */ { png_ptr->num_rows = png_ptr->height; png_ptr->iwidth = png_ptr->width; @@ -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_26beta06 your_png_h_is_not_version_1_2_26beta06; +typedef version_1_2_26rc01 your_png_h_is_not_version_1_2_26rc01; diff --git a/pngwutil.c b/pngwutil.c index 16f3356d7..d0e245f39 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * Last changed in libpng 1.2.26 [March 20, 2008] + * Last changed in libpng 1.2.26 [March 26, 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 6bd8c69cc..175160ec9 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.26beta06 +# VERSION 0.${PNGLIB_RELEASE}.1.2.26rc01 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 d8c0dbe2f..893daa3bf 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.26beta06 +version=1.2.26rc01 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc-configure.in b/scripts/libpng.pc-configure.in index 156d2511a..f3c430142 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.26beta06 +Version: 1.2.26rc01 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} @LIBPNG_NO_MMX@ diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 852c8d0fd..0661d6ad4 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.26beta06 +Version: 1.2.26rc01 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 13bf61f9b..4038be291 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta06 +PNGMIN = 1.2.26rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 50e8ac5dc..bf54c341d 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta06 +PNGMIN = 1.2.26rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 0d9aac8f2..6a9aa4bc0 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.26beta06 +PNGMIN = 1.2.26rc01 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index b377c4e59..9ce89ec03 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta06 +PNGMIN = 1.2.26rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 57c8b0b51..20bf6718f 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.26beta06 +PNGMIN = 1.2.26rc01 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index e8694a686..62eab91ec 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta06 +PNGMIN = 1.2.26rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index f9ea938c3..228926fee 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.26beta06 +PNGMIN = 1.2.26rc01 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 2a7853a76..95d423ac0 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta06 +PNGMIN = 1.2.26rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index e87b05932..de731eafd 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -14,7 +14,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta06 +PNGMIN = 1.2.26rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 84f819ac6..858c3dd6f 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.26beta06 +PNGMIN = 1.2.26rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index a507f0a8f..50fa45793 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta06 +PNGMIN = 1.2.26rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index a72c57648..10cb306a6 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.26beta06 +PNGMIN = 1.2.26rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 43c7608e8..38d5c4cad 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -6,7 +6,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta06 +PNGMIN = 1.2.26rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 3c4ad6ff5..4b0f026d9 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.26beta06 +PNGMIN = 1.2.26rc01 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 3c60c51e2..1f97bc20b 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.26beta06 +SHLIB_MINOR= 1.2.26rc01 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 3ec44b686..cfea02cd6 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.26beta06 +SHLIB_MINOR= 1.2.26rc01 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 889bad61e..09b74dc8e 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -7,7 +7,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta06 +PNGMIN = 1.2.26rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 54b97503d..e48c10fae 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.26beta06 +SHLIB_MINOR= 1.2.26rc01 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index fb2cb17e6..4d39d8cf2 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta06 +PNGMIN = 1.2.26rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 537d4fad8..b7f7cdcd1 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta06 +PNGMIN = 1.2.26rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 989fdca7e..c499ab098 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta06 +PNGMIN = 1.2.26rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index fd3862901..7fc38712a 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.26beta06 +PNGMIN = 1.2.26rc01 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 91d9921cb..22222a774 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta06 +PNGMIN = 1.2.26rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index c00bab096..01557562e 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.26beta06 +PNGMIN = 1.2.26rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index aa37d86ce..47c98134d 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.26beta06 +; Version 1.2.26rc01 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index fcb0b2cbb..0ac8b70ac 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.26beta06 +;Version 1.2.26rc01 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 |