diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2010-05-04 09:31:09 -0500 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2010-05-04 09:34:13 -0500 |
commit | 77237196c7331355c7da0feed7c4919f4d473d4d (patch) | |
tree | 73c857b96ee403a3c40d9a8c46f7bc09038d3c93 | |
parent | a310a3b398af6c1bbc878e0ea6d61675e474988d (diff) | |
download | libpng-77237196c7331355c7da0feed7c4919f4d473d4d.tar.gz |
[master] Imported from libpng-1.4.2rc06.tarv1.4.2rc06
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-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 | 22 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | example.c | 2 | ||||
-rw-r--r-- | libpng-1.4.2rc06.txt (renamed from libpng-1.4.2rc05.txt) | 10 | ||||
-rw-r--r-- | libpng.3 | 20 | ||||
-rw-r--r-- | libpngpf.3 | 4 | ||||
-rw-r--r-- | png.5 | 2 | ||||
-rw-r--r-- | png.c | 8 | ||||
-rw-r--r-- | png.h | 18 | ||||
-rw-r--r-- | pngconf.h | 2 | ||||
-rw-r--r-- | pngget.c | 2 | ||||
-rw-r--r-- | pngmem.c | 2 | ||||
-rw-r--r-- | pngpriv.h | 2 | ||||
-rw-r--r-- | pngrtran.c | 2 | ||||
-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-- | projects/xcode/libpng.xcodeproj/project.pbxproj | 4 | ||||
-rw-r--r-- | scripts/README.txt | 12 | ||||
-rwxr-xr-x | scripts/libpng-config-head.in | 2 | ||||
-rw-r--r-- | scripts/libpng.pc.in | 2 | ||||
-rw-r--r-- | scripts/makefile.ne12bsd | 2 | ||||
-rw-r--r-- | scripts/makefile.netbsd | 2 | ||||
-rw-r--r-- | scripts/makefile.openbsd | 2 | ||||
-rw-r--r-- | scripts/png32ce.def | 2 | ||||
-rw-r--r-- | scripts/pngos2.def | 2 | ||||
-rw-r--r-- | scripts/pngwin.def | 2 |
33 files changed, 82 insertions, 82 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8fb87a949..a7b1d96c7 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.2rc05 +# VERSION 14.${PNGLIB_RELEASE}.1.4.2rc06 VERSION 14.${PNGLIB_RELEASE}.0 SOVERSION 14 CLEAN_DIRECT_OUTPUT 1) @@ -1,5 +1,5 @@ -Installing libpng version 1.4.2rc05 - April 29, 2010 +Installing libpng version 1.4.2rc06 - May 4, 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.2rc05" or "libpng14" and "zlib-1.2.3" +might be called "libpng-1.4.2rc06" 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.2rc05, April 29, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.4.2rc06, May 4, 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 @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -April 29, 2010 +May 4, 2010 diff --git a/Makefile.am b/Makefile.am index a2ac15e05..b544a6340 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.2rc05.txt + example.c libpng-1.4.2rc06.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 e7a6a1598..055346f6e 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.2rc05.txt + example.c libpng-1.4.2rc06.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.2rc05 - April 29, 2010 (shared library 14.0) +README for libpng version 1.4.2rc06 - May 4, 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.2rc05) + gcc, creates libpng14.so.14.1.4.2rc06) makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.2rc05) + (gcc, creates libpng14.so.14.1.4.2rc06) 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.2rc05) + (gcc, creates libpng14.so.14.1.4.2rc06) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng14.so.14.1.4.2rc05) + (gcc, creates libpng14.so.14.1.4.2rc06) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng14.so.14.1.4.2rc05) + (gcc, creates libpng14.so.14.1.4.2rc06) 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.2rc05. +# Generated by GNU Autoconf 2.65 for libpng 1.4.2rc06. # # 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.4.2rc05' -PACKAGE_STRING='libpng 1.4.2rc05' +PACKAGE_VERSION='1.4.2rc06' +PACKAGE_STRING='libpng 1.4.2rc06' 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.2rc05 to adapt to many kinds of systems. +\`configure' configures libpng 1.4.2rc06 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.2rc05:";; + short | recursive ) echo "Configuration of libpng 1.4.2rc06:";; 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.2rc05 +libpng configure 1.4.2rc06 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.2rc05, which was +It was created by libpng $as_me 1.4.2rc06, 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.2rc05' + VERSION='1.4.2rc06' cat >>confdefs.h <<_ACEOF @@ -2904,7 +2904,7 @@ fi -PNGLIB_VERSION=1.4.2rc05 +PNGLIB_VERSION=1.4.2rc06 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.2rc05, which was +This file was extended by libpng $as_me 1.4.2rc06, 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.2rc05 +libpng config.status 1.4.2rc06 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index c1959ee2b..8f9317831 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.2rc05], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.4.2rc06], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.4.2rc05 +PNGLIB_VERSION=1.4.2rc06 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 PNGLIB_RELEASE=2 @@ -2,7 +2,7 @@ #if 0 /* in case someone actually tries to compile this */ /* example.c - an example of using libpng - * Last changed in libpng 1.4.2 [April 29, 2010] + * Last changed in libpng 1.4.2 [May 4, 2010] * This file has been placed in the public domain by the authors. * Maintained 1998-2010 Glenn Randers-Pehrson * Maintained 1996, 1997 Andreas Dilger) diff --git a/libpng-1.4.2rc05.txt b/libpng-1.4.2rc06.txt index 814af054e..beb642ad1 100644 --- a/libpng-1.4.2rc05.txt +++ b/libpng-1.4.2rc06.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.2rc05 - April 29, 2010 + libpng version 1.4.2rc06 - May 4, 2010 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.4.2rc05 - April 29, 2010 + libpng versions 0.97, January 1998, through 1.4.2rc06 - May 4, 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.2rc05, not all possible expansions are supported. +As of libpng version 1.4.2rc06, 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 @@ -3297,13 +3297,13 @@ Other rules can be inferred by inspecting the libpng source. XIII. Y2K Compliance in libpng -April 29, 2010 +May 4, 2010 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.2rc05 are Y2K compliant. It is my belief that earlier +upward through 1.4.2rc06 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 "April 29, 2010" +.TH LIBPNG 3 "May 4, 2010" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.2rc05 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.2rc06 .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.2rc05 - April 29, 2010 + libpng version 1.4.2rc06 - May 4, 2010 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> 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.2rc05 - April 29, 2010 + libpng versions 0.97, January 1998, through 1.4.2rc06 - May 4, 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.2rc05, not all possible expansions are supported. +As of libpng version 1.4.2rc06, 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 @@ -4082,13 +4082,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XIII. Y2K Compliance in libpng -April 29, 2010 +May 4, 2010 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.2rc05 are Y2K compliant. It is my belief that earlier +upward through 1.4.2rc06 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.2rc05 - April 29, 2010: +Libpng version 1.4.2rc06 - May 4, 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.2rc05, April 29, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.4.2rc06, May 4, 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 @@ -4444,7 +4444,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -April 29, 2010 +May 4, 2010 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 3001637d3..dada89618 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "April 29, 2010" +.TH LIBPNGPF 3 "May 4, 2010" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.2rc05 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.2rc06 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "April 29, 2010" +.TH PNG 5 "May 4, 2010" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.4.2 [April 29, 2010] + * Last changed in libpng 1.4.2 [May 4, 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.) @@ -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_2rc05 Your_png_h_is_not_version_1_4_2rc05; +typedef version_1_4_2rc06 Your_png_h_is_not_version_1_4_2rc06; /* 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.2rc05 - April 29, 2010" PNG_STRING_NEWLINE \ + "libpng version 1.4.2rc06 - May 4, 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.2rc05 - April 29, 2010\ + return ((png_charp) "libpng version 1.4.2rc06 - May 4, 2010\ 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.2rc05 - April 29, 2010 + * libpng version 1.4.2rc06 - May 4, 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.2rc05 - April 29, 2010: Glenn + * libpng versions 0.97, January 1998, through 1.4.2rc06 - May 4, 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.2rc05, April 29, 2010, are + * libpng versions 1.2.6, August 15, 2004, through 1.4.2rc06, May 4, 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: @@ -283,13 +283,13 @@ * Y2K compliance in libpng: * ========================= * - * April 29, 2010 + * May 4, 2010 * * 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.2rc05 are Y2K compliant. It is my belief that earlier + * upward through 1.4.2rc06 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.2rc05" +#define PNG_LIBPNG_VER_STRING "1.4.2rc06" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.2rc05 - April 29, 2010\n" + " libpng version 1.4.2rc06 - May 4, 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 05 +#define PNG_LIBPNG_VER_BUILD 06 /* 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_2rc05; +typedef png_structp version_1_4_2rc06; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.4.2rc05 - April 29, 2010 + * libpng version 1.4.2rc06 - May 4, 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) @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * Last changed in libpng 1.4.2 [April 29, 2010] + * Last changed in libpng 1.4.2 [May 4, 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.) @@ -1,7 +1,7 @@ /* pngmem.c - stub functions for memory allocation * - * Last changed in libpng 1.4.2 [April 29, 2010] + * Last changed in libpng 1.4.2 [May 4, 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.) @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.4.2rc05 - April 29, 2010 + * libpng version 1.4.2rc06 - May 4, 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/pngrtran.c b/pngrtran.c index 22c0e4d51..4347d6445 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,7 +1,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.4.2 [April 29, 2010] + * Last changed in libpng 1.4.2 [May 4, 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.) @@ -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_2rc05 your_png_h_is_not_version_1_4_2rc05; +typedef version_1_4_2rc06 your_png_h_is_not_version_1_4_2rc06; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 283910605..3ace6bff3 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.4.2rc05 - April 29, 2010 +libpng version 1.4.2rc06 - May 4, 2010 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index b7a8a3537..7ddef159c 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.2rc05 - April 29, 2010 + * libpng version 1.4.2rc06 - May 4, 2010 * * Copyright (c) 1998-2010 Glenn Randers-Pehrson * diff --git a/projects/xcode/libpng.xcodeproj/project.pbxproj b/projects/xcode/libpng.xcodeproj/project.pbxproj index d2f73b666..d505d4ea8 100644 --- a/projects/xcode/libpng.xcodeproj/project.pbxproj +++ b/projects/xcode/libpng.xcodeproj/project.pbxproj @@ -226,7 +226,7 @@ COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 14; DYLIB_CURRENT_VERSION = 14; - FRAMEWORK_VERSION = 1.4.2rc05; + FRAMEWORK_VERSION = 1.4.2rc06; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; INFOPLIST_FILE = Info.plist; @@ -244,7 +244,7 @@ buildSettings = { DYLIB_COMPATIBILITY_VERSION = 14; DYLIB_CURRENT_VERSION = 14; - FRAMEWORK_VERSION = 1.4.2rc05; + FRAMEWORK_VERSION = 1.4.2rc06; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; INFOPLIST_FILE = Info.plist; diff --git a/scripts/README.txt b/scripts/README.txt index f46bdf098..8742687f7 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,8 +1,8 @@ -Makefiles for libpng version 1.4.2rc05 - April 29, 2010 +Makefiles for libpng version 1.4.2rc06 - May 4, 2010 makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.2rc05) + (gcc, creates libpng14.so.14.1.4.2rc06) 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.2rc05 - April 29, 2010 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.2rc05) + gcc, creates libpng14.so.14.1.4.2rc06) 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.2rc05 - April 29, 2010 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.2rc05) + creates libpng14.so.14.1.4.2rc06) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng14.so.14.1.4.2rc05) + creates libpng14.so.14.1.4.2rc06) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng14.so.14.1.4.2rc05) + creates libpng14.so.14.1.4.2rc06) 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 2781f9f9e..0a5c110e6 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.4.2rc05 +version=1.4.2rc06 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index c53ebca1a..26468399b 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.2rc05 +Version: 1.4.2rc06 Libs: -L${libdir} -lpng14 Cflags: -I${includedir} diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 2e04914ed..676bfb477 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.2rc05 +SHLIB_MINOR= 1.4.2rc06 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 da947c9bc..02a93f086 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.2rc05 +SHLIB_MINOR= 1.4.2rc06 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 792dd6f8c..b519d9de5 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.2rc05 +SHLIB_MINOR= 1.4.2rc06 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/png32ce.def b/scripts/png32ce.def index 3155a39f6..63f0fd4c4 100644 --- a/scripts/png32ce.def +++ b/scripts/png32ce.def @@ -15,7 +15,7 @@ LIBRARY lpngce png_get_int_32 EXPORTS -;Version 1.4.2rc05 +;Version 1.4.2rc06 png_build_grayscale_palette @1 ; png_check_sig @2 png_chunk_error @3 diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 07684a5d7..4a13cb6f2 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.4.2rc05 +; Version 1.4.2rc06 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngwin.def b/scripts/pngwin.def index db937b865..d2a3801af 100644 --- a/scripts/pngwin.def +++ b/scripts/pngwin.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.4.2rc05 +;Version 1.4.2rc06 png_build_grayscale_palette png_chunk_error png_chunk_warning |