From bb56c39d16523032fc5b6821ad5e20c8f7412c2d Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Thu, 6 May 2010 05:30:19 -0500 Subject: [PATCH] [master] Imported from libpng-1.4.2.tar --- ANNOUNCE | 34 +++++-------------- CHANGES | 4 ++- CMakeLists.txt | 2 +- INSTALL | 4 +-- LICENSE | 4 +-- Makefile.am | 2 +- Makefile.in | 2 +- README | 12 +++---- configure | 22 ++++++------ configure.ac | 4 +-- example.c | 2 +- libpng-1.4.2rc06.txt => libpng-1.4.2.txt | 10 +++--- libpng.3 | 24 +++++++------ libpngpf.3 | 4 +-- png.5 | 2 +- png.c | 8 ++--- png.h | 22 ++++++------ pngconf.h | 2 +- pngget.c | 2 +- pngmem.c | 2 +- pngpriv.h | 2 +- pngrtran.c | 2 +- pngtest.c | 2 +- pngwio.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 +- 36 files changed, 101 insertions(+), 111 deletions(-) rename libpng-1.4.2rc06.txt => libpng-1.4.2.txt (99%) diff --git a/ANNOUNCE b/ANNOUNCE index 87c7bf507..ab61d2ff2 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,57 +1,43 @@ -Libpng 1.4.2rc06 - May 4, 2010 +Libpng 1.4.2 - May 6, 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. +This is a public release of libpng, intended for use in production codes. 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 + libpng-1.4.2.tar.xz (LZMA-compressed, recommended) + libpng-1.4.2.tar.gz + libpng-1.4.2.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp142r06.zip - lp142r06.7z + lpng142.zip + lpng142.7z Other information: - 1.4.2rc06-README.txt - 1.4.2rc06-LICENSE.txt + libpng-1.4.2-README.txt + libpng-1.4.2-LICENSE.txt Changes since the last public release (1.4.1): - -version 1.4.2beta01 [April 1, 2010] Restored the macro definition of png_check_sig(). Conditionally compile an "else" statement in png_decompress_chunk(). - -version 1.4.2rc01 [April 10, 2010] - No changes. - -version 1.4.2rc02 [April 16, 2010] Documented the fact that png_set_dither() was disabled since libpng-1.4.0. Reenabled png_set_dither() but renamed it to png_set_quantize() to reflect more accurately what it actually does. At the same time, renamed the PNG_DITHER_[RED,GREEN_BLUE]_BITS macros to PNG_QUANTIZE_[RED,GREEN,BLUE]_BITS. - -version 1.4.2rc03 [April 24, 2010] Added some "(long)" typecasts to printf calls in png_handle_cHRM(). Relaxed the overly-restrictive permissions of some files. - -version 1.4.2rc04 [April 28, 2010] Added the "vstudio" project to replace "visualc6" and "visualc71" which will be removed from libpng-1.5.0. Demonstrate in example.c that lang_key should be initialized. Set PNG_NO_READ_BGR, PNG_NO_IO_STATE, and PNG_NO_TIME_RFC1123 in contrib/pngminim/decoder/pngusr.h to make a smaller decoder application. - -version 1.4.2rc05 [April 29, 2010] Include png_reset_zstream() in png.c only when PNG_READ_SUPPORTED is defined. Removed dummy_inflate.c and uncompr.c from contrib/pngminim/encoder Corrected PNG_UNKNOWN_CHUNKS_SUPPORTED to PNG_HANDLE_AS_UNKNOWN_SUPPORTED @@ -59,8 +45,6 @@ version 1.4.2rc05 [April 29, 2010] Corrected protection of png_get_user_transform_ptr. The API declaration in 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 Send comments/corrections/commendations to glennrp at users.sourceforge.net diff --git a/CHANGES b/CHANGES index 4aa434add..39e3a5569 100644 --- a/CHANGES +++ b/CHANGES @@ -2571,9 +2571,11 @@ 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] +version 1.4.2rc06 [May 3, 2010] Moved declarations of umsg[] inside the proper #ifdef blocks in pngrutil.c +version 1.4.2 [May 6, 2010] + 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..418d4a609 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.2 VERSION 14.${PNGLIB_RELEASE}.0 SOVERSION 14 CLEAN_DIRECT_OUTPUT 1) diff --git a/INSTALL b/INSTALL index 358f17d43..c836fd07a 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.4.2rc06 - May 4, 2010 +Installing libpng version 1.4.2 - May 6, 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.2" 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 028fdf993..493406367 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, May 4, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.4.2, May 6, 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 -May 4, 2010 +May 6, 2010 diff --git a/Makefile.am b/Makefile.am index b544a6340..3ab4a0115 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.2.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..54feeb683 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.2.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 5a4c54f80..14efeadc8 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.4.2rc06 - May 4, 2010 (shared library 14.0) +README for libpng version 1.4.2 - May 6, 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.2) makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.2rc06) + (gcc, creates libpng14.so.14.1.4.2) 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.2) 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.2) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng14.so.14.1.4.2rc06) + (gcc, creates libpng14.so.14.1.4.2) 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..5f9fbd61a 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.2. # # 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.2' +PACKAGE_STRING='libpng 1.4.2' 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.2 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.2:";; 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.2 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.2, 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.2' cat >>confdefs.h <<_ACEOF @@ -2904,7 +2904,7 @@ fi -PNGLIB_VERSION=1.4.2rc06 +PNGLIB_VERSION=1.4.2 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.2, 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.2 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 8f9317831..d31ed5815 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.2], [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.2 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 PNGLIB_RELEASE=2 diff --git a/example.c b/example.c index e6ebbe6a0..90c9c5cd3 100644 --- a/example.c +++ b/example.c @@ -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 [May 4, 2010] + * Last changed in libpng 1.4.2 [May 6, 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.2rc06.txt b/libpng-1.4.2.txt similarity index 99% rename from libpng-1.4.2rc06.txt rename to libpng-1.4.2.txt index beb642ad1..8265fe300 100644 --- a/libpng-1.4.2rc06.txt +++ b/libpng-1.4.2.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.2rc06 - May 4, 2010 + libpng version 1.4.2 - May 6, 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 - May 4, 2010 + libpng versions 0.97, January 1998, through 1.4.2 - May 6, 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.2, 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 -May 4, 2010 +May 6, 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.2rc06 are Y2K compliant. It is my belief that earlier +upward through 1.4.2 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 ef9782e28..5faa31550 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "May 4, 2010" +.TH LIBPNG 3 "May 6, 2010" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.2rc06 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.2 .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 - May 4, 2010 + libpng version 1.4.2 - May 6, 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 - May 4, 2010 + libpng versions 0.97, January 1998, through 1.4.2 - May 6, 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.2, 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 -May 4, 2010 +May 6, 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.2rc06 are Y2K compliant. It is my belief that earlier +upward through 1.4.2 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 @@ -4266,7 +4266,9 @@ the first widely used release: 1.4.1beta04-12 14 10401 14.so.14.1[.0] 1.4.1rc02-04 14 10401 14.so.14.1[.0] 1.4.1 14 10401 14.so.14.1[.0] - 1.4.2beta01-05 14 10402 14.so.14.2[.0] + 1.4.2beta01 14 10402 14.so.14.2[.0] + 1.4.2rc02-06 14 10402 14.so.14.2[.0] + 1.4.2 14 10402 14.so.14.2[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -4322,7 +4324,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.2rc06 - May 4, 2010: +Libpng version 1.4.2 - May 6, 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 +4347,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.4.2rc06, May 4, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.4.2, May 6, 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 +4446,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -May 4, 2010 +May 6, 2010 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index dada89618..498dc87db 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "May 4, 2010" +.TH LIBPNGPF 3 "May 6, 2010" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.2rc06 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.2 (private functions) .SH SYNOPSIS \fB#include \fP diff --git a/png.5 b/png.5 index e11a0108c..2f02ca892 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "May 4, 2010" +.TH PNG 5 "May 6, 2010" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 1e88d4eb4..004e41529 100644 --- a/png.c +++ b/png.c @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.4.2 [May 4, 2010] + * Last changed in libpng 1.4.2 [May 6, 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_2rc06 Your_png_h_is_not_version_1_4_2rc06; +typedef version_1_4_2 Your_png_h_is_not_version_1_4_2; /* 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 - May 4, 2010" PNG_STRING_NEWLINE \ + "libpng version 1.4.2 - May 6, 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 - May 4, 2010\ + return ((png_charp) "libpng version 1.4.2 - May 6, 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 669bb41fe..de0843aae 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.4.2rc06 - May 4, 2010 + * libpng version 1.4.2 - May 6, 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 - May 4, 2010: Glenn + * libpng versions 0.97, January 1998, through 1.4.2 - May 6, 2010: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -139,7 +139,9 @@ * 1.4.1beta04-12 14 10401 14.so.14.1[.0] * 1.4.1rc02-04 14 10401 14.so.14.1[.0] * 1.4.1 14 10401 14.so.14.1[.0] - * 1.4.2beta01-05 14 10402 14.so.14.2[.0] + * 1.4.2beta01 14 10402 14.so.14.2[.0] + * 1.4.2rc02-06 14 10402 14.so.14.2[.0] + * 1.4.2 14 10402 14.so.14.2[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -171,7 +173,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.4.2rc06, May 4, 2010, are + * libpng versions 1.2.6, August 15, 2004, through 1.4.2, May 6, 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 +285,13 @@ * Y2K compliance in libpng: * ========================= * - * May 4, 2010 + * May 6, 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.2rc06 are Y2K compliant. It is my belief that earlier + * upward through 1.4.2 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 +347,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.2" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.2rc06 - May 4, 2010\n" + " libpng version 1.4.2 - May 6, 2010\n" #define PNG_LIBPNG_VER_SONUM 14 #define PNG_LIBPNG_VER_DLLNUM 14 @@ -360,7 +362,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 06 +#define PNG_LIBPNG_VER_BUILD 0 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -1469,7 +1471,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_2; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngconf.h b/pngconf.h index adc79893a..0b118af42 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.4.2rc06 - May 4, 2010 + * libpng version 1.4.2 - May 6, 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/pngget.c b/pngget.c index ffd2a787f..abe721bd5 100644 --- a/pngget.c +++ b/pngget.c @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * Last changed in libpng 1.4.2 [May 4, 2010] + * Last changed in libpng 1.4.2 [May 6, 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.) diff --git a/pngmem.c b/pngmem.c index a61a4c54a..c8a3f6f59 100644 --- a/pngmem.c +++ b/pngmem.c @@ -1,7 +1,7 @@ /* pngmem.c - stub functions for memory allocation * - * Last changed in libpng 1.4.2 [May 4, 2010] + * Last changed in libpng 1.4.2 [May 6, 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.) diff --git a/pngpriv.h b/pngpriv.h index 3a59d123f..a7eb776ed 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.4.2rc06 - May 4, 2010 + * libpng version 1.4.2 - May 6, 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 4347d6445..b5e8f1a26 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 [May 4, 2010] + * Last changed in libpng 1.4.2 [May 6, 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.) diff --git a/pngtest.c b/pngtest.c index 068817bc6..84c99f576 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_2 your_png_h_is_not_version_1_4_2; diff --git a/pngwio.c b/pngwio.c index f4d995b18..513a71a06 100644 --- a/pngwio.c +++ b/pngwio.c @@ -155,7 +155,7 @@ png_default_flush(png_structp png_ptr) * arguments a pointer to a png_struct. After a call to * the flush function, there should be no data in any buffers * or pending transmission. If the output method doesn't do - * any buffering of ouput, a function prototype must still be + * any buffering of output, a function prototype must still be * supplied although it doesn't have to do anything. If * PNG_WRITE_FLUSH_SUPPORTED is not defined at libpng compile * time, output_flush_fn will be ignored, although it must be diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 3ace6bff3..cdfb4f1d8 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.4.2rc06 - May 4, 2010 +libpng version 1.4.2 - May 6, 2010 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 7ddef159c..5fe65be16 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@