From f0a97a0d80e7ca0c054b38ca834005eeba5b0417 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Thu, 9 Aug 2007 21:45:43 -0500 Subject: [PATCH] Imported from libpng-1.2.19rc4.tar --- ANNOUNCE | 36 ++++++++++++-------- CHANGES | 8 ++++- INSTALL | 20 +++++------ KNOWNBUG | 2 +- LICENSE | 4 +-- README | 14 ++++---- Y2KINFO | 4 +-- configure | 22 ++++++------ configure.ac | 4 +-- libpng-1.2.19rc3.txt => libpng-1.2.19rc4.txt | 6 ++-- libpng.3 | 20 +++++------ libpngpf.3 | 4 +-- png.5 | 2 +- png.c | 6 ++-- png.h | 22 ++++++------ pngconf.h | 5 +-- pngerror.c | 2 +- pnggccrd.c | 29 +++++++++++++--- pngpread.c | 2 +- pngread.c | 2 +- pngrtran.c | 12 +++++-- pngrutil.c | 2 +- pngtest.c | 2 +- pngvcrd.c | 2 +- pngwutil.c | 2 +- scripts/CMakeLists.txt | 16 ++++++--- scripts/libpng-config-head.in | 2 +- scripts/libpng.pc-configure.in | 2 +- scripts/libpng.pc.in | 2 +- scripts/makefile.32sunu | 2 +- scripts/makefile.64sunu | 2 +- scripts/makefile.aix | 2 +- scripts/makefile.beos | 2 +- scripts/makefile.cygwin | 2 +- scripts/makefile.darwin | 2 +- scripts/makefile.dec | 2 +- scripts/makefile.elf | 2 +- scripts/makefile.gcmmx | 2 +- scripts/makefile.hp64 | 2 +- scripts/makefile.hpgcc | 2 +- scripts/makefile.hpux | 2 +- scripts/makefile.linux | 2 +- scripts/makefile.mingw | 2 +- scripts/makefile.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.nommx | 2 +- scripts/makefile.openbsd | 2 +- scripts/makefile.sco | 2 +- scripts/makefile.sggcc | 2 +- scripts/makefile.sgi | 2 +- scripts/makefile.so9 | 2 +- scripts/makefile.solaris | 2 +- scripts/makefile.solaris-x86 | 2 +- scripts/pngos2.def | 2 +- scripts/pngw32.def | 2 +- 55 files changed, 177 insertions(+), 131 deletions(-) rename libpng-1.2.19rc3.txt => libpng-1.2.19rc4.txt (99%) diff --git a/ANNOUNCE b/ANNOUNCE index 190a7f2a..3a6063a6 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.2.19rc3 - August 9, 2007 +Libpng 1.2.19rc4 - August 10, 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.19rc3.tar.gz - libpng-1.2.19rc3.tar.bz2 + libpng-1.2.19rc4.tar.gz + libpng-1.2.19rc4.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.19rc3-no-config.tar.gz - libpng-1.2.19rc3-no-config.tar.bz2 + libpng-1.2.19rc4-no-config.tar.gz + libpng-1.2.19rc4-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1219r03.zip - lp1219r03.tar.bz2 + lp1219r04.zip + lp1219r04.tar.bz2 Project files - libpng-1.2.19rc3-project-netware.zip - libpng-1.2.19rc3-project-wince.zip + libpng-1.2.19rc4-project-netware.zip + libpng-1.2.19rc4-project-wince.zip Other information: - libpng-1.2.19rc3-README.txt - libpng-1.2.19rc3-KNOWNBUGS.txt - libpng-1.2.19rc3-LICENSE.txt - libpng-1.2.19rc3-Y2K-compliance.txt + libpng-1.2.19rc4-README.txt + libpng-1.2.19rc4-KNOWNBUGS.txt + libpng-1.2.19rc4-LICENSE.txt + libpng-1.2.19rc4-Y2K-compliance.txt Changes since the last public release (1.2.18): @@ -166,7 +166,7 @@ version 1.2.19beta30 [July 26, 2007] version 1.2.19beta31 [July 27, 2007] Fix typos in pnggccrd.c -version 1.2.19beta32 [August 9, 2007] +version 1.2.19beta32 [August 10, 2007] Disable PNG_MMX_CODE_SUPPORTED when PNG_ASSEMBLER_CODE_SUPPORTED is off. Enable PNG_MMX_READ_FILTER_* by default (they were inadvertently disabled in libpng-1.2.19beta23). @@ -179,9 +179,15 @@ version 1.0.27rc2 and 1.2.19rc2 [August 4, 2007] Issue a png_error() if application attempts to transform a row tht has not been initialized. -version 1.0.27 and 1.2.19 [August 9, 2007] +version 1.0.27rc3 and 1.2.19rc3 [August 9, 2007] Slightly revised pngvcrd.c +version 1.0.27rc4 and 1.2.19rc4 [August 10, 2007] + Revised pnggccrd.c debugging change of rc1, which was broken. + Revised scripts/CMakeLists.txt + Change default to PNG_NO_GLOBAL_ARRAYS for MSVC. + Turn off PNG_FLAG_ROW_INIT flag when setting transforms that expand pixels. + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 8658e489..f4574e61 100644 --- a/CHANGES +++ b/CHANGES @@ -1875,9 +1875,15 @@ version 1.0.27rc2 and 1.2.19rc2 [August 4, 2007] Issue a png_error() if application attempts to transform a row tht has not been initialized. -version 1.0.27 and 1.2.19 [August 9, 2007] +version 1.0.27rc3 and 1.2.19rc3 [August 9, 2007] Slightly revised pngvcrd.c +version 1.0.27rc4 and 1.2.19rc4 [August 10, 2007] + Revised pnggccrd.c debugging change of rc1, which was broken. + Revised scripts/CMakeLists.txt + Change default to PNG_NO_GLOBAL_ARRAYS for MSVC. + Turn off PNG_FLAG_ROW_INIT flag when setting transforms that expand pixels. + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement diff --git a/INSTALL b/INSTALL index 3d981ee0..48fdaed8 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.2.19rc3 - August 9, 2007 +Installing libpng version 1.2.19rc4 - August 10, 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.19rc3" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.2.19rc4" 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.19rc3) + gcc, creates libpng12.so.0.1.2.19rc4) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19rc3) + (gcc, creates libpng12.so.0.1.2.19rc4) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19rc3, + (gcc, creates libpng12.so.0.1.2.19rc4, uses assembler code tuned for Intel MMX platform) makefile.nommx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19rc3 + (gcc, creates libpng12.so.0.1.2.19rc4 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,14 +131,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.19rc3) + creates libpng12.so.0.1.2.19rc4) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.19rc3) + creates libpng12.so.0.1.2.19rc4) makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc, - creates libpng12.so.0.1.2.19rc3) + creates libpng12.so.0.1.2.19rc4) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.19rc3) + creates libpng12.so.0.1.2.19rc4) makefile.32sunu => Sun Ultra 32-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc diff --git a/KNOWNBUG b/KNOWNBUG index 2e1b95f4..1a466da1 100644 --- a/KNOWNBUG +++ b/KNOWNBUG @@ -1,5 +1,5 @@ -Known bugs in libpng version 1.2.19rc3 +Known bugs in libpng version 1.2.19rc4 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 diff --git a/LICENSE b/LICENSE index e6e3a7f6..d300e73f 100644 --- a/LICENSE +++ b/LICENSE @@ -8,7 +8,7 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: If you modify libpng you may insert additional notices immediately following this sentence. -libpng versions 1.2.6, August 15, 2004, through 1.2.19rc3, August 9, 2007, are +libpng versions 1.2.6, August 15, 2004, through 1.2.19rc4, August 10, 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 -August 9, 2007 +August 10, 2007 diff --git a/README b/README index 90f42bc1..b1a58f05 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.2.19rc3 - August 9, 2007 (shared library 12.0) +README for libpng version 1.2.19rc4 - August 10, 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.19rc3) + gcc, creates libpng12.so.0.1.2.19rc4) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19rc3) + (gcc, creates libpng12.so.0.1.2.19rc4) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19rc3, + (gcc, creates libpng12.so.0.1.2.19rc4, 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.19rc3) + (gcc, creates libpng12.so.0.1.2.19rc4) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.19rc3) + (gcc, creates libpng12.so.0.1.2.19rc4) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.19rc3) + (gcc, creates libpng12.so.0.1.2.19rc4) makefile.32sunu => Sun Ultra 32-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc diff --git a/Y2KINFO b/Y2KINFO index eab9dfe1..eb28c03e 100644 --- a/Y2KINFO +++ b/Y2KINFO @@ -1,13 +1,13 @@ Y2K compliance in libpng: ========================= - August 9, 2007 + August 10, 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.19rc3 are Y2K compliant. It is my belief that earlier + upward through 1.2.19rc4 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer diff --git a/configure b/configure index f41eaa36..e85359ec 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for libpng 1.2.19rc3. +# Generated by GNU Autoconf 2.61 for libpng 1.2.19rc4. # # Report bugs to . # @@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.2.19rc3' -PACKAGE_STRING='libpng 1.2.19rc3' +PACKAGE_VERSION='1.2.19rc4' +PACKAGE_STRING='libpng 1.2.19rc4' 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.19rc3 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.19rc4 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.19rc3:";; + short | recursive ) echo "Configuration of libpng 1.2.19rc4:";; 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.19rc3 +libpng configure 1.2.19rc4 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.19rc3, which was +It was created by libpng $as_me 1.2.19rc4, 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.19rc3' + VERSION='1.2.19rc4' cat >>confdefs.h <<_ACEOF @@ -2440,7 +2440,7 @@ fi -PNGLIB_VERSION=1.2.19rc3 +PNGLIB_VERSION=1.2.19rc4 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=19 @@ -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.19rc3, which was +This file was extended by libpng $as_me 1.2.19rc4, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21335,7 +21335,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -libpng config.status 1.2.19rc3 +libpng config.status 1.2.19rc4 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 99995c14..76ab1afe 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.19rc3], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.19rc4], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.19rc3 +PNGLIB_VERSION=1.2.19rc4 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=19 diff --git a/libpng-1.2.19rc3.txt b/libpng-1.2.19rc4.txt similarity index 99% rename from libpng-1.2.19rc3.txt rename to libpng-1.2.19rc4.txt index 9ff6860e..7ffc86a4 100644 --- a/libpng-1.2.19rc3.txt +++ b/libpng-1.2.19rc4.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.19rc3 - August 9, 2007 + libpng version 1.2.19rc4 - August 10, 2007 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2007 Glenn Randers-Pehrson @@ -2968,13 +2968,13 @@ application: IX. Y2K Compliance in libpng -August 9, 2007 +August 10, 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.19rc3 are Y2K compliant. It is my belief that earlier +upward through 1.2.19rc4 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that diff --git a/libpng.3 b/libpng.3 index 9791c26e..1fa6f623 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "August 9, 2007" +.TH LIBPNG 3 "August 10, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19rc3 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19rc4 .SH SYNOPSIS \fB #include \fP @@ -410,7 +410,7 @@ Following is a copy of the libpng.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.2.19rc3 - August 9, 2007 + libpng version 1.2.19rc4 - August 10, 2007 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2007 Glenn Randers-Pehrson @@ -3378,13 +3378,13 @@ application: .SH IX. Y2K Compliance in libpng -August 9, 2007 +August 10, 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.19rc3 are Y2K compliant. It is my belief that earlier +upward through 1.2.19rc4 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 @@ -3574,8 +3574,8 @@ the first widely used release: 1.0.26 10 10026 10.so.0.26[.0] 1.2.18 13 10218 12.so.0.18[.0] 1.2.19beta1-31 13 10219 12.so.0.19[.0] - 1.0.27rc1 10 10027 10.so.0.27[.0] - 1.2.19rc1 13 10219 12.so.0.19[.0] + 1.0.27rc1-4 10 10027 10.so.0.27[.0] + 1.2.19rc1-4 13 10219 12.so.0.19[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3631,7 +3631,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.19rc3 - August 9, 2007: +Libpng version 1.2.19rc4 - August 10, 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). @@ -3652,7 +3652,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.19rc3, August 9, 2007, are +libpng versions 1.2.6, August 15, 2004, through 1.2.19rc4, August 10, 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 @@ -3751,7 +3751,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -August 9, 2007 +August 10, 2007 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index dcd663e9..7376e77d 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "August 9, 2007" +.TH LIBPNGPF 3 "August 10, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19rc3 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19rc4 (private functions) .SH SYNOPSIS \fB#include \fP diff --git a/png.5 b/png.5 index 00280141..5d7417f8 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "August 9, 2007" +.TH PNG 5 "August 10, 2007" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 18857ae7..3d2746af 100644 --- a/png.c +++ b/png.c @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.2.19 August 9, 2007 + * Last changed in libpng 1.2.19 August 10, 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) @@ -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_19rc3 Your_png_h_is_not_version_1_2_19rc3; +typedef version_1_2_19rc4 Your_png_h_is_not_version_1_2_19rc4; /* Version information for C files. This had better match the version * string defined in png.h. */ @@ -698,7 +698,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.19rc3 - August 9, 2007\n\ + return ((png_charp) "\n libpng version 1.2.19rc4 - August 10, 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"); diff --git a/png.h b/png.h index 01de2df0..50b6ddf4 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.19rc3 - August 9, 2007 + * libpng version 1.2.19rc4 - August 10, 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.19rc3 - August 9, 2007: Glenn + * libpng versions 0.97, January 1998, through 1.2.19rc4 - August 10, 2007: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -151,8 +151,8 @@ * 1.0.26 10 10026 10.so.0.26[.0] * 1.2.18 13 10218 12.so.0.18[.0] * 1.2.19beta1-31 13 10219 12.so.0.19[.0] - * 1.0.27rc1 10 10027 10.so.0.27[.0] - * 1.2.19rc1 13 10219 12.so.0.19[.0] + * 1.0.27rc1-4 10 10027 10.so.0.27[.0] + * 1.2.19rc1-4 13 10219 12.so.0.19[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -182,7 +182,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.19rc3, August 9, 2007, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.19rc4, August 10, 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: @@ -294,13 +294,13 @@ * Y2K compliance in libpng: * ========================= * - * August 9, 2007 + * August 10, 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.19rc3 are Y2K compliant. It is my belief that earlier + * upward through 1.2.19rc4 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 @@ -356,9 +356,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.19rc3" +#define PNG_LIBPNG_VER_STRING "1.2.19rc4" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.19rc3 - August 9, 2007\n" + " libpng version 1.2.19rc4 - August 10, 2007\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 @@ -370,7 +370,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 @@ -1409,7 +1409,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_19rc3; +typedef png_structp version_1_2_19rc4; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngconf.h b/pngconf.h index 1accbd44..dbe9c7f3 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.19rc3 - August 9, 2007 + * libpng version 1.2.19rc4 - August 10, 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) @@ -1285,7 +1285,8 @@ typedef z_stream FAR * png_zstreamp; * but might be required for some pre-1.0.5c applications. */ #if !defined(PNG_USE_LOCAL_ARRAYS) && !defined(PNG_USE_GLOBAL_ARRAYS) -# if defined(PNG_NO_GLOBAL_ARRAYS) || (defined(__GNUC__) && defined(PNG_DLL)) +# if defined(PNG_NO_GLOBAL_ARRAYS) || \ + (defined(__GNUC__) && defined(PNG_DLL)) || defined(_MSC_VER) # define PNG_USE_LOCAL_ARRAYS # else # define PNG_USE_GLOBAL_ARRAYS diff --git a/pngerror.c b/pngerror.c index 7c84c6ee..f6fb5cb1 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.19 August 9, 2007 + * Last changed in libpng 1.2.19 August 10, 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/pnggccrd.c b/pnggccrd.c index 7762d3cc..89265a70 100644 --- a/pnggccrd.c +++ b/pnggccrd.c @@ -3,7 +3,7 @@ * * For Intel/AMD x86 or x86-64 CPU (Pentium-MMX or later) and GNU C compiler. * - * Last changed in libpng 1.2.19 August 9, 2007 + * Last changed in libpng 1.2.19 August 10, 2007 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998 Intel Corporation * Copyright (c) 1999-2002,2007 Greg Roelofs @@ -5784,15 +5784,32 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep break; case 1: + + +#if 0 +fdef PNG_MMX_READ_FILTER_SUB_SUPPORTED +#if !defined(PNG_1_0_X) + ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_SUB) && + (row_info->pixel_depth >= png_ptr->mmx_bitdepth_threshold) && + (row_info->rowbytes >= png_ptr->mmx_rowbytes_threshold)) +#else + _mmx_supported +#endif + ? "MMX" : +#endif + "C"); +#endif /* 0 */ + png_snprintf(filtname, 10, "sub-%s", #ifdef PNG_MMX_READ_FILTER_SUB_SUPPORTED #if !defined(PNG_1_0_X) ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_SUB) && (row_info->pixel_depth >= png_ptr->mmx_bitdepth_threshold) && - (row_info->rowbytes >= png_ptr->mmx_rowbytes_threshold)) ? "MMX" : + (row_info->rowbytes >= png_ptr->mmx_rowbytes_threshold)) #else _mmx_supported #endif + ? "MMX" : #endif "C"); break; @@ -5803,10 +5820,11 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep #if !defined(PNG_1_0_X) ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_UP) && (row_info->pixel_depth >= png_ptr->mmx_bitdepth_threshold) && - (row_info->rowbytes >= png_ptr->mmx_rowbytes_threshold)) ? "MMX" : + (row_info->rowbytes >= png_ptr->mmx_rowbytes_threshold)) #else _mmx_supported #endif + ? "MMX" : #endif "C"); break; @@ -5817,12 +5835,13 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep #if !defined(PNG_1_0_X) ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_AVG) && (row_info->pixel_depth >= png_ptr->mmx_bitdepth_threshold) && - (row_info->rowbytes >= png_ptr->mmx_rowbytes_threshold)) ? "MMX" : + (row_info->rowbytes >= png_ptr->mmx_rowbytes_threshold)) #else _mmx_supported #endif + ? "MMX" : #endif - "C"); + C"); break; case 4: diff --git a/pngpread.c b/pngpread.c index 2173d2e2..602fb52b 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.19 August 9, 2007 + * Last changed in libpng 1.2.19 August 10, 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/pngread.c b/pngread.c index 20cbd143..c1624b3d 100644 --- a/pngread.c +++ b/pngread.c @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.2.19 August 9, 2007 + * Last changed in libpng 1.2.19 August 10, 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/pngrtran.c b/pngrtran.c index 83ec084d..1d853e2d 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.19 August 9, 2007 + * Last changed in libpng 1.2.19 August 10, 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) @@ -548,6 +548,7 @@ png_set_expand(png_structp png_ptr) png_debug(1, "in png_set_expand\n"); if(png_ptr == NULL) return; png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS); + png_ptr->flags &= !(PNG_FLAG_ROW_INIT); } /* GRR 19990627: the following three functions currently are identical @@ -574,6 +575,7 @@ png_set_palette_to_rgb(png_structp png_ptr) png_debug(1, "in png_set_palette_to_rgb\n"); if(png_ptr == NULL) return; png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS); + png_ptr->flags &= !(PNG_FLAG_ROW_INIT); } #if !defined(PNG_1_0_X) @@ -584,6 +586,7 @@ png_set_expand_gray_1_2_4_to_8(png_structp png_ptr) png_debug(1, "in png_set_expand_gray_1_2_4_to_8\n"); if(png_ptr == NULL) return; png_ptr->transformations |= PNG_EXPAND; + png_ptr->flags &= !(PNG_FLAG_ROW_INIT); } #endif @@ -604,8 +607,9 @@ png_set_gray_1_2_4_to_8(png_structp png_ptr) void PNGAPI png_set_tRNS_to_alpha(png_structp png_ptr) { - png_debug(1, "in png_set_expand\n"); + png_debug(1, "in png_set_tRNS_to_alpha\n"); png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS); + png_ptr->flags &= !(PNG_FLAG_ROW_INIT); } #endif /* defined(PNG_READ_EXPAND_SUPPORTED) */ @@ -615,6 +619,7 @@ png_set_gray_to_rgb(png_structp png_ptr) { png_debug(1, "in png_set_gray_to_rgb\n"); png_ptr->transformations |= PNG_GRAY_TO_RGB; + png_ptr->flags &= !(PNG_FLAG_ROW_INIT); } #endif @@ -1259,7 +1264,8 @@ png_do_read_transformations(png_structp png_ptr) } if (!(png_ptr->flags & PNG_FLAG_ROW_INIT)) /* Application has failed to call either png_read_start_image() - * or png_read_update_info(). This check added to libpng-1.2.19 */ + * or png_read_update_info() after setting transforms that expand + * pixels. This check added to libpng-1.2.19 */ png_error(png_ptr, "Uninitialized row"); #if defined(PNG_READ_EXPAND_SUPPORTED) diff --git a/pngrutil.c b/pngrutil.c index 73635c1e..efb82ca8 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.19 August 9, 2007 + * Last changed in libpng 1.2.19 August 10, 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/pngtest.c b/pngtest.c index a2ce789d..67bfde3e 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1548,4 +1548,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_19rc3 your_png_h_is_not_version_1_2_19rc3; +typedef version_1_2_19rc4 your_png_h_is_not_version_1_2_19rc4; diff --git a/pngvcrd.c b/pngvcrd.c index 5a566382..e937fa79 100644 --- a/pngvcrd.c +++ b/pngvcrd.c @@ -3,7 +3,7 @@ * * For Intel x86 CPU and Microsoft Visual C++ compiler * - * Last changed in libpng 1.2.19 August 9, 2007 + * Last changed in libpng 1.2.19 August 10, 2007 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2007 Glenn Randers-Pehrson * Copyright (c) 1998, Intel Corporation diff --git a/pngwutil.c b/pngwutil.c index e515acd7..6f583695 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.19 August 9, 2007 + * Last changed in libpng 1.2.19 August 10, 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/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index cd591bc3..e4e42344 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -1,3 +1,4 @@ + project(PNG) # Copyright (C) 2007 Glenn Randers-Pehrson @@ -29,7 +30,11 @@ endif(NOT WIN32) # COMMAND LINE OPTIONS option(PNG_SHARED "Build shared lib" YES) option(PNG_STATIC "Build static lib" YES) -option(PNG_TESTS "Build pngtest" YES) +if(MSVC) + option(PNG_TESTS "Build pngtest" NO) +else(MSVC) + option(PNG_TESTS "Build pngtest" YES) +endif(MSVC) option(PNG_NO_CONSOLE_IO "FIXME" YES) option(PNG_NO_STDIO "FIXME" YES) option(PNG_DEBUG "Build with debug output" YES) @@ -175,14 +180,16 @@ 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.19rc3 +# VERSION 0.${PNGLIB_RELEASE}.1.2.19rc4 VERSION 0.${PNGLIB_RELEASE}.0 SOVERSION 0 CLEAN_DIRECT_OUTPUT 1) -set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES +if(NOT WIN32) + # that's uncool on win32 - it overwrites our static import lib... + set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES OUTPUT_NAME ${PNG_LIB_NAME} CLEAN_DIRECT_OUTPUT 1) - +endif(NOT WIN32) # INSTALL install_targets(/lib ${PNG_LIB_NAME} ${PNG_LIB_NAME_STATIC}) install(FILES png.h pngconf.h DESTINATION include) @@ -207,3 +214,4 @@ install(FILES ${PNG_BINARY_DIR}/${PNGLIB_NAME}-config DESTINATION bin) # to create msvc import lib for mingw compiled shared lib # pexports libpng.dll > libpng.def # lib /def:libpng.def /machine:x86 + diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index 9ce39ab6..1e4400ed 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.19rc3 +version=1.2.19rc4 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc-configure.in b/scripts/libpng.pc-configure.in index ba24b081..e1da5f8d 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.19rc3 +Version: 1.2.19rc4 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} @LIBPNG_NO_MMX@ diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index afd55539..b531f4dc 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.19rc3 +Version: 1.2.19rc4 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index dd831abd..0f8c7e37 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc3 +PNGMIN = 1.2.19rc4 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index c821319c..2a80336f 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc3 +PNGMIN = 1.2.19rc4 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 34ffafbb..0a7cf9c7 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.19rc3 +PNGMIN = 1.2.19rc4 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index f145e6a9..a899c3f5 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc3 +PNGMIN = 1.2.19rc4 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index a6a3f1b8..fef4b7f9 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -77,7 +77,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 CYGDLL = 12 -PNGMIN = 1.2.19rc3 +PNGMIN = 1.2.19rc4 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 5554c671..b71e1543 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc3 +PNGMIN = 1.2.19rc4 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 5bb0667c..7bb56481 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.19rc3 +PNGMIN = 1.2.19rc4 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 8e850e99..edd48303 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc3 +PNGMIN = 1.2.19rc4 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 2412069e..e99f9113 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc3 +PNGMIN = 1.2.19rc4 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 85f738fa..3a408469 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.19rc3 +PNGMIN = 1.2.19rc4 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 2763792d..2fa8404b 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc3 +PNGMIN = 1.2.19rc4 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 850152c5..1c60348c 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.19rc3 +PNGMIN = 1.2.19rc4 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 9aa2161a..ce554152 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -6,7 +6,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc3 +PNGMIN = 1.2.19rc4 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 3f245adb..e343adb3 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -78,7 +78,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 MINGDLL = 12 -PNGMIN = 1.2.19rc3 +PNGMIN = 1.2.19rc4 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index ae75ffde..983542f0 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.19rc3 +SHLIB_MINOR= 1.2.19rc4 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 8e93969b..c89b63d3 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.19rc3 +SHLIB_MINOR= 1.2.19rc4 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 2e149d96..af3c4eaa 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -7,7 +7,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc3 +PNGMIN = 1.2.19rc4 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 261d44b1..45f40b85 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.19rc3 +SHLIB_MINOR= 1.2.19rc4 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 701b761f..c7282651 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc3 +PNGMIN = 1.2.19rc4 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index a21e1d14..632ea198 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc3 +PNGMIN = 1.2.19rc4 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index ed2f2fc5..2089dc98 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc3 +PNGMIN = 1.2.19rc4 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 2b1fdc59..5137b690 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.19rc3 +PNGMIN = 1.2.19rc4 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 1d168046..acbe1149 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc3 +PNGMIN = 1.2.19rc4 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index 32c03a94..13c18c9d 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc3 +PNGMIN = 1.2.19rc4 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index a24937ef..e52c4553 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.19rc3 +; Version 1.2.19rc4 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index e78039ce..df63efe9 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.19rc3 +;Version 1.2.19rc4 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3