diff options
52 files changed, 127 insertions, 121 deletions
@@ -1,5 +1,5 @@ -Libpng 1.2.22beta3 - October 6, 2007 +Libpng 1.2.22beta4 - October 7, 2007 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.22beta3.tar.gz - libpng-1.2.22beta3.tar.bz2 + libpng-1.2.22beta4.tar.gz + libpng-1.2.22beta4.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.22beta3-no-config.tar.gz - libpng-1.2.22beta3-no-config.tar.bz2 + libpng-1.2.22beta4-no-config.tar.gz + libpng-1.2.22beta4-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1222b03.zip - lp1222b03.tar.bz2 + lp1222b04.zip + lp1222b04.tar.bz2 Project files - libpng-1.2.22beta3-project-netware.zip - libpng-1.2.22beta3-project-wince.zip + libpng-1.2.22beta4-project-netware.zip + libpng-1.2.22beta4-project-wince.zip Other information: - libpng-1.2.22beta3-README.txt - libpng-1.2.22beta3-KNOWNBUGS.txt - libpng-1.2.22beta3-LICENSE.txt - libpng-1.2.22beta3-Y2K-compliance.txt + libpng-1.2.22beta4-README.txt + libpng-1.2.22beta4-KNOWNBUGS.txt + libpng-1.2.22beta4-LICENSE.txt + libpng-1.2.22beta4-Y2K-compliance.txt Changes since the last public release (1.2.19): @@ -62,7 +62,7 @@ version 1.2.20rc2 [August 27, 2007] Revised #ifdefs to ensure one and only one of pnggccrd.c, pngvcrd.c, or part of pngrutil.c is selected. -version 1.2.20rc3 [October 6, 2007] +version 1.2.20rc3 [October 7, 2007] Remove a little more code in pngwutil.c when PNG_NO_WRITE_FILTER is selected. Added /D _CRT_SECURE_NO_WARNINGS to visual6c and visualc71 projects. Compile png_mmx_support() in png.c even when PNG_NO_MMX_CODE is defined. @@ -120,6 +120,9 @@ version 1.2.22beta2 [October 5, 2007] version 1.2.22beta3 [October 6, 2007] Fix two off-by-one terminating NULL after png_strncpy(). +version 1.2.22beta4 [October 7, 2007] + Changed some 0 to '\0'. + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit @@ -1977,6 +1977,9 @@ version 1.2.22beta2 [October 5, 2007] version 1.2.22beta3 [October 6, 2007] Fix two off-by-one terminating NULL after png_strncpy(). +version 1.2.22beta4 [October 7, 2007] + Changed some 0 to '\0'. + 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.22beta3 - October 6, 2007 +Installing libpng version 1.2.22beta4 - October 7, 2007 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.22beta3" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.2.22beta4" 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.22beta3) + gcc, creates libpng12.so.0.1.2.22beta4) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.22beta3) + (gcc, creates libpng12.so.0.1.2.22beta4) 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.22beta3) + creates libpng12.so.0.1.2.22beta4) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.22beta3) + creates libpng12.so.0.1.2.22beta4) makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc, - creates libpng12.so.0.1.2.22beta3) + creates libpng12.so.0.1.2.22beta4) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.22beta3) + creates libpng12.so.0.1.2.22beta4) 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.22beta3 +Known bugs in libpng version 1.2.22beta4 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.22beta3, October 6, 2007, are +libpng versions 1.2.6, August 15, 2004, through 1.2.22beta4, October 7, 2007, are Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -106,4 +106,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -October 6, 2007 +October 7, 2007 @@ -1,4 +1,4 @@ -README for libpng version 1.2.22beta3 - October 6, 2007 (shared library 12.0) +README for libpng version 1.2.22beta4 - October 7, 2007 (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.22beta3) + gcc, creates libpng12.so.0.1.2.22beta4) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.22beta3) + (gcc, creates libpng12.so.0.1.2.22beta4) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.22beta3, + (gcc, creates libpng12.so.0.1.2.22beta4, 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.22beta3) + (gcc, creates libpng12.so.0.1.2.22beta4) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.22beta3) + (gcc, creates libpng12.so.0.1.2.22beta4) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.22beta3) + (gcc, creates libpng12.so.0.1.2.22beta4) 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: ========================= - October 6, 2007 + October 7, 2007 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.22beta3 are Y2K compliant. It is my belief that earlier + upward through 1.2.22beta4 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.22beta3. +# Generated by GNU Autoconf 2.61 for libpng 1.2.22beta4. # # 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.22beta3' -PACKAGE_STRING='libpng 1.2.22beta3' +PACKAGE_VERSION='1.2.22beta4' +PACKAGE_STRING='libpng 1.2.22beta4' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' ac_unique_file="pngget.c" @@ -1405,7 +1405,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.22beta3 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.22beta4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1475,7 +1475,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.2.22beta3:";; + short | recursive ) echo "Configuration of libpng 1.2.22beta4:";; esac cat <<\_ACEOF @@ -1585,7 +1585,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.2.22beta3 +libpng configure 1.2.22beta4 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1599,7 +1599,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.22beta3, which was +It was created by libpng $as_me 1.2.22beta4, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2269,7 +2269,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.2.22beta3' + VERSION='1.2.22beta4' cat >>confdefs.h <<_ACEOF @@ -2440,7 +2440,7 @@ fi -PNGLIB_VERSION=1.2.22beta3 +PNGLIB_VERSION=1.2.22beta4 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=22 @@ -21282,7 +21282,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.22beta3, which was +This file was extended by libpng $as_me 1.2.22beta4, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21335,7 +21335,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -libpng config.status 1.2.22beta3 +libpng config.status 1.2.22beta4 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 f4774da63..f9df219ae 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.22beta3], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.22beta4], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.22beta3 +PNGLIB_VERSION=1.2.22beta4 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=22 diff --git a/libpng-1.2.22beta3.txt b/libpng-1.2.22beta4.txt index f87e7a20f..4915abcb1 100644 --- a/libpng-1.2.22beta3.txt +++ b/libpng-1.2.22beta4.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.22beta3 - October 6, 2007 + libpng version 1.2.22beta4 - October 7, 2007 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2007 Glenn Randers-Pehrson @@ -2796,13 +2796,13 @@ application: IX. Y2K Compliance in libpng -October 6, 2007 +October 7, 2007 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.22beta3 are Y2K compliant. It is my belief that earlier +upward through 1.2.22beta4 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 "October 6, 2007" +.TH LIBPNG 3 "October 7, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.22beta3 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.22beta4 .SH SYNOPSIS \fB #include <png.h>\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.22beta3 - October 6, 2007 + libpng version 1.2.22beta4 - October 7, 2007 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2007 Glenn Randers-Pehrson @@ -3206,13 +3206,13 @@ application: .SH IX. Y2K Compliance in libpng -October 6, 2007 +October 7, 2007 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.22beta3 are Y2K compliant. It is my belief that earlier +upward through 1.2.22beta4 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 @@ -3415,7 +3415,7 @@ the first widely used release: 1.2.21rc1-3 13 10221 12.so.0.21[.0] 1.0.29 10 10029 10.so.0.29[.0] 1.2.21 13 10221 12.so.0.21[.0] - 1.2.22beta1-3 13 10222 12.so.0.22[.0] + 1.2.22beta1-4 13 10222 12.so.0.22[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3471,7 +3471,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.22beta3 - October 6, 2007: +Libpng version 1.2.22beta4 - October 7, 2007: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -3492,7 +3492,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.22beta3, October 6, 2007, are +libpng versions 1.2.6, August 15, 2004, through 1.2.22beta4, October 7, 2007, are Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -3591,7 +3591,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -October 6, 2007 +October 7, 2007 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index ef075c3b7..26a1918ed 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "October 6, 2007" +.TH LIBPNGPF 3 "October 7, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.22beta3 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.22beta4 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "October 6, 2007" +.TH PNG 5 "October 7, 2007" .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_22beta3 Your_png_h_is_not_version_1_2_22beta3; +typedef version_1_2_22beta4 Your_png_h_is_not_version_1_2_22beta4; /* 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.22beta3 - October 6, 2007\n\ + return ((png_charp) "\n libpng version 1.2.22beta4 - October 7, 2007\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.22beta3 - October 6, 2007 + * libpng version 1.2.22beta4 - October 7, 2007 * Copyright (c) 1998-2007 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.22beta3 - October 6, 2007: Glenn + * libpng versions 0.97, January 1998, through 1.2.22beta4 - October 7, 2007: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -164,7 +164,7 @@ * 1.2.21rc1-3 13 10221 12.so.0.21[.0] * 1.0.29 10 10029 10.so.0.29[.0] * 1.2.21 13 10221 12.so.0.21[.0] - * 1.2.22beta1-3 13 10222 12.so.0.22[.0] + * 1.2.22beta1-4 13 10222 12.so.0.22[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -194,7 +194,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.22beta3, October 6, 2007, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.22beta4, October 7, 2007, are * Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.2.5 * with the following individual added to the list of Contributing Authors: @@ -306,13 +306,13 @@ * Y2K compliance in libpng: * ========================= * - * October 6, 2007 + * October 7, 2007 * * 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.22beta3 are Y2K compliant. It is my belief that earlier + * upward through 1.2.22beta4 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 @@ -368,9 +368,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.22beta3" +#define PNG_LIBPNG_VER_STRING "1.2.22beta4" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.22beta3 - October 6, 2007\n" + " libpng version 1.2.22beta4 - October 7, 2007\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 @@ -382,7 +382,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 3 +#define PNG_LIBPNG_VER_BUILD 4 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -1417,7 +1417,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_22beta3; +typedef png_structp version_1_2_22beta4; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.22beta3 - October 6, 2007 + * libpng version 1.2.22beta4 - October 7, 2007 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2007 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngerror.c b/pngerror.c index 3a8c92253..b3cfe465e 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * Last changed in libpng 1.2.20 September 7, 2007 + * Last changed in libpng 1.2.22 [October 7, 2007] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2007 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -160,13 +160,13 @@ png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp } if (error_message == NULL) - buffer[iout] = 0; + buffer[iout] = '\0'; else { buffer[iout++] = ':'; buffer[iout++] = ' '; png_strncpy(buffer+iout, error_message, 63); - buffer[iout+63] = 0; + buffer[iout+63] = '\0'; } } diff --git a/pngpread.c b/pngpread.c index edc920227..81a9fd1b7 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.21 October 4, 2007 + * Last changed in libpng 1.2.22 [October 7, 2007] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2007 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1492,7 +1492,7 @@ png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 #endif png_strncpy((png_charp)png_ptr->unknown_chunk.name, (png_charp)png_ptr->chunk_name, 4); - png_ptr->chunk_name[4]=0; + png_ptr->unknown_chunk.name[4] = '\0'; png_ptr->unknown_chunk.data = (png_bytep)png_malloc(png_ptr, length); png_ptr->unknown_chunk.size = (png_size_t)length; png_crc_read(png_ptr, (png_bytep)png_ptr->unknown_chunk.data, length); diff --git a/pngrtran.c b/pngrtran.c index 5f497dc6a..76db0ccfc 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,7 +1,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.2.22 [October 6, 2007] + * Last changed in libpng 1.2.22 [October 7, 2007] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2007 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrutil.c b/pngrutil.c index 2427a29c5..835cd1bda 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.21 October 4, 2007 + * Last changed in libpng 1.2.22 [October 7, 2007] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2007 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -2225,7 +2225,7 @@ png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) #endif png_strncpy((png_charp)png_ptr->unknown_chunk.name, (png_charp)png_ptr->chunk_name, 4); - png_ptr->unknown_chunk.name[4]=0; + png_ptr->unknown_chunk.name[4] = '\0'; png_ptr->unknown_chunk.data = (png_bytep)png_malloc(png_ptr, length); png_ptr->unknown_chunk.size = (png_size_t)length; png_crc_read(png_ptr, (png_bytep)png_ptr->unknown_chunk.data, length); @@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.2.21 [October 6, 2007] + * Last changed in libpng 1.2.22 [October 7, 2007] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2007 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -691,7 +691,7 @@ png_set_iCCP(png_structp png_ptr, png_infop info_ptr, return; } png_strncpy(new_iccp_name, name, png_strlen(name)); - new_iccp_name[png_strlen(name)]=0; + new_iccp_name[png_strlen(name)] = '\0'; new_iccp_profile = (png_charp)png_malloc_warn(png_ptr, proflen); if (new_iccp_profile == NULL) { @@ -982,7 +982,7 @@ png_set_sPLT(png_structp png_ptr, } /* TODO: use png_malloc_warn */ png_strncpy(to->name, from->name, png_strlen(from->name)); - to->name[png_strlen(from->name)]=0; + to->name[png_strlen(from->name)] = '\0'; to->entries = (png_sPLT_entryp)png_malloc_warn(png_ptr, from->nentries * png_sizeof(png_sPLT_entry)); /* TODO: use png_malloc_warn */ @@ -1040,7 +1040,7 @@ png_set_unknown_chunks(png_structp png_ptr, png_unknown_chunkp from = unknowns + i; png_strncpy((png_charp)to->name, (png_charp)from->name, 4); - to->name[4]=0; + to->name[4] = '\0'; to->data = (png_bytep)png_malloc_warn(png_ptr, from->size); if (to->data == NULL) { @@ -1,7 +1,7 @@ /* pngtest.c - a simple test program to test libpng * - * Last changed in libpng 1.2.6 - August 15, 2004 + * Last changed in libpng 1.2.22 - [October 7, 2007] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2004 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1007,7 +1007,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) we use it */ png_strncpy(tIME_string,png_convert_to_rfc1123(read_ptr, mod_time),29); - tIME_string[29]=0; + tIME_string[29] = '\0'; tIME_chunk_present++; #endif /* PNG_TIME_RFC1123_SUPPORTED */ } @@ -1149,7 +1149,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) we use it */ png_strncpy(tIME_string,png_convert_to_rfc1123(read_ptr, mod_time),29); - tIME_string[29]=0; + tIME_string[29] = '\0'; tIME_chunk_present++; #endif /* PNG_TIME_RFC1123_SUPPORTED */ } @@ -1550,4 +1550,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_22beta3 your_png_h_is_not_version_1_2_22beta3; +typedef version_1_2_22beta4 your_png_h_is_not_version_1_2_22beta4; diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index b2af2dc5b..7e05e3425 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.22beta3 +# VERSION 0.${PNGLIB_RELEASE}.1.2.22beta4 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 a83aa2f61..86e39758a 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.22beta3 +version=1.2.22beta4 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc-configure.in b/scripts/libpng.pc-configure.in index eb53f8dac..888853ba5 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.22beta3 +Version: 1.2.22beta4 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} @LIBPNG_NO_MMX@ diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 760377e4e..df3bfdb95 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.22beta3 +Version: 1.2.22beta4 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 5ec621e4d..6eede99ba 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.22beta3 +PNGMIN = 1.2.22beta4 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 8498dd5ef..693d41db4 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.22beta3 +PNGMIN = 1.2.22beta4 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 22958ddad..6750b4799 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.22beta3 +PNGMIN = 1.2.22beta4 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 8045362b7..95c8ea57d 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.22beta3 +PNGMIN = 1.2.22beta4 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index e2efcf735..97bf04d59 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.22beta3 +PNGMIN = 1.2.22beta4 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 36c4eb44d..4e143650b 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.22beta3 +PNGMIN = 1.2.22beta4 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 0642500fb..74d18e1c3 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.22beta3 +PNGMIN = 1.2.22beta4 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index ad9026709..7cc4a00b6 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.22beta3 +PNGMIN = 1.2.22beta4 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index acd03e9a3..293457aa8 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -14,7 +14,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.22beta3 +PNGMIN = 1.2.22beta4 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 0e74f4a50..fd9f47d24 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.22beta3 +PNGMIN = 1.2.22beta4 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 67f574c1e..77d6fe312 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.22beta3 +PNGMIN = 1.2.22beta4 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 28a82d5fd..1e6b021ef 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.22beta3 +PNGMIN = 1.2.22beta4 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index bc0d96fb5..bb1877aa7 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -6,7 +6,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.22beta3 +PNGMIN = 1.2.22beta4 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 189d8a32f..e3619fb66 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.22beta3 +PNGMIN = 1.2.22beta4 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 08a02e60d..c1a2227c8 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.22beta3 +SHLIB_MINOR= 1.2.22beta4 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 531e6f32b..90f6bcc32 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.22beta3 +SHLIB_MINOR= 1.2.22beta4 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 8dd98a55c..a8b679b5a 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -7,7 +7,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.22beta3 +PNGMIN = 1.2.22beta4 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index f40e00b47..7f817e0e3 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.22beta3 +SHLIB_MINOR= 1.2.22beta4 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index ee7a53430..41dc3cc4b 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.22beta3 +PNGMIN = 1.2.22beta4 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 9ef1b6cdf..608b2e0b1 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.22beta3 +PNGMIN = 1.2.22beta4 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 3e204aa4a..42965ad17 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.22beta3 +PNGMIN = 1.2.22beta4 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index e05e11099..d00e63a67 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.22beta3 +PNGMIN = 1.2.22beta4 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 588ea450e..20327de0c 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.22beta3 +PNGMIN = 1.2.22beta4 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index fb085d678..0b272aa5a 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.22beta3 +PNGMIN = 1.2.22beta4 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index b60b9aa34..a460521f0 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.22beta3 +; Version 1.2.22beta4 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index 8a3508d38..0188f059f 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.22beta3 +;Version 1.2.22beta4 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 |