diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2011-07-09 05:29:24 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2011-09-03 12:29:00 -0500 |
| commit | 83a7187a28e61375af3449a0406960d6078441c7 (patch) | |
| tree | 7a2efc09cd9d8edd71b4e848686f8aad35ade9cf | |
| parent | 8d3449ca031f995517ee6464659c8ccf509fda7c (diff) | |
| download | libpng-83a7187a28e61375af3449a0406960d6078441c7.tar.gz | |
[libpng10] Imported from libpng-1.0.56.tarv1.0.56
50 files changed, 149 insertions, 203 deletions
@@ -1,109 +1,47 @@ -Libpng 1.0.56rc01 - July 8, 2011 +Libpng 1.0.56 - July 9, 2011 -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 - libpng-1.0.56rc01.tar.xz (LZMA-compressed, recommended) - libpng-1.0.56rc01.tar.gz - libpng-1.0.56rc01.tar.bz2 + libpng-1.0.56.tar.xz (LZMA-compressed, recommended) + libpng-1.0.56.tar.gz + libpng-1.0.56.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.0.56rc01-no-config.tar.xz (LZMA-compressed, recommended) - libpng-1.0.56rc01-no-config.tar.gz - libpng-1.0.56rc01-no-config.tar.bz2 + libpng-1.0.56-no-config.tar.xz (LZMA-compressed, recommended) + libpng-1.0.56-no-config.tar.gz + libpng-1.0.56-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1056r01.zip - lp1056r01.7z - lp1056r01.tar.bz2 + lpng1056.zip + lpng1056.7z + lpng1056.tar.bz2 Project files - libpng-1.0.56rc01-project-netware.zip - libpng-1.0.56rc01-project-wince.zip + libpng-1.0.56-project-netware.zip + libpng-1.0.56-project-wince.zip Other information: - libpng-1.0.56rc01-README.txt - libpng-1.0.56rc01-KNOWNBUGS.txt - libpng-1.0.56rc01-LICENSE.txt - libpng-1.0.56rc01-Y2K-compliance.txt - libpng-1.0.56rc01-[previous version]-diff.txt + libpng-1.0.56-README.txt + libpng-1.0.56-KNOWNBUGS.txt + libpng-1.0.56-LICENSE.txt + libpng-1.0.56-Y2K-compliance.txt -Changes since the last public release (1.0.52): +Changes since the last public release (1.0.53): -version 1.2.43beta01 [January 27, 2010] - Updated CMakeLists.txt for consistent indentation and to avoid an - unclosed if-statement warning (Philip Lowman). - Removed "#ifdef PNG_1_0_X / #endif" surrounding - PNG_READ_16_TO_8_SUPPORTED and PNG_READ_GRAY_TO_RGB_SUPPORTED - in pngconf.h. These were added in libpng-1.2.41beta08 and libpng-1.0.51, - which introduced a binary incompatibility with libpng-1.0.50. - Backported new png_decompress_chunk() algorithm from libpng-1.4.1 +version 1.0.55 [July 9, 2011] -version 1.2.43beta02 [February 1, 2010] - Backported two-pass png_decompress_chunk() algorithm from libpng-1.4.1 - -version 1.2.43beta03 [February 6, 2010] - Backported fast png_push_save_buffer() algorithm from libpng-1.4.1 - -version 1.2.43beta04 [February 8, 2010] - Reverted recent changes to png_push_save-buffer(). - Removed PNGAPI declaration of png_calloc() and png_write_sig() in - 1ibpng-1.2.X, introduced by mistake in libpng-1.2.41. - Return allocated "old_buffer" in png_push_save_buffer() before png_error(), - to avoid a potential memory leak. - -version 1.2.43beta05 [February 8, 2010] - Ported rewritten png_decompress_chunk() by John Bowler from libpng-1.4.1. - -version 1.0.53rc01 and 1.2.43rc01 [February 18, 2010] - No changes. - -version 1.0.53rc02 and 1.2.43rc02 [February 19, 2010] - Define _ALL_SOURCE in configure.ac, makefile.aix, and CMakeLists.txt - when using AIX compiler. - -version 1.0.53 and 1.2.43 [February 25, 2010] - Removed unused gzio.c from contrib/pngminim gather and makefile scripts - -version 1.2.44beta01 [June 18, 2010] - In pngpread.c: png_push_have_row() add check for new_row > height - Removed the now-redundant check for out-of-bounds new_row from example.c - -version 1.2.44beta02 [June 19, 2010] - In pngpread.c: png_push_process_row() add check for too many rows. - Removed the now-redundant check for new_row > height in png_push_have_row(). - -version 1.2.44beta03 [June 20, 2010] - Rewrote png_process_IDAT_data to consistently treat extra data as warnings - and handle end conditions more cleanly. - Removed the new (beta02) check in png_push_process_row(). - -version 1.2.44rc01 [June 21, 2010] - Revised some comments in png_process_IDAT_data(). -Send comments/corrections/commendations to png-mng-implement at lists.sf.net - -version 1.2.44rc02 [June 22, 2010] - Stop memory leak when reading a malformed sCAL chunk. - -version 1.2.44rc03 [June 23, 2010] - Revised pngpread.c patch of beta05 to avoid an endless loop. - -version 1.2.44 [June 26, 2010] - Updated some of the "last changed" dates. - -version 1.2.45beta01 [June 7, 2011] Fixed uninitialized memory read in png_format_buffer() (Bug report by Frank Busse, related to CVE-2004-0421). Pass "" instead of '\0' to png_default_error() in png_err(). This mistake @@ -112,22 +50,13 @@ version 1.2.45beta01 [June 7, 2011] before IDAT. Ported bugfix in pngrtran.c from 1.5.3: when expanding a paletted image, always expand to RGBA if transparency is present. - -version 1.2.45beta02 [June 8, 2011] Check for integer overflow in png_set_rgb_to_gray(). - -version 1.2.45beta03 [June 19, 2011] Check for sCAL chunk too short. + Added CMakeLists.txt, projects/xcode, and pnggccrd.c to EXTRA_DIST in + Makefile.am and Makefile.in + Udated copyright year to 2011. -version 1.2.45rc01 and 1.0.55rc01 [June 30, 2011] - Updated "last changed" dates and copyright year. - -version 1.2.45 and 1.0.55 [July 7, 2011] - No changes. - -version 1.2.46rc01 and 1.0.56rc01 [July 8, 2011] - Reverted changes to Makefile.am and Makefile.in to libpng-1.2.44 versions. - +Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement to subscribe) or to glennrp at users.sourceforge.net @@ -2718,6 +2718,13 @@ version 1.2.45 and 1.0.55 [July 7, 2011] version 1.2.46rc01 and 1.0.56rc01 [July 8, 2011] Reverted changes to Makefile.am and Makefile.in to libpng-1.2.44 versions. +version 1.2.46rc02 and 1.0.56rc02 [July 8, 2011] + Added CMakeLists.txt, projects/xcode, and pnggccrd.c to EXTRA_DIST in + Makefile.am and Makefile.in + +version 1.2.46 and 1.0.56 [July 9, 2011] + Udated copyright year to 2011. + 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.56rc01 - July 8, 2011 +Installing libpng version 1.0.56 - July 9, 2011 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.56rc01" or "libpng10" and "zlib-1.2.3" +might be called "libpng-1.0.56" 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.56rc01 +Known bugs in libpng version 1.0.56 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.56rc01, July 8, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.0.56, July 9, 2011, 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 -July 8, 2011 +July 9, 2011 diff --git a/Makefile.am b/Makefile.am index 84e6a4f29..9719d9988 100644 --- a/Makefile.am +++ b/Makefile.am @@ -74,19 +74,22 @@ pkgconfig_DATA = libpng10.pc EXTRA_DIST= \ ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO \ pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \ + CMakeLists.txt \ ${srcdir}/projects/cbuilder5/* \ ${srcdir}/projects/beos/* \ ${srcdir}/projects/visualc6/* \ ${srcdir}/projects/visualc71/* \ ${srcdir}/projects/wince.txt \ ${srcdir}/projects/netware.txt \ + ${srcdir}/projects/xcode/* \ ${srcdir}/scripts/* \ ${srcdir}/contrib/gregbook/* \ + ${srcdir}/contrib/pngminim/* \ ${srcdir}/contrib/pngminus/* \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.0.56rc01.txt pngvcrd.c + example.c libpng-1.0.56.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 f7376d7dd..d544c7928 100644 --- a/Makefile.in +++ b/Makefile.in @@ -338,20 +338,23 @@ pkgconfig_DATA = libpng10.pc #extra source distribution files. EXTRA_DIST = \ ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO \ + CMakeLists.txt \ pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \ ${srcdir}/projects/cbuilder5/* \ ${srcdir}/projects/beos/* \ ${srcdir}/projects/visualc6/* \ ${srcdir}/projects/visualc71/* \ ${srcdir}/projects/wince.txt \ + ${srcdir}/projects/xcode/* \ ${srcdir}/projects/netware.txt \ ${srcdir}/scripts/* \ ${srcdir}/contrib/gregbook/* \ + ${srcdir}/contrib/pngminim/* \ ${srcdir}/contrib/pngminus/* \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.0.56rc01.txt pngvcrd.c + example.c libpng-1.0.56.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.56rc01 - July 8, 2011 (shared library 10.0) +README for libpng version 1.0.56 - July 9, 2011 (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.56rc01) + creates libpng10.so.0.1.0.56) makefile.linux => Linux/ELF makefile (gcc, creates - libpng10.so.0.1.0.56rc01) + libpng10.so.0.1.0.56) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng10.so.0.1.0.56rc01, previously + libpng10.so.0.1.0.56, 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.56rc01) + (gcc, creates libpng10.so.0.1.0.56) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng10.so.0.1.0.56rc01) + (gcc, creates libpng10.so.0.1.0.56) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng10.so.0.1.0.56rc01) + (gcc, creates libpng10.so.0.1.0.56) 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: ========================= - July 8, 2011 + July 9, 2011 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.56rc01 are Y2K compliant. It is my belief that earlier + upward through 1.0.56 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.56rc01. +# Generated by GNU Autoconf 2.65 for libpng 1.0.56. # # 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.56rc01' -PACKAGE_STRING='libpng 1.0.56rc01' +PACKAGE_VERSION='1.0.56' +PACKAGE_STRING='libpng 1.0.56' 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.56rc01 to adapt to many kinds of systems. +\`configure' configures libpng 1.0.56 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.56rc01:";; + short | recursive ) echo "Configuration of libpng 1.0.56:";; 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.56rc01 +libpng configure 1.0.56 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.56rc01, which was +It was created by libpng $as_me 1.0.56, 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.56rc01' + VERSION='1.0.56' cat >>confdefs.h <<_ACEOF @@ -2909,7 +2909,7 @@ fi -PNGLIB_VERSION=1.0.56rc01 +PNGLIB_VERSION=1.0.56 PNGLIB_MAJOR=1 PNGLIB_MINOR=0 PNGLIB_RELEASE=56 @@ -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.56rc01, which was +This file was extended by libpng $as_me 1.0.56, 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.56rc01 +libpng config.status 1.0.56 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index a3baee5eb..b33a641ca 100644 --- a/configure.ac +++ b/configure.ac @@ -18,12 +18,12 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.0.56rc01], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.0.56], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.0.56rc01 +PNGLIB_VERSION=1.0.56 PNGLIB_MAJOR=1 PNGLIB_MINOR=0 PNGLIB_RELEASE=56 diff --git a/libpng-1.0.56rc01.txt b/libpng-1.0.56.txt index 0b590b51d..e1bace624 100644 --- a/libpng-1.0.56rc01.txt +++ b/libpng-1.0.56.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.0.56rc01 - July 8, 2011 + libpng version 1.0.56 - July 9, 2011 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.56rc01 - July 8, 2011 + libpng versions 0.97, January 1998, through 1.0.56 - July 9, 2011 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.56rc01, not all possible expansions are supported. +As of libpng version 1.0.56, 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 @@ -3076,13 +3076,13 @@ Other rules can be inferred by inspecting the libpng source. XIII. Y2K Compliance in libpng -July 8, 2011 +July 9, 2011 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.56rc01 are Y2K compliant. It is my belief that earlier +upward through 1.0.56 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 "July 8, 2011" +.TH LIBPNG 3 "July 9, 2011" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.0.56rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.56 .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.56rc01 - July 8, 2011 + libpng version 1.0.56 - July 9, 2011 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.56rc01 - July 8, 2011 + libpng versions 0.97, January 1998, through 1.0.56 - July 9, 2011 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.56rc01, not all possible expansions are supported. +As of libpng version 1.0.56, 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 @@ -3897,13 +3897,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XIII. Y2K Compliance in libpng -July 8, 2011 +July 9, 2011 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.56rc01 are Y2K compliant. It is my belief that earlier +upward through 1.0.56 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 @@ -4209,7 +4209,9 @@ the first widely used release: 1.2.45rc01 13 10245 12.so.0.45[.0] 1.0.55 10 10055 10.so.0.55[.0] 1.2.45 13 10245 12.so.0.45[.0] - 1.2.46rc01 13 10246 12.so.0.46[.0] + 1.2.46rc01-02 13 10246 12.so.0.46[.0] + 1.0.56 10 10056 10.so.0.56[.0] + 1.2.46 13 10246 12.so.0.46[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -4265,7 +4267,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.0.56rc01 - July 8, 2011: +Libpng version 1.0.56 - July 9, 2011: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -4288,7 +4290,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.0.56rc01, July 8, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.0.56, July 9, 2011, 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 @@ -4387,7 +4389,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -July 8, 2011 +July 9, 2011 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index b37bd4707..60da7c80d 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "July 8, 2011" +.TH LIBPNGPF 3 "July 9, 2011" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.0.56rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.56 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "July 8, 2011" +.TH PNG 5 "July 9, 2011" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -1,8 +1,8 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.2.43 [February 25, 2010] - * Copyright (c) 1998-2010 Glenn Randers-Pehrson + * Last changed in libpng 1.2.46 [February 25, 2011] + * Copyright (c) 1998-2011 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * @@ -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_56rc01 Your_png_h_is_not_version_1_0_56rc01; +typedef version_1_0_56 Your_png_h_is_not_version_1_0_56; /* Version information for C files. This had better match the version * string defined in png.h. @@ -724,14 +724,14 @@ png_get_copyright(png_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.0.56rc01 - July 8, 2011" PNG_STRING_NEWLINE \ - "Copyright (c) 1998-2010 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ + "libpng version 1.0.56 - July 9, 2011" 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.56rc01 - July 8, 2011\ - Copyright (c) 1998-2010 Glenn Randers-Pehrson\ + return ((png_charp) "libpng version 1.0.56 - July 9, 2011\ + Copyright (c) 1998-2011 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."); #endif @@ -1,6 +1,6 @@ /* png.h - header file for PNG reference library * - * libpng version 1.0.56rc01 - July 8, 2011 + * libpng version 1.0.56 - July 9, 2011 * Copyright (c) 1998-2011 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -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.56rc01 - July 8, 2011: Glenn + * libpng versions 0.97, January 1998, through 1.0.56 - July 9, 2011: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -263,11 +263,13 @@ * 1.2.44rc01-03 13 10244 12.so.0.44[.0] * 1.2.44 13 10244 12.so.0.44[.0] * 1.2.45beta01-03 13 10245 12.so.0.45[.0] - * 1.0.55rc01 13 10055 10.so.0.55[.0] + * 1.0.55rc01 10 10055 10.so.0.55[.0] * 1.2.45rc01 13 10245 12.so.0.45[.0] - * 1.0.55 13 10055 10.so.0.55[.0] + * 1.0.55 10 10055 10.so.0.55[.0] * 1.2.45 13 10245 12.so.0.45[.0] - * 1.2.46rc01 13 10246 12.so.0.46[.0] + * 1.2.46rc01-02 13 10246 12.so.0.46[.0] + * 1.0.56 10 10056 10.so.0.56[.0] + * 1.2.46 13 10246 12.so.0.46[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -299,8 +301,8 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.0.56rc01, July 8, 2011, are - * Copyright (c) 2004, 2006-2010 Glenn Randers-Pehrson, and are + * libpng versions 1.2.6, August 15, 2004, through 1.0.56, July 9, 2011, 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: * @@ -411,13 +413,13 @@ * Y2K compliance in libpng: * ========================= * - * July 8, 2011 + * July 9, 2011 * * 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.56rc01 are Y2K compliant. It is my belief that earlier + * upward through 1.0.56 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 @@ -473,9 +475,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.0.56rc01" +#define PNG_LIBPNG_VER_STRING "1.0.56" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.0.56rc01 - July 8, 2011\n" + " libpng version 1.0.56 - July 9, 2011\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 10 @@ -488,7 +490,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 01 +#define PNG_LIBPNG_VER_BUILD 0 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -505,7 +507,7 @@ #define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with PNG_LIBPNG_BUILD_PRIVATE */ -#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_RC +#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -1553,7 +1555,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_56rc01; +typedef png_structp version_1_0_56; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.0.56rc01 - July 8, 2011 + * libpng version 1.0.56 - July 9, 2011 * Copyright (c) 1998-2011 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -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_56rc01 your_png_h_is_not_version_1_0_56rc01; +typedef version_1_0_56 your_png_h_is_not_version_1_0_56; diff --git a/projects/wince.txt b/projects/wince.txt index c003db592..51dfc01f0 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.56rc01-project-wince.zip from a libpng distribution +libpng-1.0.56-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.56rc01-project-wince.zip" +"unzip -a libpng-1.0.56-project-wince.zip" diff --git a/scripts/README.txt b/scripts/README.txt index 7d17fcb51..358b85822 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,8 +1,8 @@ -Makefiles for libpng version 1.0.56rc01 - July 8, 2011 +Makefiles for libpng version 1.0.56 - July 9, 2011 makefile.linux => Linux/ELF makefile - (gcc, creates libpng10.so.0.1.0.56rc01) + (gcc, creates libpng10.so.0.1.0.56) 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.56rc01 - July 8, 2011 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.56rc01) + gcc, creates libpng10.so.0.1.0.56) 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.56rc01 - July 8, 2011 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.56rc01) + creates libpng10.so.0.1.0.56) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng10.so.0.1.0.56rc01) + creates libpng10.so.0.1.0.56) makefile.solaris-x86 => Solaris 2.X makefile (gcc, no MMX code, - creates libpng10.so.0.1.0.56rc01) + creates libpng10.so.0.1.0.56) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng10.so.0.1.0.56rc01) + creates libpng10.so.0.1.0.56) 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 8b6e115e9..9a05920d2 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.0.56rc01 +version=1.0.56 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index e9f4069ad..a4adacdfe 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.56rc01 +Version: 1.0.56 Libs: -L${libdir} -lpng10 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index b8c265337..8c3c5da12 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.56rc01 +PNGMIN = 1.0.56 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 7bca8bc06..3440fe9e2 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.56rc01 +PNGMIN = 1.0.56 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 2fbbdcf3e..a6207c02e 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.56rc01 +PNGMIN = 1.0.56 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 1694a4a1b..6176c8722 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.56rc01 +PNGMIN = 1.0.56 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 3c378adcb..8c0868685 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.56rc01 +PNGMIN = 1.0.56 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 28504073a..7b7401621 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -22,7 +22,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng10 PNGMAJ = 10 -PNGMIN = 1.0.56rc01 +PNGMIN = 1.0.56 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 49a6c511c..368b1d453 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.0.56rc01 +PNGMIN = 1.0.56 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng10 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 5aacbb830..a705a9725 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.56rc01 +PNGMIN = 1.0.56 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 9a280748a..70659cdf4 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -17,7 +17,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.56rc01 +PNGMIN = 1.0.56 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index a9f707a1f..55864701b 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.56rc01 +PNGMIN = 1.0.56 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 73f769f05..cad10302e 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.56rc01 +PNGMIN = 1.0.56 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 139965d7e..a0467d1cb 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.56rc01 +PNGMIN = 1.0.56 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index f16126346..7350c86a4 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.56rc01 +PNGMIN = 1.0.56 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 9d0470610..b96b1fdc0 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.56rc01 +PNGMIN = 1.0.56 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 5b409b118..fd305602a 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.56rc01 +SHLIB_MINOR= 1.0.56 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 2aac4872f..7b9c328e5 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.56rc01 +SHLIB_MINOR= 1.0.56 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 711739786..7842215b2 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.56rc01 +PNGMIN = 1.0.56 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 1997851a4..93685925a 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.56rc01 +SHLIB_MINOR= 1.0.56 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 311bd28f7..74a069105 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.56rc01 +PNGMIN = 1.0.56 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 062dd733d..0be6ce76b 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -9,7 +9,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.56rc01 +PNGMIN = 1.0.56 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 710a2eba3..518243f49 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -9,7 +9,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.56rc01 +PNGMIN = 1.0.56 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index eb5c3578f..8ede403fc 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -11,7 +11,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.0.56rc01 +PNGMIN = 1.0.56 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng10 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 54721b319..6ea8529ce 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.56rc01 +PNGMIN = 1.0.56 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index a63da0871..9023e6aeb 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.56rc01 +PNGMIN = 1.0.56 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/png32ce.def b/scripts/png32ce.def index 6e2ea19f2..e6d58f5cd 100644 --- a/scripts/png32ce.def +++ b/scripts/png32ce.def @@ -5,7 +5,7 @@ LIBRARY lpngce EXPORTS -;Version 1.0.56rc01 +;Version 1.0.56 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 836cdb69c..b2236203a 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.0.56rc01 +; Version 1.0.56 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index f63e00a01..42b6db15a 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.0.56rc01 +;Version 1.0.56 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 |