From e0f6c7d90be03d92c3749924cea38d09baeeddf3 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Thu, 29 Apr 2010 11:41:02 -0500 Subject: [PATCH] [master] Revert to version 1.4.2rc05 --- ANNOUNCE | 21 ++-- CHANGES | 5 - CMakeLists.txt | 2 +- INSTALL | 4 +- LICENSE | 2 +- Makefile.am | 2 +- Makefile.in | 2 +- README | 12 +- configure | 22 ++-- configure.ac | 4 +- libpng-1.4.2rc06.txt => libpng-1.4.2rc05.txt | 8 +- libpng.3 | 14 +-- libpngpf.3 | 2 +- png.c | 6 +- png.h | 16 +-- pngconf.h | 2 +- pngpriv.h | 2 +- pngrutil.c | 115 +++++++++--------- pngtest.c | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- .../xcode/libpng.xcodeproj/project.pbxproj | 4 +- scripts/README.txt | 12 +- scripts/libpng-config-head.in | 2 +- scripts/libpng.pc.in | 2 +- scripts/makefile.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.openbsd | 2 +- scripts/png32ce.def | 2 +- scripts/pngos2.def | 2 +- scripts/pngwin.def | 2 +- 31 files changed, 133 insertions(+), 146 deletions(-) rename libpng-1.4.2rc06.txt => libpng-1.4.2rc05.txt (99%) diff --git a/ANNOUNCE b/ANNOUNCE index d9c8da04e..15846c349 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.4.2rc06 - May 4, 2010 +Libpng 1.4.2rc05 - April 29, 2010 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,20 +9,20 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.4.2rc06.tar.xz (LZMA-compressed, recommended) - 1.4.2rc06.tar.gz - 1.4.2rc06.tar.bz2 + 1.4.2rc05.tar.xz (LZMA-compressed, recommended) + 1.4.2rc05.tar.gz + 1.4.2rc05.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp142r06.zip - lp142r06.7z + lp142r05.zip + lp142r05.7z Other information: - 1.4.2rc06-README.txt - 1.4.2rc06-LICENSE.txt + 1.4.2rc05-README.txt + 1.4.2rc05-LICENSE.txt Changes since the last public release (1.4.1): @@ -60,11 +60,6 @@ version 1.4.2rc05 [April 29, 2010] png.h is removed if both READ and WRITE USER_TRANSFORM are turned off but was left defined in pngtrans.c -version 1.4.2rc06 [May 4, 2010] - Moved declarations of umsg[] inside the proper #ifdef blocks in pngrutil.c - Added a typecast in pngrutil.c to stifle compiler warning in the calculation - of the png_ptr->rowbuf pointer into png_ptr->big_row_buf. - Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement). diff --git a/CHANGES b/CHANGES index b1ae7ec7a..158756530 100644 --- a/CHANGES +++ b/CHANGES @@ -2571,11 +2571,6 @@ version 1.4.2rc05 [April 29, 2010] png.h is removed if both READ and WRITE USER_TRANSFORM are turned off but was left defined in pngtrans.c -version 1.4.2rc06 [May 4, 2010] - Moved declarations of umsg[] inside the proper #ifdef blocks in pngrutil.c - Added a typecast in pngrutil.c to stifle compiler warning in the calculation - of the png_ptr->rowbuf pointer into png_ptr->big_row_buf. - Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement). diff --git a/CMakeLists.txt b/CMakeLists.txt index a7b1d96c7..8fb87a949 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -213,7 +213,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 14.${PNGLIB_RELEASE}.1.4.2rc06 +# VERSION 14.${PNGLIB_RELEASE}.1.4.2rc05 VERSION 14.${PNGLIB_RELEASE}.0 SOVERSION 14 CLEAN_DIRECT_OUTPUT 1) diff --git a/INSTALL b/INSTALL index 984312bfc..49bdfd9ce 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.4.2rc06 - April 29, 2010 +Installing libpng version 1.4.2rc05 - April 29, 2010 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.2rc06" or "libpng14" and "zlib-1.2.3" +might be called "libpng-1.4.2rc05" 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: diff --git a/LICENSE b/LICENSE index ed7b16fea..3001575a5 100644 --- a/LICENSE +++ b/LICENSE @@ -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.2rc06, April 29, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.4.2rc05, April 29, 2010, 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/Makefile.am b/Makefile.am index b544a6340..a2ac15e05 100644 --- a/Makefile.am +++ b/Makefile.am @@ -73,7 +73,7 @@ EXTRA_DIST= \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.4.2rc06.txt + example.c libpng-1.4.2rc05.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 055346f6e..e7a6a1598 100644 --- a/Makefile.in +++ b/Makefile.in @@ -333,7 +333,7 @@ EXTRA_DIST = \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.4.2rc06.txt + example.c libpng-1.4.2rc05.txt CLEANFILES = pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers \ libpng.sym diff --git a/README b/README index d9e311380..83cf6be9a 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.4.2rc06 - April 29, 2010 (shared library 14.0) +README for libpng version 1.4.2rc05 - April 29, 2010 (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. @@ -185,9 +185,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.2rc06) + gcc, creates libpng14.so.14.1.4.2rc05) makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.2rc06) + (gcc, creates libpng14.so.14.1.4.2rc05) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr (Requires ansi2knr.c from @@ -209,12 +209,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.2rc06) + (gcc, creates libpng14.so.14.1.4.2rc05) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng14.so.14.1.4.2rc06) + (gcc, creates libpng14.so.14.1.4.2rc05) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng14.so.14.1.4.2rc06) + (gcc, creates libpng14.so.14.1.4.2rc05) makefile.32sunu => Sun Ultra 32-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc diff --git a/configure b/configure index 06820a42c..04cef47d9 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for libpng 1.4.2rc06. +# Generated by GNU Autoconf 2.65 for libpng 1.4.2rc05. # # Report bugs to . # @@ -701,8 +701,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.4.2rc06' -PACKAGE_STRING='libpng 1.4.2rc06' +PACKAGE_VERSION='1.4.2rc05' +PACKAGE_STRING='libpng 1.4.2rc05' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1432,7 +1432,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.2rc06 to adapt to many kinds of systems. +\`configure' configures libpng 1.4.2rc05 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1502,7 +1502,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.4.2rc06:";; + short | recursive ) echo "Configuration of libpng 1.4.2rc05:";; esac cat <<\_ACEOF @@ -1607,7 +1607,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.4.2rc06 +libpng configure 1.4.2rc05 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2032,7 +2032,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.2rc06, which was +It was created by libpng $as_me 1.4.2rc05, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2840,7 +2840,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.4.2rc06' + VERSION='1.4.2rc05' cat >>confdefs.h <<_ACEOF @@ -2904,7 +2904,7 @@ fi -PNGLIB_VERSION=1.4.2rc06 +PNGLIB_VERSION=1.4.2rc05 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 PNGLIB_RELEASE=2 @@ -12032,7 +12032,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.2rc06, which was +This file was extended by libpng $as_me 1.4.2rc05, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12098,7 +12098,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.2rc06 +libpng config.status 1.4.2rc05 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 8f9317831..c1959ee2b 100644 --- a/configure.ac +++ b/configure.ac @@ -18,12 +18,12 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.4.2rc06], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.4.2rc05], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.4.2rc06 +PNGLIB_VERSION=1.4.2rc05 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 PNGLIB_RELEASE=2 diff --git a/libpng-1.4.2rc06.txt b/libpng-1.4.2rc05.txt similarity index 99% rename from libpng-1.4.2rc06.txt rename to libpng-1.4.2rc05.txt index 4e12fdbd0..814af054e 100644 --- a/libpng-1.4.2rc06.txt +++ b/libpng-1.4.2rc05.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.2rc06 - April 29, 2010 + libpng version 1.4.2rc05 - April 29, 2010 Updated and distributed by Glenn Randers-Pehrson 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.4.2rc06 - April 29, 2010 + libpng versions 0.97, January 1998, through 1.4.2rc05 - April 29, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -903,7 +903,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.2rc06, not all possible expansions are supported. +As of libpng version 1.4.2rc05, 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 @@ -3303,7 +3303,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.2rc06 are Y2K compliant. It is my belief that earlier +upward through 1.4.2rc05 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that diff --git a/libpng.3 b/libpng.3 index 8c3173fd8..c8c4b732a 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "April 29, 2010" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.2rc06 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.2rc05 .SH SYNOPSIS \fI\fB @@ -785,7 +785,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.4.2rc06 - April 29, 2010 + libpng version 1.4.2rc05 - April 29, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -796,7 +796,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.4.2rc06 - April 29, 2010 + libpng versions 0.97, January 1998, through 1.4.2rc05 - April 29, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -1688,7 +1688,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.2rc06, not all possible expansions are supported. +As of libpng version 1.4.2rc05, 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 @@ -4088,7 +4088,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.2rc06 are Y2K compliant. It is my belief that earlier +upward through 1.4.2rc05 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 @@ -4322,7 +4322,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.2rc06 - April 29, 2010: +Libpng version 1.4.2rc05 - April 29, 2010: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -4345,7 +4345,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.4.2rc06, April 29, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.4.2rc05, April 29, 2010, 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 088a103e4..3001637d3 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "April 29, 2010" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.2rc06 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.2rc05 (private functions) .SH SYNOPSIS \fB#include \fP diff --git a/png.c b/png.c index 31951e375..d8fc5331b 100644 --- a/png.c +++ b/png.c @@ -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_2rc06 Your_png_h_is_not_version_1_4_2rc06; +typedef version_1_4_2rc05 Your_png_h_is_not_version_1_4_2rc05; /* Version information for C files. This had better match the version * string defined in png.h. @@ -551,13 +551,13 @@ png_get_copyright(png_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.4.2rc06 - April 29, 2010" PNG_STRING_NEWLINE \ + "libpng version 1.4.2rc05 - April 29, 2010" 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.2rc06 - April 29, 2010\ + return ((png_charp) "libpng version 1.4.2rc05 - April 29, 2010\ Copyright (c) 1998-2010 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."); diff --git a/png.h b/png.h index 9ed74b515..af7c1396a 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.4.2rc06 - April 29, 2010 + * libpng version 1.4.2rc05 - April 29, 2010 * Copyright (c) 1998-2010 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.2rc06 - April 29, 2010: Glenn + * libpng versions 0.97, January 1998, through 1.4.2rc05 - April 29, 2010: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -171,7 +171,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.4.2rc06, April 29, 2010, are + * libpng versions 1.2.6, August 15, 2004, through 1.4.2rc05, April 29, 2010, 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: @@ -289,7 +289,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.4.2rc06 are Y2K compliant. It is my belief that earlier + * upward through 1.4.2rc05 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 @@ -345,9 +345,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.4.2rc06" +#define PNG_LIBPNG_VER_STRING "1.4.2rc05" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.2rc06 - April 29, 2010\n" + " libpng version 1.4.2rc05 - April 29, 2010\n" #define PNG_LIBPNG_VER_SONUM 14 #define PNG_LIBPNG_VER_DLLNUM 14 @@ -360,7 +360,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 06 +#define PNG_LIBPNG_VER_BUILD 05 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -1469,7 +1469,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_2rc06; +typedef png_structp version_1_4_2rc05; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngconf.h b/pngconf.h index cb3be4561..861dd3819 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.4.2rc06 - April 29, 2010 + * libpng version 1.4.2rc05 - April 29, 2010 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2010 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpriv.h b/pngpriv.h index 6f8668c14..26c578557 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.4.2rc06 - April 29, 2010 + * libpng version 1.4.2rc05 - April 29, 2010 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2010 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrutil.c b/pngrutil.c index b5db82c79..d13bba3c0 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -203,7 +203,7 @@ png_crc_error(png_structp png_ptr) defined(PNG_READ_iCCP_SUPPORTED) static png_size_t png_inflate(png_structp png_ptr, const png_byte *data, png_size_t size, - png_bytep output, png_size_t output_size) + png_bytep output, png_size_t output_size) { png_size_t count = 0; @@ -229,11 +229,11 @@ png_inflate(png_structp png_ptr, const png_byte *data, png_size_t size, if ((ret == Z_OK || ret == Z_STREAM_END) && avail > 0) { if (output != 0 && output_size > count) - { - int copy = output_size - count; - if (avail < copy) copy = avail; - png_memcpy(output + count, png_ptr->zbuf, copy); - } + { + int copy = output_size - count; + if (avail < copy) copy = avail; + png_memcpy(output + count, png_ptr->zbuf, copy); + } count += avail; } @@ -254,33 +254,31 @@ png_inflate(png_structp png_ptr, const png_byte *data, png_size_t size, * buffer if available. */ { - char *msg; - if (png_ptr->zstream.msg != 0) - msg = png_ptr->zstream.msg; - else - { + char *msg, umsg[52]; + if (png_ptr->zstream.msg != 0) + msg = png_ptr->zstream.msg; + else + { #ifdef PNG_STDIO_SUPPORTED - char umsg[52]; + switch (ret) + { + case Z_BUF_ERROR: + msg = "Buffer error in compressed datastream in %s chunk"; + break; + case Z_DATA_ERROR: + msg = "Data error in compressed datastream in %s chunk"; + break; + default: + msg = "Incomplete compressed datastream in %s chunk"; + break; + } - switch (ret) - { - case Z_BUF_ERROR: - msg = "Buffer error in compressed datastream in %s chunk"; - break; - case Z_DATA_ERROR: - msg = "Data error in compressed datastream in %s chunk"; - break; - default: - msg = "Incomplete compressed datastream in %s chunk"; - break; - } - - png_snprintf(umsg, sizeof umsg, msg, png_ptr->chunk_name); - msg = umsg; + png_snprintf(umsg, sizeof umsg, msg, png_ptr->chunk_name); + msg = umsg; #else - msg = "Damaged compressed datastream in chunk other than IDAT"; + msg = "Damaged compressed datastream in chunk other than IDAT"; #endif - } + } png_warning(png_ptr, msg); } @@ -315,9 +313,9 @@ png_decompress_chunk(png_structp png_ptr, int comp_type, else if (comp_type == PNG_COMPRESSION_TYPE_BASE) { png_size_t expanded_size = png_inflate(png_ptr, - (png_bytep)(png_ptr->chunkdata + prefix_size), + (png_bytep)(png_ptr->chunkdata + prefix_size), chunklength - prefix_size, - 0/*output*/, 0/*output size*/); + 0/*output*/, 0/*output size*/); /* Now check the limits on this chunk - if the limit fails the * compressed data will be removed, the prefix will remain. @@ -343,42 +341,41 @@ png_decompress_chunk(png_structp png_ptr, int comp_type, if (expanded_size > 0) { /* Success (maybe) - really uncompress the chunk. */ - png_size_t new_size = 0; - png_charp text = png_malloc_warn(png_ptr, - prefix_size + expanded_size + 1); + png_size_t new_size = 0; + png_charp text = png_malloc_warn(png_ptr, + prefix_size + expanded_size + 1); if (text != NULL) { - png_memcpy(text, png_ptr->chunkdata, prefix_size); - new_size = png_inflate(png_ptr, + png_memcpy(text, png_ptr->chunkdata, prefix_size); + new_size = png_inflate(png_ptr, (png_bytep)(png_ptr->chunkdata + prefix_size), - chunklength - prefix_size, + chunklength - prefix_size, (png_bytep)(text + prefix_size), expanded_size); - text[prefix_size + expanded_size] = 0; /* just in case */ + text[prefix_size + expanded_size] = 0; /* just in case */ - if (new_size == expanded_size) - { - png_free(png_ptr, png_ptr->chunkdata); - png_ptr->chunkdata = text; - *newlength = prefix_size + expanded_size; - return; /* The success return! */ - } + if (new_size == expanded_size) + { + png_free(png_ptr, png_ptr->chunkdata); + png_ptr->chunkdata = text; + *newlength = prefix_size + expanded_size; + return; /* The success return! */ + } - png_warning(png_ptr, "png_inflate logic error"); - png_free(png_ptr, text); - } - else + png_warning(png_ptr, "png_inflate logic error"); + png_free(png_ptr, text); + } + else png_warning(png_ptr, "Not enough memory to decompress chunk"); } } else /* if (comp_type != PNG_COMPRESSION_TYPE_BASE) */ { -#ifdef PNG_STDIO_SUPPORTED char umsg[50]; - png_snprintf(umsg, sizeof umsg, "Unknown zTXt compression type %d", - comp_type); +#ifdef PNG_STDIO_SUPPORTED + png_snprintf(umsg, sizeof umsg, "Unknown zTXt compression type %d", comp_type); png_warning(png_ptr, umsg); #else png_warning(png_ptr, "Unknown zTXt compression type"); @@ -395,13 +392,13 @@ png_decompress_chunk(png_structp png_ptr, int comp_type, png_charp text = png_malloc_warn(png_ptr, prefix_size + 1); if (text != NULL) { - if (prefix_size > 0) + if (prefix_size > 0) png_memcpy(text, png_ptr->chunkdata, prefix_size); - png_free(png_ptr, png_ptr->chunkdata); - png_ptr->chunkdata = text; + png_free(png_ptr, png_ptr->chunkdata); + png_ptr->chunkdata = text; - /* This is an extra zero in the 'uncompressed' part. */ - *(png_ptr->chunkdata + prefix_size) = 0x00; + /* This is an extra zero in the 'uncompressed' part. */ + *(png_ptr->chunkdata + prefix_size) = 0x00; } /* Ignore a malloc error here - it is safe. */ } @@ -3325,8 +3322,8 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) /* Use 16-byte aligned memory for row_buf with at least 16 bytes * of padding before and after row_buf. */ - png_ptr->row_buf = png_ptr->big_row_buf + 32 - - (((unsigned long)png_ptr->big_row_buf + 15) & 0x0F); + png_ptr->row_buf = png_ptr->big_row_buf + 32 + - (((png_alloc_size_t)&(png_ptr->big_row_buf[0]) + 15) % 16); png_ptr->old_big_row_buf_size = row_bytes + 48; #else /* Use 32 bytes of padding before and 16 bytes after row_buf. */ diff --git a/pngtest.c b/pngtest.c index 068817bc6..74fd21ce9 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1627,4 +1627,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_2rc06 your_png_h_is_not_version_1_4_2rc06; +typedef version_1_4_2rc05 your_png_h_is_not_version_1_4_2rc05; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 7ac82b8df..283910605 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.4.2rc06 - April 29, 2010 +libpng version 1.4.2rc05 - April 29, 2010 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index e460b5616..b7a8a3537 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@