diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2012-03-29 00:00:24 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2012-03-29 06:28:47 -0500 |
| commit | 4761085af830c09f35e5b120d8996bcbfed969b9 (patch) | |
| tree | a3567933731373a6261147653aadff633fa8ec2b | |
| parent | e4e87743afc51f9d2975cfaf8e52ca5777bfdced (diff) | |
| download | libpng-4761085af830c09f35e5b120d8996bcbfed969b9.tar.gz | |
[libpng10] Imported from libpng-1.0.59.tarv1.0.59
53 files changed, 167 insertions, 150 deletions
@@ -1,5 +1,5 @@ -Libpng 1.0.58 - March 8, 2012 +Libpng 1.0.59 - March 29, 2012 This is a public release of libpng, intended for use in production codes. @@ -8,54 +8,43 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.0.58.tar.xz (LZMA-compressed, recommended) - libpng-1.0.58.tar.gz - libpng-1.0.58.tar.bz2 + libpng-1.0.59.tar.xz (LZMA-compressed, recommended) + libpng-1.0.59.tar.gz + libpng-1.0.59.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.0.58-no-config.tar.xz (LZMA-compressed, recommended) - libpng-1.0.58-no-config.tar.gz - libpng-1.0.58-no-config.tar.bz2 + libpng-1.0.59-no-config.tar.xz (LZMA-compressed, recommended) + libpng-1.0.59-no-config.tar.gz + libpng-1.0.59-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lpng1058.zip - lpng1058.7z - lpng1058.tar.bz2 + lpng1059.zip + lpng1059.7z + lpng1059.tar.bz2 Project files - libpng-1.0.58-project-netware.zip - libpng-1.0.58-project-wince.zip + libpng-1.0.59-project-netware.zip + libpng-1.0.59-project-wince.zip Other information: - libpng-1.0.58-README.txt - libpng-1.0.58-KNOWNBUGS.txt - libpng-1.0.58-LICENSE.txt - libpng-1.0.58-Y2K-compliance.txt - -Changes since the last public release (1.0.57): - -version 1.0.58 [March 8, 2012] - - 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. - Added libpng license text to pnggccrd.c and pngvcrd.c (requested by Chrome). - Removed all of the assembler code from pnggccrd.c and just "return 2;". + libpng-1.0.59-README.txt + libpng-1.0.59-KNOWNBUGS.txt + libpng-1.0.59-LICENSE.txt + libpng-1.0.59-Y2K-compliance.txt + +Changes since the last public release (1.0.58): + +version 1.0.59 [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 png-mng-implement at lists.sf.net (subscription required; visit @@ -2759,6 +2759,11 @@ version 1.2.48rc02 [March 2, 2012] version 1.0.58 and 1.2.48 [March 8, 2012] No changes. +version 1.0.59 and 1.2.49 [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 png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement @@ -1,5 +1,5 @@ -Installing libpng version 1.0.58 - March 8, 2012 +Installing libpng version 1.0.59 - 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.0.58" or "libpng10" and "zlib-1.2.3" +might be called "libpng-1.0.59" or "libpng10" and "zlib-1.2.3" or "zlib123") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: @@ -1,5 +1,5 @@ -Known bugs in libpng version 1.0.58 +Known bugs in libpng version 1.0.59 1. February 23, 2006: The custom makefiles don't build libpng with -lz. @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.0.58, March 8, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.0.59, March 29, 2012, are Copyright (c) 2004, 2006-2009 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 8, 2012 +March 29, 2012 diff --git a/Makefile.am b/Makefile.am index 60d6099b9..e63772d55 100644 --- a/Makefile.am +++ b/Makefile.am @@ -89,7 +89,7 @@ EXTRA_DIST= \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.0.58.txt pnggccrd.c pngvcrd.c + example.c libpng-1.0.59.txt pnggccrd.c pngvcrd.c CLEANFILES= pngout.png libpng10.pc libpng10-config libpng.vers \ libpng.sym diff --git a/Makefile.in b/Makefile.in index 661d87fef..95e9391c3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -354,7 +354,7 @@ EXTRA_DIST = \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.0.58.txt pnggccrd.c pngvcrd.c + example.c libpng-1.0.59.txt pnggccrd.c pngvcrd.c CLEANFILES = pngout.png libpng10.pc libpng10-config libpng.vers \ libpng.sym @@ -1,4 +1,4 @@ -README for libpng version 1.0.58 - March 8, 2012 (shared library 10.0) +README for libpng version 1.0.59 - March 29, 2012 (shared library 10.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. @@ -199,11 +199,11 @@ Files in this distribution: makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF gcc makefile symbol versioning, - creates libpng10.so.0.1.0.58) + creates libpng10.so.0.1.0.59) makefile.linux => Linux/ELF makefile (gcc, creates - libpng10.so.0.1.0.58) + libpng10.so.0.1.0.59) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng10.so.0.1.0.58, previously + libpng10.so.0.1.0.59, previously used assembler code tuned for Intel MMX platform) makefile.gcc => Generic makefile (gcc, creates static @@ -228,12 +228,12 @@ Files in this distribution: makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX (cc, creates static lib) makefile.sggcc => Silicon Graphics - (gcc, creates libpng10.so.0.1.0.58) + (gcc, creates libpng10.so.0.1.0.59) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng10.so.0.1.0.58) + (gcc, creates libpng10.so.0.1.0.59) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng10.so.0.1.0.58) + (gcc, creates libpng10.so.0.1.0.59) makefile.32sunu => Sun Ultra 32-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc @@ -1,13 +1,13 @@ Y2K compliance in libpng: ========================= - March 8, 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.0.58 are Y2K compliant. It is my belief that earlier + upward through 1.0.59 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for libpng 1.0.58. +# Generated by GNU Autoconf 2.65 for libpng 1.0.59. # # Report bugs to <png-mng-implement@lists.sourceforge.net>. # @@ -701,8 +701,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.0.58' -PACKAGE_STRING='libpng 1.0.58' +PACKAGE_VERSION='1.0.59' +PACKAGE_STRING='libpng 1.0.59' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1435,7 +1435,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.0.58 to adapt to many kinds of systems. +\`configure' configures libpng 1.0.59 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1505,7 +1505,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.0.58:";; + short | recursive ) echo "Configuration of libpng 1.0.59:";; esac cat <<\_ACEOF @@ -1612,7 +1612,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.0.58 +libpng configure 1.0.59 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2037,7 +2037,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.0.58, which was +It was created by libpng $as_me 1.0.59, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2845,7 +2845,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.0.58' + VERSION='1.0.59' cat >>confdefs.h <<_ACEOF @@ -2909,10 +2909,10 @@ fi -PNGLIB_VERSION=1.0.58 +PNGLIB_VERSION=1.0.59 PNGLIB_MAJOR=1 PNGLIB_MINOR=0 -PNGLIB_RELEASE=58 +PNGLIB_RELEASE=59 @@ -12079,7 +12079,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.0.58, which was +This file was extended by libpng $as_me 1.0.59, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12145,7 +12145,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.0.58 +libpng config.status 1.0.59 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 581a77b2c..5bc78ea91 100644 --- a/configure.ac +++ b/configure.ac @@ -18,15 +18,15 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.0.58], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.0.59], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.0.58 +PNGLIB_VERSION=1.0.59 PNGLIB_MAJOR=1 PNGLIB_MINOR=0 -PNGLIB_RELEASE=58 +PNGLIB_RELEASE=59 dnl End of version number stuff diff --git a/libpng-1.0.58.txt b/libpng-1.0.59.txt index 99a2297b1..fca991314 100644 --- a/libpng-1.0.58.txt +++ b/libpng-1.0.59.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.0.58 - March 8, 2012 + libpng version 1.0.59 - March 29, 2012 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2009 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.0.58 - March 8, 2012 + libpng versions 0.97, January 1998, through 1.0.59 - March 29, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -878,7 +878,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.0.58, not all possible expansions are supported. +As of libpng version 1.0.59, 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 @@ -3052,8 +3052,8 @@ above the comment that says /* Maintainer: Put new private prototypes here ^ and in libpngpf.3 */ The names of all exported functions and variables begin -with "png_", and all publicly visible C preprocessor -macros begin with "PNG_". +with "png_", and all publicly visible C preprocessor +macros begin with "PNG". We put a space after each comma and after each semicolon in "for" statments, and we put spaces before and after each @@ -3076,13 +3076,13 @@ Other rules can be inferred by inspecting the libpng source. XIII. Y2K Compliance in libpng -March 8, 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.0.58 are Y2K compliant. It is my belief that earlier +upward through 1.0.59 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 8, 2012" +.TH LIBPNG 3 "March 29, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.0.58 +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.59 .SH SYNOPSIS \fI\fB @@ -821,7 +821,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.0.58 - March 8, 2012 + libpng version 1.0.59 - March 29, 2012 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -832,7 +832,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.0.58 - March 8, 2012 + libpng versions 0.97, January 1998, through 1.0.59 - March 29, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -1699,7 +1699,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.0.58, not all possible expansions are supported. +As of libpng version 1.0.59, 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 @@ -3873,8 +3873,8 @@ above the comment that says /* Maintainer: Put new private prototypes here ^ and in libpngpf.3 */ The names of all exported functions and variables begin -with "png_", and all publicly visible C preprocessor -macros begin with "PNG_". +with "png_", and all publicly visible C preprocessor +macros begin with "PNG". We put a space after each comma and after each semicolon in "for" statments, and we put spaces before and after each @@ -3897,13 +3897,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XIII. Y2K Compliance in libpng -March 8, 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.0.58 are Y2K compliant. It is my belief that earlier +upward through 1.0.59 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 @@ -4219,6 +4219,11 @@ the first widely used release: 1.0.57 10 10057 10.so.0.57[.0] 1.2.48beta01 13 10248 12.so.0.48[.0] 1.2.48rc01-02 13 10248 12.so.0.48[.0] + 1.0.58 10 10058 10.so.0.58[.0] + 1.2.48 13 10248 12.so.0.48[.0] + 1.2.49rc01 13 10249 12.so.0.49[.0] + 1.0.59 10 10059 10.so.0.59[.0] + 1.2.49 13 10249 12.so.0.49[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -4274,7 +4279,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.0.58 - March 8, 2012: +Libpng version 1.0.59 - 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). @@ -4297,7 +4302,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.0.58, March 8, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.0.59, March 29, 2012, are Copyright (c) 2004,2006-2008 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 @@ -4396,7 +4401,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 8, 2012 +March 29, 2012 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 59a510e72..b343a863e 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "March 8, 2012" +.TH LIBPNGPF 3 "March 29, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.0.58 +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.59 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "March 8, 2012" +.TH PNG 5 "March 29, 2012" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -17,7 +17,7 @@ #include "png.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_0_58 Your_png_h_is_not_version_1_0_58; +typedef version_1_0_59 Your_png_h_is_not_version_1_0_59; /* Version information for C files. This had better match the version * string defined in png.h. @@ -724,13 +724,13 @@ png_get_copyright(png_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.0.58 - March 8, 2012" PNG_STRING_NEWLINE \ + "libpng version 1.0.59 - March 29, 2012" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2011 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.0.58 - March 8, 2012\ + return ((png_charp) "libpng version 1.0.59 - March 29, 2012\ Copyright (c) 1998-2011 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."); @@ -1,6 +1,6 @@ /* png.h - header file for PNG reference library * - * libpng version 1.0.58 - March 8, 2012 + * libpng version 1.0.59 - 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.) @@ -10,7 +10,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.0.58 - March 8, 2012: Glenn + * libpng versions 0.97, January 1998, through 1.0.59 - March 29, 2012: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -277,6 +277,11 @@ * 1.0.57 10 10057 10.so.0.57[.0] * 1.2.48beta01 13 10248 12.so.0.48[.0] * 1.2.48rc01-02 13 10248 12.so.0.48[.0] + * 1.0.58 10 10058 10.so.0.58[.0] + * 1.2.48 13 10248 12.so.0.48[.0] + * 1.2.49rc01 13 10249 12.so.0.49[.0] + * 1.0.59 10 10059 10.so.0.59[.0] + * 1.2.49 13 10249 12.so.0.49[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -308,7 +313,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.0.58, March 8, 2012, are + * libpng versions 1.2.6, August 15, 2004, through 1.0.59, March 29, 2012, are * Copyright (c) 2004, 2006-2011 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: @@ -420,13 +425,13 @@ * Y2K compliance in libpng: * ========================= * - * March 8, 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.0.58 are Y2K compliant. It is my belief that earlier + * upward through 1.0.59 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 @@ -482,9 +487,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.0.58" +#define PNG_LIBPNG_VER_STRING "1.0.59" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.0.58 - March 8, 2012\n" + " libpng version 1.0.59 - March 29, 2012\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 10 @@ -492,7 +497,7 @@ /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ #define PNG_LIBPNG_VER_MAJOR 1 #define PNG_LIBPNG_VER_MINOR 0 -#define PNG_LIBPNG_VER_RELEASE 58 +#define PNG_LIBPNG_VER_RELEASE 59 /* This should match the numeric part of the final component of * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ @@ -522,7 +527,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 10058 /* 1.0.58 */ +#define PNG_LIBPNG_VER 10059 /* 1.0.59 */ #ifndef PNG_VERSION_INFO_ONLY /* Include the compression library's header */ @@ -1562,7 +1567,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_0_58; +typedef png_structp version_1_0_59; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.0.58 - March 8, 2012 + * libpng version 1.0.59 - 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.) diff --git a/pngrtran.c b/pngrtran.c index 33703d46e..7f0ff92e0 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.2.45 [July 7, 2011] - * Copyright (c) 1998-2011 Glenn Randers-Pehrson + * Last changed in libpng 1.2.49 [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.) * @@ -1163,6 +1163,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; @@ -1183,6 +1184,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 */ } @@ -1,8 +1,8 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.2.43 [February 25, 2010] - * Copyright (c) 1998-2010 Glenn Randers-Pehrson + * Last changed in libpng 1.2.49 [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.) * @@ -667,22 +667,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_uint_32)(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); } @@ -693,7 +697,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_uint_32)(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); + } #ifdef PNG_FREE_ME_SUPPORTED info_ptr->free_me |= PNG_FREE_TEXT; #endif @@ -701,6 +710,7 @@ png_set_text_2(png_structp png_ptr, png_infop info_ptr, png_textp text_ptr, png_debug1(3, "allocated %d entries for info_ptr->text", info_ptr->max_text); } + for (i = 0; i < num_text; i++) { png_size_t text_length, key_len; @@ -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_0_58 your_png_h_is_not_version_1_0_58; +typedef version_1_0_59 your_png_h_is_not_version_1_0_59; diff --git a/projects/wince.txt b/projects/wince.txt index ced1fa9ac..8c178dda6 100644 --- a/projects/wince.txt +++ b/projects/wince.txt @@ -1,6 +1,6 @@ A set of project files is available for WinCE. Get -libpng-1.0.58-project-wince.zip from a libpng distribution +libpng-1.0.59-project-wince.zip from a libpng distribution site such as http://libpng.sourceforge.net/index.html Put the zip file in this directory (projects) and then run -"unzip -a libpng-1.0.58-project-wince.zip" +"unzip -a libpng-1.0.59-project-wince.zip" diff --git a/scripts/README.txt b/scripts/README.txt index 2bdfeb35d..f87d01d00 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,8 +1,8 @@ -Makefiles for libpng version 1.0.58 - March 8, 2012 +Makefiles for libpng version 1.0.59 - March 29, 2012 makefile.linux => Linux/ELF makefile - (gcc, creates libpng10.so.0.1.0.58) + (gcc, creates libpng10.so.0.1.0.59) 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.0.58 - March 8, 2012 makefile.dec => DEC Alpha UNIX makefile makefile.dj2 => DJGPP 2 makefile makefile.elf => Linux/ELF makefile symbol versioning, - gcc, creates libpng10.so.0.1.0.58) + gcc, creates libpng10.so.0.1.0.59) makefile.freebsd => FreeBSD makefile makefile.gcc => Generic gcc makefile makefile.gccmmx => Generic gcc makefile previously using MMX code @@ -38,14 +38,14 @@ Makefiles for libpng version 1.0.58 - March 8, 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 libpng10.so.0.1.0.58) + creates libpng10.so.0.1.0.59) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng10.so.0.1.0.58) + creates libpng10.so.0.1.0.59) makefile.solaris-x86 => Solaris 2.X makefile (gcc, no MMX code, - creates libpng10.so.0.1.0.58) + creates libpng10.so.0.1.0.59) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng10.so.0.1.0.58) + creates libpng10.so.0.1.0.59) 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 93fd728cc..da06db7eb 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.0.58 +version=1.0.59 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index eb106e716..fa54efd78 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng10 Name: libpng Description: Loads and saves PNG files -Version: 1.0.58 +Version: 1.0.59 Libs: -L${libdir} -lpng10 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 078285be0..45bf8e3ae 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.58 +PNGMIN = 1.0.59 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 9ff5e6821..d2ab661ea 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.58 +PNGMIN = 1.0.59 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 8f3875dad..2d6fee9a4 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -23,7 +23,7 @@ LN_SF = ln -f -s LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.58 +PNGMIN = 1.0.59 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 101c8c022..dc04573f4 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.58 +PNGMIN = 1.0.59 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cegcc b/scripts/makefile.cegcc index c879dbee2..6ba24a5a5 100644 --- a/scripts/makefile.cegcc +++ b/scripts/makefile.cegcc @@ -23,7 +23,7 @@ VERMAJ = 1 VERMIN = 0 -VERMIC = 58 +VERMIC = 59 VER = $(VERMAJ).$(VERMIN).$(VERMIC) NAME = libpng PACKAGE = $(NAME)-$(VER) diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 27f119111..17ab85fc5 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -77,7 +77,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng10 PNGMAJ = 0 CYGDLL = 10 -PNGMIN = 1.0.58 +PNGMIN = 1.0.59 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index e5c2b488a..8a2854411 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -22,7 +22,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng10 PNGMAJ = 10 -PNGMIN = 1.0.58 +PNGMIN = 1.0.59 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 752583ef2..e456ac744 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.0.58 +PNGMIN = 1.0.59 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng10 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 694e695e1..692b20887 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.58 +PNGMIN = 1.0.59 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 8ab9ad0b4..63cef8e0c 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -17,7 +17,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.58 +PNGMIN = 1.0.59 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 33eb98d6f..f652449ac 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -21,7 +21,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.58 +PNGMIN = 1.0.59 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 12fb5f7a8..2cdaea69c 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.58 +PNGMIN = 1.0.59 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index bc56e7090..ad0900b3d 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -21,7 +21,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.58 +PNGMIN = 1.0.59 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 25f0b26fe..ffcc98d4f 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.58 +PNGMIN = 1.0.59 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index b60508bcb..85261bdbb 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -81,7 +81,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng10 PNGMAJ = 0 MINGDLL = 10 -PNGMIN = 1.0.58 +PNGMIN = 1.0.59 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index e5d3be0e6..63f46e073 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng10 LIB= png10 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.0.58 +SHLIB_MINOR= 1.0.59 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 6a38e4ccc..7d1d364a9 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.0.58 +SHLIB_MINOR= 1.0.59 SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngwtran.c pngmem.c pngerror.c pngpread.c diff --git a/scripts/makefile.nommx b/scripts/makefile.nommx index 194c86066..e19ee0210 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.58 +PNGMIN = 1.0.59 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 731e4c17e..4dd959f6e 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.0.58 +SHLIB_MINOR= 1.0.59 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 857da02b5..8e4552da1 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.58 +PNGMIN = 1.0.59 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index b21958e91..3c7300344 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -9,7 +9,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.58 +PNGMIN = 1.0.59 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 98bdcc319..621d57cad 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -9,7 +9,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.58 +PNGMIN = 1.0.59 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 4ee91c00b..66fab0bf1 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -11,7 +11,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.0.58 +PNGMIN = 1.0.59 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng10 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 40a860f1e..444080402 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.58 +PNGMIN = 1.0.59 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index 2f8c88a7b..8530272be 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.58 +PNGMIN = 1.0.59 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/png32ce.def b/scripts/png32ce.def index ac07247b9..73b7f253a 100644 --- a/scripts/png32ce.def +++ b/scripts/png32ce.def @@ -5,7 +5,7 @@ LIBRARY lpngce EXPORTS -;Version 1.0.58 +;Version 1.0.59 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 diff --git a/scripts/pngos2.def b/scripts/pngos2.def index e47d1ae42..31e91bdb0 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.0.58 +; Version 1.0.59 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index cf60aecdf..6b4251675 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.0.58 +;Version 1.0.59 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 |