diff options
54 files changed, 184 insertions, 156 deletions
@@ -1,5 +1,5 @@ -Libpng 1.2.17beta1 - March 6, 2007 +Libpng 1.2.17beta2 - April 26, 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,38 +9,42 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.2.17beta1.tar.gz - libpng-1.2.17beta1.tar.bz2 + libpng-1.2.17beta2.tar.gz + libpng-1.2.17beta2.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.17beta1-no-config.tar.gz - libpng-1.2.17beta1-no-config.tar.bz2 + libpng-1.2.17beta2-no-config.tar.gz + libpng-1.2.17beta2-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1217b01.zip - lp1217b01.tar.bz2 + lp1217b02.zip + lp1217b02.tar.bz2 Project files - libpng-1.2.17beta1-project-netware.zip - libpng-1.2.17beta1-project-wince.zip + libpng-1.2.17beta2-project-netware.zip + libpng-1.2.17beta2-project-wince.zip Other information: - libpng-1.2.17beta1-README.txt - libpng-1.2.17beta1-KNOWNBUGS.txt - libpng-1.2.17beta1-LICENSE.txt - libpng-1.2.17beta1-Y2K-compliance.txt + libpng-1.2.17beta2-README.txt + libpng-1.2.17beta2-KNOWNBUGS.txt + libpng-1.2.17beta2-LICENSE.txt + libpng-1.2.17beta2-Y2K-compliance.txt Changes since the last public release (1.2.16): -version 1.2.17beta1 [March 6, 2007] +version 1.2.17beta1 [April 26, 2007] Revised scripts/CMakeLists.txt to install both shared and static libraries. Deleted a redundant line from pngset.c. + +version 1.2.17beta2 [April 26, 2007] + Relocated misplaced test for png_ptr == NULL in pngpread.c + Use "==" to "&" for testing PNG_RGB_TO_GRAY_ERR & PNG_RGB_TO_GRAY_WARN flags. Send comments/corrections/commendations to png-mng-implement at lists.sf.net @@ -1693,6 +1693,15 @@ version 1.2.17beta1 [March 6, 2007] Revised scripts/CMakeLists.txt to install both shared and static libraries. Deleted a redundant line from pngset.c. +version 1.2.17beta2 [April 26, 2007] + Relocated misplaced test for png_ptr == NULL in pngpread.c + Change "==" to "&" for testing PNG_RGB_TO_GRAY_ERR & PNG_RGB_TO_GRAY_WARN + flags. + Changed remaining instances of PNG_ASSEMBLER_* to PNG_MMX_* + Added pngerror() when write_IHDR fails in deflateInit2(). + Added "const" to some array declarations. + Mention examples of libpng usage in the libpng*.txt and libpng.3 documents. + 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.17beta1 - March 6, 2007 +Installing libpng version 1.2.17beta2 - April 26, 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.17beta1" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.2.17beta2" 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,14 +101,14 @@ 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.17beta1) + gcc, creates libpng12.so.0.1.2.17beta2) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.17beta1) + (gcc, creates libpng12.so.0.1.2.17beta2) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.17beta1, + (gcc, creates libpng12.so.0.1.2.17beta2, uses assembler code tuned for Intel MMX platform) makefile.nommx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.17beta1 + (gcc, creates libpng12.so.0.1.2.17beta2 does not use Intel MMX assembler code) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with @@ -131,12 +131,12 @@ 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.17beta1) + creates libpng12.so.0.1.2.17beta2) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.17beta1) + creates libpng12.so.0.1.2.17beta2) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.17beta1) + creates libpng12.so.0.1.2.17beta2) 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.17beta1 +Known bugs in libpng version 1.2.17beta2 1. April 22, 2001: pnggccrd.c has been reported to crash on NetBSD when reading interlaced PNG files, when assembler code is enabled but running @@ -21,3 +21,8 @@ Known bugs in libpng version 1.2.17beta1 STATUS: For now, system library builders should use the custom makefiles. +4. March 2007: Building 1.2.16 with PNG_ASSEMBLER_CODE_SUPPORTED; + PNG_MMX_CODE_SUPPORTED results in multiple definitions of png_combine_row, + png_do_read_interlace, and png_read_filter_row + + STATUS: Investigating. @@ -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.17beta1, March 6, 2007, are +libpng versions 1.2.6, August 15, 2004, through 1.2.17beta2, April 26, 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 -March 6, 2007 +April 26, 2007 @@ -1,4 +1,4 @@ -README for libpng version 1.2.17beta1 - March 6, 2007 (shared library 12.0) +README for libpng version 1.2.17beta2 - April 26, 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.17beta1) + gcc, creates libpng12.so.0.1.2.17beta2) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.17beta1) + (gcc, creates libpng12.so.0.1.2.17beta2) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.17beta1, + (gcc, creates libpng12.so.0.1.2.17beta2, 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.17beta1) + (gcc, creates libpng12.so.0.1.2.17beta2) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.17beta1) + (gcc, creates libpng12.so.0.1.2.17beta2) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.17beta1) + (gcc, creates libpng12.so.0.1.2.17beta2) 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 6, 2007 + April 26, 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.17beta1 are Y2K compliant. It is my belief that earlier + upward through 1.2.17beta2 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.17beta1. +# Generated by GNU Autoconf 2.61 for libpng 1.2.17beta2. # # 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.17beta1' -PACKAGE_STRING='libpng 1.2.17beta1' +PACKAGE_VERSION='1.2.17beta2' +PACKAGE_STRING='libpng 1.2.17beta2' 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.17beta1 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.17beta2 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.17beta1:";; + short | recursive ) echo "Configuration of libpng 1.2.17beta2:";; 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.17beta1 +libpng configure 1.2.17beta2 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.17beta1, which was +It was created by libpng $as_me 1.2.17beta2, 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.17beta1' + VERSION='1.2.17beta2' cat >>confdefs.h <<_ACEOF @@ -2440,7 +2440,7 @@ fi -PNGLIB_VERSION=1.2.17beta1 +PNGLIB_VERSION=1.2.17beta2 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=17 @@ -21119,7 +21119,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.17beta1, which was +This file was extended by libpng $as_me 1.2.17beta2, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21172,7 +21172,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -libpng config.status 1.2.17beta1 +libpng config.status 1.2.17beta2 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 f56f1544c..d2b997c28 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.17beta1], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.17beta2], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.17beta1 +PNGLIB_VERSION=1.2.17beta2 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=17 diff --git a/libpng-1.2.17beta1.txt b/libpng-1.2.17beta2.txt index d41170e13..7d8ac19fe 100644 --- a/libpng-1.2.17beta1.txt +++ b/libpng-1.2.17beta2.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.17beta1 - March 6, 2007 + libpng version 1.2.17beta2 - April 26, 2007 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2005 Glenn Randers-Pehrson @@ -33,6 +33,10 @@ it is heavily commented and should include everything most people will need. We assume that libpng is already installed; see the INSTALL file for instructions on how to install libpng. +For examples of libpng usage, see the files "example.c", "pngtest.c", +and the files in the "contrib" directory, all of which are included in the +libpng distribution. + Libpng was written as a companion to the PNG specification, as a way of reducing the amount of time and effort it takes to support the PNG file format in application programs. @@ -2917,13 +2921,13 @@ application: IX. Y2K Compliance in libpng -March 6, 2007 +April 26, 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.17beta1 are Y2K compliant. It is my belief that earlier +upward through 1.2.17beta2 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 6, 2007" +.TH LIBPNG 3 "April 26, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.17beta1 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.17beta2 .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.17beta1 - March 6, 2007 + libpng version 1.2.17beta2 - April 26, 2007 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2005 Glenn Randers-Pehrson @@ -443,6 +443,10 @@ it is heavily commented and should include everything most people will need. We assume that libpng is already installed; see the INSTALL file for instructions on how to install libpng. +For examples of libpng usage, see the files "example.c", "pngtest.c", +and the files in the "contrib" directory, all of which are included in the +libpng distribution. + Libpng was written as a companion to the PNG specification, as a way of reducing the amount of time and effort it takes to support the PNG file format in application programs. @@ -3327,13 +3331,13 @@ application: .SH IX. Y2K Compliance in libpng -March 6, 2007 +April 26, 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.17beta1 are Y2K compliant. It is my belief that earlier +upward through 1.2.17beta2 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 @@ -3515,7 +3519,7 @@ the first widely used release: 1.2.16rc1 13 10216 12.so.0.16[.0] 1.0.24 10 10024 10.so.0.24[.0] 1.2.16 13 10216 12.so.0.16[.0] - 1.2.17beta1 13 10217 12.so.0.17[.0] + 1.2.17beta1-2 13 10217 12.so.0.17[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3571,7 +3575,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.17beta1 - March 6, 2007: +Libpng version 1.2.17beta2 - April 26, 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). @@ -3592,8 +3596,8 @@ included in the libpng distribution, the latter shall prevail.) If you modify libpng you may insert additional notices immediately following this sentence. -libpng versions 1.2.6, August 15, 2004, through 1.2.17beta1, March 6, 2007, are -Copyright (c) 2004-2006 Glenn Randers-Pehrson, and are +libpng versions 1.2.6, August 15, 2004, through 1.2.17beta2, April 26, 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 @@ -3691,7 +3695,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 6, 2007 +April 26, 2007 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 9d26ed691..42fb34261 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "March 6, 2007" +.TH LIBPNGPF 3 "April 26, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.17beta1 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.17beta2 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "March 6, 2007" +.TH PNG 5 "April 26, 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_17beta1 Your_png_h_is_not_version_1_2_17beta1; +typedef version_1_2_17beta2 Your_png_h_is_not_version_1_2_17beta2; /* Version information for C files. This had better match the version * string defined in png.h. */ @@ -68,7 +68,7 @@ const int FARDATA png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1}; const int FARDATA png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2}; /* width of interlace block (used in assembler routines only) */ -#ifdef PNG_HAVE_ASSEMBLER_COMBINE_ROW +#ifdef PNG_HAVE_MMX_COMBINE_ROW const int FARDATA png_pass_width[] = {8, 4, 4, 2, 2, 1, 1}; #endif @@ -701,7 +701,7 @@ png_charp PNGAPI png_get_copyright(png_structp png_ptr) { if (&png_ptr != NULL) /* silence compiler warning about unused png_ptr */ - return ((png_charp) "\n libpng version 1.2.17beta1 - March 6, 2007\n\ + return ((png_charp) "\n libpng version 1.2.17beta2 - April 26, 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"); @@ -796,13 +796,13 @@ png_init_mmx_flags (png_structp png_ptr) if (png_mmx_support() > 0) { png_ptr->asm_flags |= PNG_ASM_FLAG_MMX_SUPPORT_IN_CPU -# ifdef PNG_HAVE_ASSEMBLER_COMBINE_ROW +# ifdef PNG_HAVE_MMX_COMBINE_ROW | PNG_ASM_FLAG_MMX_READ_COMBINE_ROW # endif -# ifdef PNG_HAVE_ASSEMBLER_READ_INTERLACE +# ifdef PNG_HAVE_MMX_READ_INTERLACE | PNG_ASM_FLAG_MMX_READ_INTERLACE # endif -# ifndef PNG_HAVE_ASSEMBLER_READ_FILTER_ROW +# ifndef PNG_HAVE_MMX_READ_FILTER_ROW ; # else | PNG_ASM_FLAG_MMX_READ_FILTER_SUB @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.17beta1 - March 6, 2007 + * libpng version 1.2.17beta2 - April 26, 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.17beta1 - March 6, 2007: Glenn + * libpng versions 0.97, January 1998, through 1.2.17beta2 - April 26, 2007: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -143,7 +143,7 @@ * 1.2.16rc1 13 10216 12.so.0.16[.0] * 1.0.24 10 10024 10.so.0.24[.0] * 1.2.16 13 10216 12.so.0.16[.0] - * 1.2.17beta1 13 10217 12.so.0.17[.0] + * 1.2.17beta1-2 13 10217 12.so.0.17[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -173,7 +173,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.17beta1, March 6, 2007, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.17beta2, April 26, 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: @@ -285,13 +285,13 @@ * Y2K compliance in libpng: * ========================= * - * March 6, 2007 + * April 26, 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.17beta1 are Y2K compliant. It is my belief that earlier + * upward through 1.2.17beta2 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 @@ -347,9 +347,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.17beta1" +#define PNG_LIBPNG_VER_STRING "1.2.17beta2" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.17beta1 - March 6, 2007 (header)\n" + " libpng version 1.2.17beta2 - April 26, 2007 (header)\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 @@ -361,7 +361,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 1 +#define PNG_LIBPNG_VER_BUILD 2 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -1395,7 +1395,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_17beta1; +typedef png_structp version_1_2_17beta2; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.17beta1 - March 6, 2007 + * libpng version 1.2.17beta2 - April 26, 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) @@ -1458,9 +1458,9 @@ typedef z_stream FAR * png_zstreamp; * MMX will be detected at run time and used if present. */ #ifdef PNG_USE_PNGVCRD -# define PNG_HAVE_ASSEMBLER_COMBINE_ROW -# define PNG_HAVE_ASSEMBLER_READ_INTERLACE -# define PNG_HAVE_ASSEMBLER_READ_FILTER_ROW +# define PNG_HAVE_MMX_COMBINE_ROW +# define PNG_HAVE_MMX_READ_INTERLACE +# define PNG_HAVE_MMX_READ_FILTER_ROW #endif /* Set this in the makefile for gcc/as on Pentium, not here. */ @@ -1468,9 +1468,9 @@ typedef z_stream FAR * png_zstreamp; * MMX will be detected at run time and used if present. */ #ifdef PNG_USE_PNGGCCRD -# define PNG_HAVE_ASSEMBLER_COMBINE_ROW -# define PNG_HAVE_ASSEMBLER_READ_INTERLACE -# define PNG_HAVE_ASSEMBLER_READ_FILTER_ROW +# define PNG_HAVE_MMX_COMBINE_ROW +# define PNG_HAVE_MMX_READ_INTERLACE +# define PNG_HAVE_MMX_READ_FILTER_ROW #endif /* - see pnggccrd.c for info about what is currently enabled */ diff --git a/pngerror.c b/pngerror.c index c8c58b91d..f50f65344 100644 --- a/pngerror.c +++ b/pngerror.c @@ -113,7 +113,7 @@ png_warning(png_structp png_ptr, png_const_charp warning_message) * if the character is invalid. */ #define isnonalpha(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97)) -static PNG_CONST char png_digit[16] = { +const static PNG_CONST char png_digit[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' }; diff --git a/pnggccrd.c b/pnggccrd.c index 7983f8ea1..fab523c0b 100644 --- a/pnggccrd.c +++ b/pnggccrd.c @@ -250,9 +250,9 @@ int PNGAPI png_mmx_support(void); #ifdef PNG_USE_LOCAL_ARRAYS -static const int FARDATA png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0}; -static const int FARDATA png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1}; -static const int FARDATA png_pass_width[7] = {8, 4, 4, 2, 2, 1, 1}; +const static int FARDATA png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0}; +const static int FARDATA png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1}; +const static int FARDATA png_pass_width[7] = {8, 4, 4, 2, 2, 1, 1}; #endif #if defined(PNG_MMX_CODE_SUPPORTED) @@ -311,30 +311,30 @@ static const int FARDATA png_pass_width[7] = {8, 4, 4, 2, 2, 1, 1}; static int _unmask; #endif -static unsigned long long _mask8_0 = 0x0102040810204080LL; +const static unsigned long long _mask8_0 = 0x0102040810204080LL; -static unsigned long long _mask16_1 = 0x0101020204040808LL; -static unsigned long long _mask16_0 = 0x1010202040408080LL; +const static unsigned long long _mask16_1 = 0x0101020204040808LL; +const static unsigned long long _mask16_0 = 0x1010202040408080LL; -static unsigned long long _mask24_2 = 0x0101010202020404LL; -static unsigned long long _mask24_1 = 0x0408080810101020LL; -static unsigned long long _mask24_0 = 0x2020404040808080LL; +const static unsigned long long _mask24_2 = 0x0101010202020404LL; +const static unsigned long long _mask24_1 = 0x0408080810101020LL; +const static unsigned long long _mask24_0 = 0x2020404040808080LL; -static unsigned long long _mask32_3 = 0x0101010102020202LL; -static unsigned long long _mask32_2 = 0x0404040408080808LL; -static unsigned long long _mask32_1 = 0x1010101020202020LL; -static unsigned long long _mask32_0 = 0x4040404080808080LL; +const static unsigned long long _mask32_3 = 0x0101010102020202LL; +const static unsigned long long _mask32_2 = 0x0404040408080808LL; +const static unsigned long long _mask32_1 = 0x1010101020202020LL; +const static unsigned long long _mask32_0 = 0x4040404080808080LL; -static unsigned long long _mask48_5 = 0x0101010101010202LL; -static unsigned long long _mask48_4 = 0x0202020204040404LL; -static unsigned long long _mask48_3 = 0x0404080808080808LL; -static unsigned long long _mask48_2 = 0x1010101010102020LL; -static unsigned long long _mask48_1 = 0x2020202040404040LL; -static unsigned long long _mask48_0 = 0x4040808080808080LL; +const static unsigned long long _mask48_5 = 0x0101010101010202LL; +const static unsigned long long _mask48_4 = 0x0202020204040404LL; +const static unsigned long long _mask48_3 = 0x0404080808080808LL; +const static unsigned long long _mask48_2 = 0x1010101010102020LL; +const static unsigned long long _mask48_1 = 0x2020202040404040LL; +const static unsigned long long _mask48_0 = 0x4040808080808080LL; -static unsigned long long _const4 = 0x0000000000FFFFFFLL; -//static unsigned long long _const5 = 0x000000FFFFFF0000LL; // NOT USED -static unsigned long long _const6 = 0x00000000000000FFLL; +const static unsigned long long _const4 = 0x0000000000FFFFFFLL; +//const static unsigned long long _const5 = 0x000000FFFFFF0000LL; // NOT USED +const static unsigned long long _const6 = 0x00000000000000FFLL; // These are used in the row-filter routines and should/would be local // variables if not for gcc addressing limitations. diff --git a/pngpread.c b/pngpread.c index d226c75d3..b787443cc 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1553,11 +1553,11 @@ void PNGAPI png_progressive_combine_row (png_structp png_ptr, png_bytep old_row, png_bytep new_row) { - if(png_ptr == NULL) return; #ifdef PNG_USE_LOCAL_ARRAYS const int FARDATA png_pass_dsp_mask[7] = {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55, 0xff}; #endif + if(png_ptr == NULL) return; if (new_row != NULL) /* new_row must == png_ptr->row_buf here. */ png_combine_row(png_ptr, old_row, png_pass_dsp_mask[png_ptr->pass]); } diff --git a/pngrtran.c b/pngrtran.c index 2fa96f312..7c3dc8514 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1293,9 +1293,9 @@ png_do_read_transformations(png_structp png_ptr) if(rgb_error) { png_ptr->rgb_to_gray_status=1; - if(png_ptr->transformations == PNG_RGB_TO_GRAY_WARN) + if(png_ptr->transformations & PNG_RGB_TO_GRAY_WARN) png_warning(png_ptr, "png_do_rgb_to_gray found nongray pixel"); - if(png_ptr->transformations == PNG_RGB_TO_GRAY_ERR) + if(png_ptr->transformations & PNG_RGB_TO_GRAY_ERR) png_error(png_ptr, "png_do_rgb_to_gray found nongray pixel"); } } @@ -3965,7 +3965,7 @@ png_do_dither(png_row_infop row_info, png_bytep row, #ifdef PNG_FLOATING_POINT_SUPPORTED #if defined(PNG_READ_GAMMA_SUPPORTED) -static int png_gamma_shift[] = +const static int png_gamma_shift[] = {0x10, 0x21, 0x42, 0x84, 0x110, 0x248, 0x550, 0xff0, 0x00}; /* We build the 8- or 16-bit gamma tables here. Note that for 16-bit diff --git a/pngrutil.c b/pngrutil.c index 6157b3de4..972d0f0d0 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -181,7 +181,7 @@ png_decompress_chunk(png_structp png_ptr, int comp_type, png_charp chunkdata, png_size_t chunklength, png_size_t prefix_size, png_size_t *newlength) { - static char msg[] = "Error decoding compressed text"; + const static char msg[] = "Error decoding compressed text"; png_charp text; png_size_t text_size; @@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.2.17 March 6, 2007 + * Last changed in libpng 1.2.17 April 26, 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) @@ -1202,13 +1202,13 @@ png_set_asm_flags (png_structp png_ptr, png_uint_32 asm_flags) #ifdef PNG_MMX_CODE_SUPPORTED settable_mmx_flags = -#ifdef PNG_HAVE_ASSEMBLER_COMBINE_ROW +#ifdef PNG_HAVE_MMX_COMBINE_ROW PNG_ASM_FLAG_MMX_READ_COMBINE_ROW | #endif -#ifdef PNG_HAVE_ASSEMBLER_READ_INTERLACE +#ifdef PNG_HAVE_MMX_READ_INTERLACE PNG_ASM_FLAG_MMX_READ_INTERLACE | #endif -#ifdef PNG_HAVE_ASSEMBLER_READ_FILTER_ROW +#ifdef PNG_HAVE_MMX_READ_FILTER_ROW PNG_ASM_FLAG_MMX_READ_FILTER_SUB | PNG_ASM_FLAG_MMX_READ_FILTER_UP | PNG_ASM_FLAG_MMX_READ_FILTER_AVG | @@ -1551,4 +1551,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_17beta1 your_png_h_is_not_version_1_2_17beta1; +typedef version_1_2_17beta2 your_png_h_is_not_version_1_2_17beta2; diff --git a/pngtrans.c b/pngtrans.c index 25f42c871..8cb4b8861 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -252,7 +252,7 @@ png_do_swap(png_row_infop row_info, png_bytep row) #endif #if defined(PNG_READ_PACKSWAP_SUPPORTED)||defined(PNG_WRITE_PACKSWAP_SUPPORTED) -static PNG_CONST png_byte onebppswaptable[256] = { +const static PNG_CONST png_byte onebppswaptable[256] = { 0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0, 0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0, 0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8, @@ -287,7 +287,7 @@ static PNG_CONST png_byte onebppswaptable[256] = { 0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF }; -static PNG_CONST png_byte twobppswaptable[256] = { +const static PNG_CONST png_byte twobppswaptable[256] = { 0x00, 0x40, 0x80, 0xC0, 0x10, 0x50, 0x90, 0xD0, 0x20, 0x60, 0xA0, 0xE0, 0x30, 0x70, 0xB0, 0xF0, 0x04, 0x44, 0x84, 0xC4, 0x14, 0x54, 0x94, 0xD4, @@ -322,7 +322,7 @@ static PNG_CONST png_byte twobppswaptable[256] = { 0x2F, 0x6F, 0xAF, 0xEF, 0x3F, 0x7F, 0xBF, 0xFF }; -static PNG_CONST png_byte fourbppswaptable[256] = { +const static PNG_CONST png_byte fourbppswaptable[256] = { 0x00, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80, 0x90, 0xA0, 0xB0, 0xC0, 0xD0, 0xE0, 0xF0, 0x01, 0x11, 0x21, 0x31, 0x41, 0x51, 0x61, 0x71, @@ -652,10 +652,11 @@ png_set_user_transform_info(png_structp png_ptr, png_voidp png_voidp PNGAPI png_get_user_transform_ptr(png_structp png_ptr) { - if (png_ptr == NULL) return (NULL); #if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) + if (png_ptr == NULL) return (NULL); return ((png_voidp)png_ptr->user_transform_ptr); -#endif +#else return (NULL); +#endif } #endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */ diff --git a/pngwutil.c b/pngwutil.c index e108c6106..314bea20d 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -523,9 +523,10 @@ png_write_IHDR(png_structp png_ptr, png_uint_32 width, png_uint_32 height, png_ptr->zlib_window_bits = 15; if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_METHOD)) png_ptr->zlib_method = 8; - deflateInit2(&png_ptr->zstream, png_ptr->zlib_level, + if (deflateInit2(&png_ptr->zstream, png_ptr->zlib_level, png_ptr->zlib_method, png_ptr->zlib_window_bits, - png_ptr->zlib_mem_level, png_ptr->zlib_strategy); + png_ptr->zlib_mem_level, png_ptr->zlib_strategy) != Z_OK) + png_error(png_ptr, "zlib failed to initialize compressor"); png_ptr->zstream.next_out = png_ptr->zbuf; png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size; /* libpng is not interested in zstream.data_type */ diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 9bffe8617..75b380360 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -179,7 +179,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.17beta1 +# VERSION 0.${PNGLIB_RELEASE}.1.2.17beta2 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 234121a21..4f138816a 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.17beta1 +version=1.2.17beta2 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc-configure.in b/scripts/libpng.pc-configure.in index 0135548f3..901c714a4 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.17beta1 +Version: 1.2.17beta2 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} @LIBPNG_NO_MMX@ diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 3b3a556f1..05ca417db 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.17beta1 +Version: 1.2.17beta2 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 3bed75cc1..7648434eb 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.17beta1 +PNGMIN = 1.2.17beta2 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 2298242dd..113cd6554 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.17beta1 +PNGMIN = 1.2.17beta2 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 82ec5d8fe..af42ef861 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.17beta1 +PNGMIN = 1.2.17beta2 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index e097799f2..14b6f23cd 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.17beta1 +PNGMIN = 1.2.17beta2 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 2b1feed72..1979d7152 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -80,7 +80,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 CYGDLL = 12 -PNGMIN = 1.2.17beta1 +PNGMIN = 1.2.17beta2 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 19a8e717d..179aaf2f7 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.17beta1 +PNGMIN = 1.2.17beta2 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index bf8dfee64..3db87e94d 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.17beta1 +PNGMIN = 1.2.17beta2 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index daa3406de..ad7777b8a 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.17beta1 +PNGMIN = 1.2.17beta2 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 225a97127..f0625a4c5 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.17beta1 +PNGMIN = 1.2.17beta2 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 1bc856549..9face5b94 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.17beta1 +PNGMIN = 1.2.17beta2 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index b1d6c52be..890533302 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.17beta1 +PNGMIN = 1.2.17beta2 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index f8341ffce..e280a01e3 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.17beta1 +PNGMIN = 1.2.17beta2 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 118481b65..2e1946c5c 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -6,7 +6,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.17beta1 +PNGMIN = 1.2.17beta2 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 30108bbe6..c79d91dd7 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -76,7 +76,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 MINGDLL = 12 -PNGMIN = 1.2.17beta1 +PNGMIN = 1.2.17beta2 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 556f31ca8..b4263855c 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.17beta1 +SHLIB_MINOR= 1.2.17beta2 SRCS= pnggccrd.c 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 1d7bef5f5..832ee0e9b 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.17beta1 +SHLIB_MINOR= 1.2.17beta2 SRCS= pnggccrd.c 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 22c682937..3322f3fd7 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -7,7 +7,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.17beta1 +PNGMIN = 1.2.17beta2 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 357396f7c..aee062cf2 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.17beta1 +SHLIB_MINOR= 1.2.17beta2 LIB= png SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 51a49f983..2ec9c711c 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.17beta1 +PNGMIN = 1.2.17beta2 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index d27e1ab27..5104f7ee4 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.17beta1 +PNGMIN = 1.2.17beta2 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 8e3c6e974..efe321a27 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.17beta1 +PNGMIN = 1.2.17beta2 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index a5dc3bcc4..149793ae5 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.17beta1 +PNGMIN = 1.2.17beta2 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 91afa5123..ddb6a9027 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.17beta1 +PNGMIN = 1.2.17beta2 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 918dacb94..7e882dcdb 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.17beta1 +; Version 1.2.17beta2 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index 1882312ae..4dcb404c1 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.17beta1 +;Version 1.2.17beta2 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 |