diff options
| -rw-r--r-- | ANNOUNCE | 38 | ||||
| -rw-r--r-- | CHANGES | 9 | ||||
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | INSTALL | 4 | ||||
| -rw-r--r-- | LICENSE | 4 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | README | 12 | ||||
| -rwxr-xr-x | configure | 24 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | libpng-1.4.11.txt (renamed from libpng-1.4.10.txt) | 10 | ||||
| -rw-r--r-- | libpng.3 | 24 | ||||
| -rw-r--r-- | libpngpf.3 | 4 | ||||
| -rw-r--r-- | png.5 | 2 | ||||
| -rw-r--r-- | png.c | 6 | ||||
| -rw-r--r-- | png.h | 22 | ||||
| -rw-r--r-- | pngconf.h | 2 | ||||
| -rw-r--r-- | pngpread.c | 2 | ||||
| -rw-r--r-- | pngpriv.h | 2 | ||||
| -rw-r--r-- | pngread.c | 2 | ||||
| -rw-r--r-- | pngrtran.c | 7 | ||||
| -rw-r--r-- | pngrutil.c | 2 | ||||
| -rw-r--r-- | pngset.c | 21 | ||||
| -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.cegcc | 2 | ||||
| -rw-r--r-- | scripts/makefile.linux | 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 |
37 files changed, 131 insertions, 118 deletions
@@ -1,5 +1,5 @@ -Libpng 1.4.10 - March 15, 2012 +Libpng 1.4.11 - March 29, 2012 This is a public release of libpng, intended for use in production codes. @@ -8,36 +8,26 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.4.10.tar.xz (LZMA-compressed, recommended) - libpng-1.4.10.tar.gz - libpng-1.4.10.tar.bz2 + libpng-1.4.11.tar.xz (LZMA-compressed, recommended) + libpng-1.4.11.tar.gz + libpng-1.4.11.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lpng1410.7z (LZMA-compressed, recommended) - lpng1410.zip + lpng1411.7z (LZMA-compressed, recommended) + lpng1411.zip Other information: - libpng-1.4.10-README.txt - libpng-1.4.10-LICENSE.txt - -Changes since the last public release (1.4.9): - - Removed two useless #ifdef directives from pngread.c and one from pngrutil.c - Eliminated redundant png_push_read_tEXt|zTXt|iTXt|unknown code from - pngpread.c and use the sequential png_handle_tEXt, etc., in pngrutil.c; - now that png_ptr->buffer is inaccessible to applications, the special - handling is no longer useful. - Fixed bug with png_handle_hIST with odd chunk length (Frank Busse). - Fixed incorrect type (int copy should be png_size_t copy) in png_inflate(). - Fixed off-by-one bug in png_handle_sCAL() when using fixed point arithmetic, - causing out-of-bounds read in png_set_sCAL() because of failure to copy - the string terminators. This bug was introduced in libpng-1.0.6 (Frank - Busse). - Removed the png_free() of unused png_ptr->current_text from pngread.c. - Fixed PNG_LIBPNG_BUILD_BASE_TYPE definition in png.h + libpng-1.4.11-README.txt + libpng-1.4.11-LICENSE.txt + +Changes since the last public release (1.4.10): + + Revised png_set_text_2() to avoid potential memory corruption (fixes + CVE-2011-3048). + Prevent PNG_EXPAND+PNG_SHIFT doing the shift twice. Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit @@ -2847,7 +2847,8 @@ version 1.4.10beta01 [February 27, 2011] now that png_ptr->buffer is inaccessible to applications, the special handling is no longer useful. Fixed bug with png_handle_hIST with odd chunk length (Frank Busse). - Fixed incorrect type (int copy should be png_size_t copy) in png_inflate(). + Fixed incorrect type (int copy should be png_size_t copy) in png_inflate() + (fixes CVE-2011-3045). Fixed off-by-one bug in png_handle_sCAL() when using fixed point arithmetic, causing out-of-bounds read in png_set_sCAL() because of failure to copy the string terminators. This bug was introduced in libpng-1.0.6 (Frank @@ -2860,6 +2861,12 @@ version 1.4.10rc02 [March 6, 2012] Fixed PNG_LIBPNG_BUILD_BASE_TYPE definition in png.h version 1.4.10 [March 15, 2012] + No changes. + +version 1.4.11 [March 29, 2012] + Revised png_set_text_2() to avoid potential memory corruption (fixes + CVE-2011-3048). + Prevent PNG_EXPAND+PNG_SHIFT doing the shift twice. Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index c730a6d27..1e761f916 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,7 @@ enable_testing() set(PNGLIB_MAJOR 1) set(PNGLIB_MINOR 4) -set(PNGLIB_RELEASE 10) +set(PNGLIB_RELEASE 11) set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR}) set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE}) @@ -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.10 +# VERSION 14.${PNGLIB_RELEASE}.1.4.11 VERSION 14.${PNGLIB_RELEASE}.0 SOVERSION 14 CLEAN_DIRECT_OUTPUT 1) @@ -1,5 +1,5 @@ -Installing libpng version 1.4.10 - March 15, 2012 +Installing libpng version 1.4.11 - March 29, 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.10" or "libpng14" and "zlib-1.2.3" +might be called "libpng-1.4.11" 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.10, March 15, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.4.11, March 29, 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 @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 15, 2012 +March 29, 2012 diff --git a/Makefile.am b/Makefile.am index 87e14a2ca..2bcff35d8 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.10.txt + example.c libpng-1.4.11.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 ff8d83214..3baab0d7a 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.10.txt + example.c libpng-1.4.11.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.10 - March 15, 2012 (shared library 14.0) +README for libpng version 1.4.11 - March 29, 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.10) + (gcc, creates libpng14.so.14.1.4.11) makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.10) + (gcc, creates libpng14.so.14.1.4.11) 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.10) + (gcc, creates libpng14.so.14.1.4.11) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng14.so.14.1.4.10) + (gcc, creates libpng14.so.14.1.4.11) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng14.so.14.1.4.10) + (gcc, creates libpng14.so.14.1.4.11) 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.10. +# Generated by GNU Autoconf 2.65 for libpng 1.4.11. # # 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.10' -PACKAGE_STRING='libpng 1.4.10' +PACKAGE_VERSION='1.4.11' +PACKAGE_STRING='libpng 1.4.11' 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.10 to adapt to many kinds of systems. +\`configure' configures libpng 1.4.11 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.10:";; + short | recursive ) echo "Configuration of libpng 1.4.11:";; 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.10 +libpng configure 1.4.11 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.10, which was +It was created by libpng $as_me 1.4.11, 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.10' + VERSION='1.4.11' cat >>confdefs.h <<_ACEOF @@ -2764,10 +2764,10 @@ fi -PNGLIB_VERSION=1.4.10 +PNGLIB_VERSION=1.4.11 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 -PNGLIB_RELEASE=10 +PNGLIB_RELEASE=11 @@ -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.10, which was +This file was extended by libpng $as_me 1.4.11, 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.10 +libpng config.status 1.4.11 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index f93292b49..245fa8e7d 100644 --- a/configure.ac +++ b/configure.ac @@ -16,17 +16,17 @@ dnl should not be necessary to regenerate configure if the time dnl stamps are correct AC_PREREQ(2.59) -AC_INIT([libpng], [1.4.10], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.4.11], [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.10 +PNGLIB_VERSION=1.4.11 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 -PNGLIB_RELEASE=10 +PNGLIB_RELEASE=11 dnl End of version number stuff diff --git a/libpng-1.4.10.txt b/libpng-1.4.11.txt index 8456e2487..f01f9ee49 100644 --- a/libpng-1.4.10.txt +++ b/libpng-1.4.11.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.10 - March 15, 2012 + libpng version 1.4.11 - March 29, 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.10 - March 15, 2012 + libpng versions 0.97, January 1998, through 1.4.11 - March 29, 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.10, not all possible expansions are supported. +As of libpng version 1.4.11, 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 @@ -3312,13 +3312,13 @@ Other rules can be inferred by inspecting the libpng source. XIII. Y2K Compliance in libpng -March 15, 2012 +March 29, 2012 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.10 are Y2K compliant. It is my belief that earlier +upward through 1.4.11 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 15, 2012" +.TH LIBPNG 3 "March 29, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.10 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.11 .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.10 - March 15, 2012 + libpng version 1.4.11 - March 29, 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.10 - March 15, 2012 + libpng versions 0.97, January 1998, through 1.4.11 - March 29, 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.10, not all possible expansions are supported. +As of libpng version 1.4.11, 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 @@ -4207,13 +4207,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XIII. Y2K Compliance in libpng -March 15, 2012 +March 29, 2012 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.10 are Y2K compliant. It is my belief that earlier +upward through 1.4.11 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 @@ -4419,6 +4419,8 @@ the first widely used release: 1.4.10beta01 14 10410 14.so.14.10[.0] 1.4.10rc01-02 14 10410 14.so.14.10[.0] 1.4.10 14 10410 14.so.14.10[.0] + 1.4.11rc01 14 10411 14.so.14.11[.0] + 1.4.11 14 10411 14.so.14.11[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -4428,7 +4430,7 @@ for applications, is an unsigned integer of the form xyyzz corresponding to the source version x.y.z (leading zeros in y and z). Beta versions were given the previous public release number plus a letter, until version 1.0.6j; from then on they were given the upcoming public -release number plus "betaNN" or "rcN". +release number plus "betaNN" or "rcNN". .SH "SEE ALSO" .BR "png"(5), " libpngpf"(3), " zlib"(3), " deflate"(5), " " and " zlib"(5) @@ -4474,7 +4476,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.10 - March 15, 2012: +Libpng version 1.4.11 - March 29, 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). @@ -4497,7 +4499,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.4.10, March 15, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.4.11, March 29, 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 @@ -4596,7 +4598,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 15, 2012 +March 29, 2012 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index e9894739c..edb2138af 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "March 15, 2012" +.TH LIBPNGPF 3 "March 29, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.10 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.11 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "March 15, 2012" +.TH PNG 5 "March 29, 2012" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -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_10 Your_png_h_is_not_version_1_4_10; +typedef version_1_4_11 Your_png_h_is_not_version_1_4_11; /* 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.10 - March 15, 2012" PNG_STRING_NEWLINE \ + "libpng version 1.4.11 - March 29, 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.10 - March 15, 2012\ + return ((png_charp) "libpng version 1.4.11 - March 29, 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.10 - March 15, 2012 + * libpng version 1.4.11 - March 29, 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.10 - March 15, 2012: Glenn + * libpng versions 0.97, January 1998, through 1.4.11 - March 29, 2012: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -167,6 +167,8 @@ * 1.4.10beta01 14 10410 14.so.14.10[.0] * 1.4.10rc01-02 14 10410 14.so.14.10[.0] * 1.4.10 14 10410 14.so.14.10[.0] + * 1.4.11rc01 14 10411 14.so.14.11[.0] + * 1.4.11 14 10411 14.so.14.11[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -198,7 +200,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.4.10, March 15, 2012, are + * libpng versions 1.2.6, August 15, 2004, through 1.4.11, March 29, 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: @@ -310,13 +312,13 @@ * Y2K compliance in libpng: * ========================= * - * March 15, 2012 + * March 29, 2012 * * 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.10 are Y2K compliant. It is my belief that earlier + * upward through 1.4.11 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 @@ -372,9 +374,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.4.10" +#define PNG_LIBPNG_VER_STRING "1.4.11" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.10 - March 15, 2012\n" + " libpng version 1.4.11 - March 29, 2012\n" #define PNG_LIBPNG_VER_SONUM 14 #define PNG_LIBPNG_VER_DLLNUM 14 @@ -382,7 +384,7 @@ /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ #define PNG_LIBPNG_VER_MAJOR 1 #define PNG_LIBPNG_VER_MINOR 4 -#define PNG_LIBPNG_VER_RELEASE 10 +#define PNG_LIBPNG_VER_RELEASE 11 /* This should match the numeric part of the final component of * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ @@ -412,7 +414,7 @@ * version 1.0.0 was mis-numbered 100 instead of 10000). From * version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release */ -#define PNG_LIBPNG_VER 10410 /* 1.4.10 */ +#define PNG_LIBPNG_VER 10411 /* 1.4.11 */ #ifndef PNG_VERSION_INFO_ONLY /* Include the compression library's header */ @@ -1498,7 +1500,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_10; +typedef png_structp version_1_4_11; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.4.10 - March 15, 2012 + * libpng version 1.4.11 - March 29, 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/pngpread.c b/pngpread.c index f959a86bc..51ad6994a 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.4.10 [March 15, 2012] + * Last changed in libpng 1.4.10 [March 8, 2012] * Copyright (c) 1998-2012 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.) @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.4.10 - March 15, 2012 + * libpng version 1.4.11 - March 29, 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 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.4.10 [March 15, 2012] + * Last changed in libpng 1.4.10 [March 8, 2012] * Copyright (c) 1998-2012 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.) diff --git a/pngrtran.c b/pngrtran.c index f9c090be2..cdf6f1e16 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,8 +1,8 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.4.8 [July 7, 2011] - * Copyright (c) 1998-2011 Glenn Randers-Pehrson + * Last changed in libpng 1.4.11 [March 29, 2012] + * Copyright (c) 1998-2012 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.) * @@ -1159,6 +1159,7 @@ png_init_read_transformations(png_structp png_ptr) #ifdef PNG_READ_SHIFT_SUPPORTED if ((png_ptr->transformations & PNG_SHIFT) && + !(png_ptr->transformations & PNG_EXPAND) && (color_type == PNG_COLOR_TYPE_PALETTE)) { png_uint_16 i; @@ -1179,6 +1180,8 @@ png_init_read_transformations(png_structp png_ptr) png_ptr->palette[i].green >>= sg; png_ptr->palette[i].blue >>= sb; } + + png_ptr->transformations &= ~PNG_SHIFT; } #endif /* PNG_READ_SHIFT_SUPPORTED */ } diff --git a/pngrutil.c b/pngrutil.c index d65eb4250..90cb6f28e 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.4.10 [March 15, 2012] + * Last changed in libpng 1.4.10 [March 8, 2012] * Copyright (c) 1998-2012 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.) @@ -1,8 +1,8 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.4.6 [January 14, 2011] - * Copyright (c) 1998-2011 Glenn Randers-Pehrson + * Last changed in libpng 1.4.11 [March 29, 2012] + * Copyright (c) 1998-2012 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.) * @@ -649,22 +649,26 @@ png_set_text_2(png_structp png_ptr, png_infop info_ptr, png_textp text_ptr, */ if (info_ptr->num_text + num_text > info_ptr->max_text) { + int old_max_text = info_ptr->max_text; + int old_num_text = info_ptr->num_text; + if (info_ptr->text != NULL) { png_textp old_text; - int old_max; - old_max = info_ptr->max_text; info_ptr->max_text = info_ptr->num_text + num_text + 8; old_text = info_ptr->text; + info_ptr->text = (png_textp)png_malloc_warn(png_ptr, (png_size_t)(info_ptr->max_text * png_sizeof(png_text))); if (info_ptr->text == NULL) { - png_free(png_ptr, old_text); + /* Restore to previous condition */ + info_ptr->max_text = old_max_text; + info_ptr->text = old_text; return(1); } - png_memcpy(info_ptr->text, old_text, (png_size_t)(old_max * + png_memcpy(info_ptr->text, old_text, (png_size_t)(old_max_text * png_sizeof(png_text))); png_free(png_ptr, old_text); } @@ -675,7 +679,12 @@ png_set_text_2(png_structp png_ptr, png_infop info_ptr, png_textp text_ptr, info_ptr->text = (png_textp)png_malloc_warn(png_ptr, (png_size_t)(info_ptr->max_text * png_sizeof(png_text))); if (info_ptr->text == NULL) + { + /* Restore to previous condition */ + info_ptr->num_text = old_num_text; + info_ptr->max_text = old_max_text; return(1); + } info_ptr->free_me |= PNG_FREE_TEXT; } png_debug1(3, "allocated %d entries for info_ptr->text", @@ -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_10 your_png_h_is_not_version_1_4_10; +typedef version_1_4_11 your_png_h_is_not_version_1_4_11; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index c0975e0bd..f8a237719 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.4.10 - March 15, 2012 +libpng version 1.4.11 - March 29, 2012 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index a5a4aca53..aded09dea 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.10 - March 15, 2012 + * libpng version 1.4.11 - March 29, 2012 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * diff --git a/scripts/README.txt b/scripts/README.txt index 8a78ccc26..f6f0fce06 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,8 +1,8 @@ -Makefiles for libpng version 1.4.10 - March 15, 2012 +Makefiles for libpng version 1.4.11 - March 29, 2012 makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.10) + (gcc, creates libpng14.so.14.1.4.11) 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.10 - March 15, 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.10) + (gcc, creates libpng14.so.14.1.4.11) 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.10 - March 15, 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.10) + creates libpng14.so.14.1.4.11) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng14.so.14.1.4.10) + creates libpng14.so.14.1.4.11) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng14.so.14.1.4.10) + creates libpng14.so.14.1.4.11) 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 a68fd5473..15e4b1cca 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.4.10 +version=1.4.11 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 6e834dfd0..c3e9cdca7 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.10 +Version: 1.4.11 Libs: -L${libdir} -lpng14 Cflags: -I${includedir} diff --git a/scripts/makefile.cegcc b/scripts/makefile.cegcc index e357ad6dc..6e8f4e3ac 100644 --- a/scripts/makefile.cegcc +++ b/scripts/makefile.cegcc @@ -23,7 +23,7 @@ VERMAJ = 1 VERMIN = 4 -VERMIC = 10 +VERMIC = 11 VER = $(VERMAJ).$(VERMIN).$(VERMIC) NAME = libpng PACKAGE = $(NAME)-$(VER) diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 35d0bba20..d1a5cdc83 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 14 -RELEASE = 10 +RELEASE = 11 # Shared library names: LIBSO=$(LIBNAME).so diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index c68a19947..120ff7e29 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.10 +SHLIB_MINOR= 1.4.11 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 d469352ad..d54263630 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.10 +SHLIB_MINOR= 1.4.11 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 3e4db6057..c6bedbadc 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.10 +SHLIB_MINOR= 1.4.11 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/png32ce.def b/scripts/png32ce.def index ad68df868..6f3cb2cae 100644 --- a/scripts/png32ce.def +++ b/scripts/png32ce.def @@ -15,7 +15,7 @@ LIBRARY lpngce png_get_int_32 EXPORTS -;Version 1.4.10 +;Version 1.4.11 png_build_grayscale_palette @1 ; png_check_sig @2 png_chunk_error @3 diff --git a/scripts/pngos2.def b/scripts/pngos2.def index e64a5de50..7ef1e4a59 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.4.10 +; Version 1.4.11 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngwin.def b/scripts/pngwin.def index fd2c98219..26f86244c 100644 --- a/scripts/pngwin.def +++ b/scripts/pngwin.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.4.10 +;Version 1.4.11 png_build_grayscale_palette png_chunk_error png_chunk_warning |