diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2012-02-17 13:27:42 -0600 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2012-02-18 23:43:25 -0600 |
commit | a22646a5df61595771e247b31c3e001d80371bf0 (patch) | |
tree | 85f7614a81a9372a14089316507d64306b88d440 | |
parent | 3ef6c2439c016abfb212d6201df792b08df2cb15 (diff) | |
download | libpng-a22646a5df61595771e247b31c3e001d80371bf0.tar.gz |
[libpng14] Imported from libpng-1.4.9rc01.tarv1.4.9rc01
-rw-r--r-- | ANNOUNCE | 20 | ||||
-rw-r--r-- | CHANGES | 4 | ||||
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | INSTALL | 4 | ||||
-rw-r--r-- | LICENSE | 2 | ||||
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | Makefile.in | 2 | ||||
-rw-r--r-- | README | 12 | ||||
-rwxr-xr-x | configure | 22 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | libpng-1.4.9rc01.txt (renamed from libpng-1.4.9beta01.txt) | 8 | ||||
-rw-r--r-- | libpng.3 | 15 | ||||
-rw-r--r-- | libpngpf.3 | 2 | ||||
-rw-r--r-- | png.c | 6 | ||||
-rw-r--r-- | png.h | 15 | ||||
-rw-r--r-- | pngconf.h | 2 | ||||
-rw-r--r-- | pngpriv.h | 2 | ||||
-rw-r--r-- | pngrutil.c | 6 | ||||
-rw-r--r-- | pngtest.c | 2 | ||||
-rw-r--r-- | projects/vstudio/readme.txt | 2 | ||||
-rw-r--r-- | projects/vstudio/zlib.props | 2 | ||||
-rw-r--r-- | scripts/README.txt | 12 | ||||
-rwxr-xr-x | scripts/libpng-config-head.in | 2 | ||||
-rw-r--r-- | scripts/libpng.pc.in | 2 | ||||
-rw-r--r-- | scripts/makefile.ne12bsd | 2 | ||||
-rw-r--r-- | scripts/makefile.netbsd | 2 | ||||
-rw-r--r-- | scripts/makefile.openbsd | 2 | ||||
-rw-r--r-- | scripts/png32ce.def | 2 | ||||
-rw-r--r-- | scripts/pngos2.def | 2 | ||||
-rw-r--r-- | scripts/pngwin.def | 2 |
30 files changed, 83 insertions, 81 deletions
@@ -1,5 +1,5 @@ -Libpng 1.4.9beta01 - February 17, 2012 +Libpng 1.4.9rc01 - February 17, 2012 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,28 +9,30 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.4.9beta01.tar.xz (LZMA-compressed, recommended) - 1.4.9beta01.tar.gz - 1.4.9beta01.tar.bz2 + 1.4.9rc01.tar.xz (LZMA-compressed, recommended) + 1.4.9rc01.tar.gz + 1.4.9rc01.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp149b01.7z (LZMA-compressed, recommended) - lp149b01.zip + lp149r01.7z (LZMA-compressed, recommended) + lp149r01.zip Other information: - 1.4.9beta01-README.txt - 1.4.9beta01-LICENSE.txt + 1.4.9rc01-README.txt + 1.4.9rc01-LICENSE.txt Changes since the last public release (1.4.8): -version 1.4.9beta01 [February 17, 2012] +version 1.4.9beta01 [February 16, 2012] Added vstudio/* and CMakeLists to EXTRA_DIST in Makefile.in and Makefile.am Updated contrib/pngminus/makefile.std (Samuli Souminen) Added SunOS support to configure.ac and Makefile.am (but configure and Makefile.in were not updated) + +version 1.4.9rc01 [February 17, 2012] Fixed CVE-2011-3026 buffer overrun bug. Deal more correctly with the test on iCCP chunk length. Also removed spurious casts that may hide problems on 16-bit systems. @@ -2825,11 +2825,13 @@ version 1.4.8rc01 [June 30, 2011] version 1.4.8 [July 7, 2011] No changes. -version 1.4.9beta01 [February 17, 2012] +version 1.4.9beta01 [February 16, 2012] Added vstudio/* and CMakeLists to EXTRA_DIST in Makefile.in and Makefile.am Updated contrib/pngminus/makefile.std (Samuli Souminen) Added SunOS support to configure.ac and Makefile.am (but configure and Makefile.in were not updated) + +version 1.4.9rc01 [February 17, 2012] Fixed CVE-2011-3026 buffer overrun bug. Deal more correctly with the test on iCCP chunk length. Also removed spurious casts that may hide problems on 16-bit systems. diff --git a/CMakeLists.txt b/CMakeLists.txt index 7494b9083..6e18ffcf7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -255,7 +255,7 @@ install(CODE ${PNG_CONFIG_INSTALL_CODE}) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 14.${PNGLIB_RELEASE}.1.4.9beta01 +# VERSION 14.${PNGLIB_RELEASE}.1.4.9rc01 VERSION 14.${PNGLIB_RELEASE}.0 SOVERSION 14 CLEAN_DIRECT_OUTPUT 1) @@ -1,5 +1,5 @@ -Installing libpng version 1.4.9beta01 - February 17, 2012 +Installing libpng version 1.4.9rc01 - February 17, 2012 On Unix/Linux and similar systems, you can simply type @@ -46,7 +46,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.4.9beta01" or "libpng14" and "zlib-1.2.3" +might be called "libpng-1.4.9rc01" or "libpng14" and "zlib-1.2.3" or "zlib123") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.4.9beta01, February 17, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.4.9rc01, February 17, 2012, are Copyright (c) 2004, 2006-2010 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 diff --git a/Makefile.am b/Makefile.am index a42167bea..bc54cb3cf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -79,7 +79,7 @@ EXTRA_DIST= \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.4.9beta01.txt + example.c libpng-1.4.9rc01.txt CLEANFILES= pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers \ libpng.sym diff --git a/Makefile.in b/Makefile.in index cf5a9d568..b547ddbc3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -332,7 +332,7 @@ EXTRA_DIST = \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.4.9beta01.txt + example.c libpng-1.4.9rc01.txt CLEANFILES = pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers \ libpng.sym @@ -1,4 +1,4 @@ -README for libpng version 1.4.9beta01 - February 17, 2012 (shared library 14.0) +README for libpng version 1.4.9rc01 - February 17, 2012 (shared library 14.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. @@ -182,9 +182,9 @@ Files in this distribution: makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF makefile symbol versioning, - (gcc, creates libpng14.so.14.1.4.9beta01) + (gcc, creates libpng14.so.14.1.4.9rc01) makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.9beta01) + (gcc, creates libpng14.so.14.1.4.9rc01) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr (Requires ansi2knr.c from @@ -206,12 +206,12 @@ Files in this distribution: makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX (cc, creates static lib) makefile.sggcc => Silicon Graphics - (gcc, creates libpng14.so.14.1.4.9beta01) + (gcc, creates libpng14.so.14.1.4.9rc01) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng14.so.14.1.4.9beta01) + (gcc, creates libpng14.so.14.1.4.9rc01) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng14.so.14.1.4.9beta01) + (gcc, creates libpng14.so.14.1.4.9rc01) 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,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for libpng 1.4.9beta01. +# Generated by GNU Autoconf 2.65 for libpng 1.4.9rc01. # # Report bugs to <png-mng-implement@lists.sourceforge.net>. # @@ -562,8 +562,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.4.9beta01' -PACKAGE_STRING='libpng 1.4.9beta01' +PACKAGE_VERSION='1.4.9rc01' +PACKAGE_STRING='libpng 1.4.9rc01' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1292,7 +1292,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.4.9beta01 to adapt to many kinds of systems. +\`configure' configures libpng 1.4.9rc01 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1362,7 +1362,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.4.9beta01:";; + short | recursive ) echo "Configuration of libpng 1.4.9rc01:";; esac cat <<\_ACEOF @@ -1467,7 +1467,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.4.9beta01 +libpng configure 1.4.9rc01 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1892,7 +1892,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.4.9beta01, which was +It was created by libpng $as_me 1.4.9rc01, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2700,7 +2700,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.4.9beta01' + VERSION='1.4.9rc01' cat >>confdefs.h <<_ACEOF @@ -2764,7 +2764,7 @@ fi -PNGLIB_VERSION=1.4.9beta01 +PNGLIB_VERSION=1.4.9rc01 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 PNGLIB_RELEASE=9 @@ -12175,7 +12175,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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.4.9beta01, which was +This file was extended by libpng $as_me 1.4.9rc01, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12241,7 +12241,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libpng config.status 1.4.9beta01 +libpng config.status 1.4.9rc01 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 8c9c7c91e..5cd2cd242 100644 --- a/configure.ac +++ b/configure.ac @@ -16,14 +16,14 @@ dnl should not be necessary to regenerate configure if the time dnl stamps are correct AC_PREREQ(2.59) -AC_INIT([libpng], [1.4.9beta01], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.4.9rc01], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE dnl Version number stuff here: -PNGLIB_VERSION=1.4.9beta01 +PNGLIB_VERSION=1.4.9rc01 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 PNGLIB_RELEASE=9 diff --git a/libpng-1.4.9beta01.txt b/libpng-1.4.9rc01.txt index 98fa4282a..22750cda1 100644 --- a/libpng-1.4.9beta01.txt +++ b/libpng-1.4.9rc01.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.9beta01 - February 17, 2012 + libpng version 1.4.9rc01 - February 17, 2012 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.4.9beta01 - February 17, 2012 + libpng versions 0.97, January 1998, through 1.4.9rc01 - February 17, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -906,7 +906,7 @@ things. As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was added. It expands the sample depth without changing tRNS to alpha. -As of libpng version 1.4.9beta01, not all possible expansions are supported. +As of libpng version 1.4.9rc01, not all possible expansions are supported. In the following table, the 01 means grayscale with depth<8, 31 means indexed with depth<8, other numerals represent the color type, "T" means @@ -3318,7 +3318,7 @@ 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.4.9beta01 are Y2K compliant. It is my belief that earlier +upward through 1.4.9rc01 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 "February 17, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.9beta01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.9rc01 .SH SYNOPSIS \fI\fB @@ -895,7 +895,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.4.9beta01 - February 17, 2012 + libpng version 1.4.9rc01 - February 17, 2012 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -906,7 +906,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.4.9beta01 - February 17, 2012 + libpng versions 0.97, January 1998, through 1.4.9rc01 - February 17, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -1801,7 +1801,7 @@ things. As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was added. It expands the sample depth without changing tRNS to alpha. -As of libpng version 1.4.9beta01, not all possible expansions are supported. +As of libpng version 1.4.9rc01, not all possible expansions are supported. In the following table, the 01 means grayscale with depth<8, 31 means indexed with depth<8, other numerals represent the color type, "T" means @@ -4213,7 +4213,7 @@ 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.4.9beta01 are Y2K compliant. It is my belief that earlier +upward through 1.4.9rc01 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 @@ -4414,6 +4414,7 @@ the first widely used release: 1.4.8rc01 14 10408 14.so.14.8[.0] 1.4.8 14 10408 14.so.14.8[.0] 1.4.9beta01 14 10409 14.so.14.9[.0] + 1.4.9rc01 14 10409 14.so.14.9[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -4469,7 +4470,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.9beta01 - February 17, 2012: +Libpng version 1.4.9rc01 - February 17, 2012: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -4492,7 +4493,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.4.9beta01, February 17, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.4.9rc01, February 17, 2012, 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 diff --git a/libpngpf.3 b/libpngpf.3 index 48549fe4e..baf2e421a 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "February 17, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.9beta01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.9rc01 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -17,7 +17,7 @@ #include "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_4_9beta01 Your_png_h_is_not_version_1_4_9beta01; +typedef version_1_4_9rc01 Your_png_h_is_not_version_1_4_9rc01; /* Tells libpng that we have already handled the first "num_bytes" bytes * of the PNG file signature. If the PNG data is embedded into another @@ -547,13 +547,13 @@ png_get_copyright(png_const_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.4.9beta01 - February 17, 2012" PNG_STRING_NEWLINE \ + "libpng version 1.4.9rc01 - February 17, 2012" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2010 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ PNG_STRING_NEWLINE); #else - return ((png_charp) "libpng version 1.4.9beta01 - February 17, 2012\ + return ((png_charp) "libpng version 1.4.9rc01 - February 17, 2012\ Copyright (c) 1998-2010 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."); @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.4.9beta01 - February 17, 2012 + * libpng version 1.4.9rc01 - February 17, 2012 * Copyright (c) 1998-2011 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.) @@ -11,7 +11,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.4.9beta01 - February 17, 2012: Glenn + * libpng versions 0.97, January 1998, through 1.4.9rc01 - February 17, 2012: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -162,6 +162,7 @@ * 1.4.8rc01 14 10408 14.so.14.8[.0] * 1.4.8 14 10408 14.so.14.8[.0] * 1.4.9beta01 14 10409 14.so.14.9[.0] + * 1.4.9rc01 14 10409 14.so.14.9[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -193,7 +194,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.4.9beta01, February 17, 2012, are + * libpng versions 1.2.6, August 15, 2004, through 1.4.9rc01, February 17, 2012, are * Copyright (c) 2004, 2006-2010 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: @@ -311,7 +312,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.4.9beta01 are Y2K compliant. It is my belief that earlier + * upward through 1.4.9rc01 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 @@ -367,9 +368,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.4.9beta01" +#define PNG_LIBPNG_VER_STRING "1.4.9rc01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.9beta01 - February 17, 2012\n" + " libpng version 1.4.9rc01 - February 17, 2012\n" #define PNG_LIBPNG_VER_SONUM 14 #define PNG_LIBPNG_VER_DLLNUM 14 @@ -1493,7 +1494,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_4_9beta01; +typedef png_structp version_1_4_9rc01; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.4.9beta01 - February 17, 2012 + * libpng version 1.4.9rc01 - February 17, 2012 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2011 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.4.9beta01 - February 17, 2012 + * libpng version 1.4.9rc01 - February 17, 2012 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2011 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrutil.c b/pngrutil.c index d8f11f03d..f1e93cdd5 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -396,11 +396,7 @@ png_decompress_chunk(png_structp png_ptr, int comp_type, * and we have nothing to do - the code will exit through the * error case below. */ -#if defined(PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED) || \ - defined(PNG_USER_CHUNK_MALLOC_MAX) - else -#endif - if (expanded_size > 0) + else if (expanded_size > 0) { /* Success (maybe) - really uncompress the chunk. */ png_size_t new_size = 0; @@ -1702,4 +1702,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_4_9beta01 your_png_h_is_not_version_1_4_9beta01; +typedef version_1_4_9rc01 your_png_h_is_not_version_1_4_9rc01; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index e192c4242..34efc8382 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.4.9beta01 - February 17, 2012 +libpng version 1.4.9rc01 - February 17, 2012 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 18670e604..a6f882f26 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@ <!-- * zlib.props - location of zlib source and build * - * libpng version 1.4.9beta01 - February 17, 2012 + * libpng version 1.4.9rc01 - February 17, 2012 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * diff --git a/scripts/README.txt b/scripts/README.txt index cd9217026..01979adbb 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,8 +1,8 @@ -Makefiles for libpng version 1.4.9beta01 - February 17, 2012 +Makefiles for libpng version 1.4.9rc01 - February 17, 2012 makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.9beta01) + (gcc, creates libpng14.so.14.1.4.9rc01) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr (Requires ansi2knr.c from @@ -20,7 +20,7 @@ Makefiles for libpng version 1.4.9beta01 - February 17, 2012 makefile.dec => DEC Alpha UNIX makefile makefile.dj2 => DJGPP 2 makefile makefile.elf => Linux/ELF makefile symbol versioning, - (gcc, creates libpng14.so.14.1.4.9beta01) + (gcc, creates libpng14.so.14.1.4.9rc01) makefile.freebsd => FreeBSD makefile makefile.gcc => Generic gcc makefile makefile.hpgcc => HPUX makefile using gcc @@ -36,12 +36,12 @@ Makefiles for libpng version 1.4.9beta01 - February 17, 2012 makefile.os2 => OS/2 Makefile (gcc and emx, requires pngos2.def) makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc makefile.sggcc => Silicon Graphics (gcc, - creates libpng14.so.14.1.4.9beta01) + creates libpng14.so.14.1.4.9rc01) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng14.so.14.1.4.9beta01) + creates libpng14.so.14.1.4.9rc01) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng14.so.14.1.4.9beta01) + creates libpng14.so.14.1.4.9rc01) makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.sunos => Sun makefile makefile.32sunu => Sun Ultra 32-bit makefile diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index 68e46e9be..f5a9a8a49 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.4.9beta01 +version=1.4.9rc01 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index b3fced0ae..e88b9a3b5 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng14 Name: libpng Description: Loads and saves PNG files -Version: 1.4.9beta01 +Version: 1.4.9rc01 Libs: -L${libdir} -lpng14 Cflags: -I${includedir} diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 42c918b4b..b2e526ed3 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng14 LIB= png14 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.4.9beta01 +SHLIB_MINOR= 1.4.9rc01 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 d47b15f55..e5be91273 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.4.9beta01 +SHLIB_MINOR= 1.4.9rc01 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.openbsd b/scripts/makefile.openbsd index 8e5ec5662..7717b4c03 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.4.9beta01 +SHLIB_MINOR= 1.4.9rc01 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/png32ce.def b/scripts/png32ce.def index 34302cd09..87007a7a2 100644 --- a/scripts/png32ce.def +++ b/scripts/png32ce.def @@ -15,7 +15,7 @@ LIBRARY lpngce png_get_int_32 EXPORTS -;Version 1.4.9beta01 +;Version 1.4.9rc01 png_build_grayscale_palette @1 ; png_check_sig @2 png_chunk_error @3 diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 131e61618..4a43922ac 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.4.9beta01 +; Version 1.4.9rc01 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngwin.def b/scripts/pngwin.def index ab76f4ae6..2bab83f75 100644 --- a/scripts/pngwin.def +++ b/scripts/pngwin.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.4.9beta01 +;Version 1.4.9rc01 png_build_grayscale_palette png_chunk_error png_chunk_warning |