diff options
| -rw-r--r-- | ANNOUNCE | 73 | ||||
| -rw-r--r-- | CHANGES | 4 | ||||
| -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-- | libpng-1.4.1.txt (renamed from libpng-1.4.1rc04.txt) | 10 | ||||
| -rw-r--r-- | libpng.3 | 23 | ||||
| -rw-r--r-- | libpngpf.3 | 4 | ||||
| -rw-r--r-- | png.5 | 2 | ||||
| -rw-r--r-- | png.c | 8 | ||||
| -rw-r--r-- | png.h | 21 | ||||
| -rw-r--r-- | pngconf.h | 2 | ||||
| -rw-r--r-- | pngget.c | 2 | ||||
| -rw-r--r-- | pngmem.c | 2 | ||||
| -rw-r--r-- | pngpread.c | 2 | ||||
| -rw-r--r-- | pngpriv.h | 2 | ||||
| -rw-r--r-- | pngread.c | 2 | ||||
| -rw-r--r-- | pngrio.c | 2 | ||||
| -rw-r--r-- | pngrtran.c | 2 | ||||
| -rw-r--r-- | pngrutil.c | 2 | ||||
| -rw-r--r-- | pngset.c | 2 | ||||
| -rw-r--r-- | pngtest.c | 4 | ||||
| -rw-r--r-- | pngwtran.c | 2 | ||||
| -rw-r--r-- | pngwutil.c | 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 |
39 files changed, 109 insertions, 148 deletions
@@ -1,106 +1,63 @@ -Libpng 1.4.1rc04 - February 22, 2010 +Libpng 1.4.1 - February 25, 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.1rc04.tar.xz (LZMA-compressed, recommended) - 1.4.1rc04.tar.gz - 1.4.1rc04.tar.bz2 + libpng-1.4.1.tar.xz (LZMA-compressed, recommended) + libpng-1.4.1.tar.gz + libpng-1.4.1.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp141r04.zip - lp141r04.7z + lpng141.zip + lpng141.7z Other information: - 1.4.1rc04-README.txt - 1.4.1rc04-LICENSE.txt + libpng-1.4.1-README.txt + libpng-1.4.1-LICENSE.txt Changes since the last public release (1.4.0): -version 1.4.1beta01 [January 10, 2010] +version 1.4.1 [February 25, 2010] + Updated CMakeLists.txt for consistent indentation and to avoid an unclosed if-statement warning (Philip Lowman). Revised Makefile.am and Makefile.in to remove references to Y2KINFO, KNOWNBUG, and libpng.la (Robert Schwebel). Revised the makefiles to install the same files and symbolic - links as configure, except for libpng.la and libpng14.la. + except for libpng.la and libpng14.la. Make png_set|get_compression_buffer_size() available even when PNG_WRITE_SUPPORTED is not enabled. Revised Makefile.am and Makefile.in to simplify their maintenance. - Revised scripts/makefile.linux to install a link to libpng14.so.14.1 - -version 1.4.1beta02 [January 9, 2010] - Revised the rest of the makefiles to install a link to libpng14.so.14.1 - -version 1.4.1beta03 [January 10, 2010] + Revised the makefiles to install a link to libpng14.so.14.1 Removed png_set_premultiply_alpha() from scripts/*.def - -version 1.4.1rc01 [January 16, 2010] - No changes. - -version 1.4.1beta04 [January 23, 2010] Revised png_decompress_chunk() to improve speed and memory usage when - decoding large chunks. + decoding large chunks, using a two-pass method suggested by John Bowler. Added png_set|get_chunk_malloc_max() functions. - -version 1.4.1beta05 [January 26, 2010] Relocated "int k" declaration in pngtest.c to minimize its scope. - -version 1.4.1beta06 [January 28, 2010] - Revised png_decompress_chunk() to use a two-pass method suggested by - John Bowler. - -version 1.4.1beta07 [February 6, 2010] Folded some long lines in the source files. Added defineable PNG_USER_CHUNK_CACHE_MAX and PNG_USER_CHUNK_MALLOC_MAX Eliminated use of png_ptr->irowbytes and reused the slot in png_ptr as png_ptr->png_user_chunk_malloc_max. - Revised png_push_save_buffer() to do fewer but larger png_malloc() calls. - -version 1.4.1beta08 [February 6, 2010] - Minor cleanup and updating of dates and copyright year. - -version 1.4.1beta09 [February 7, 2010] - Reverted to original png_push_save_buffer() code. - -version 1.4.1beta10 [February 9, 2010] Return allocated "old_buffer" in png_push_save_buffer() before calling png_error(), to avoid a potential memory leak. - -version 1.4.1beta11 [February 12, 2010] Removed the cbuilder5 project, which has not been updated to 1.4.0. - Removed unused "buffer_size" variable from png_decompress_chunk(). - Relocated misplaced closing curley bracket in png_decompress_chunk(). Complete rewrite of two-pass png_decompress_chunk() by John Bowler. - -version 1.4.1beta12 [February 14, 2010] - Fixed type declaration of png_get_user_malloc_max() in pngget.c (Daisuke - Nishikawa) - -version 1.4.1rc02 [February 18, 2010] - No changes. - -version 1.4.1rc03 [February 19, 2010] - Noted in scripts/makefile.mingw that it expects to be run under MSYS. Removed obsolete unused MMX-querying support from contrib/gregbook Removed the AIX redefinition of jmpbuf in png.h Define _ALL_SOURCE in configure.ac, makefile.aix, and CMakeLists.txt when using AIX compiler. - -version 1.4.1rc04 [February 22, 2010] Removed unused gzio.c from contrib/pngminim gather and makefile scripts Send comments/corrections/commendations to png-mng-implement at lists.sf.net -(subscription required; visit +(subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement to subscribe) or to glennrp at users.sourceforge.net @@ -2529,9 +2529,11 @@ version 1.4.1rc03 [February 19, 2010] Define _ALL_SOURCE in configure.ac, makefile.aix, and CMakeLists.txt when using AIX compiler. -version 1.4.1rc04 [February 22, 2010] +version 1.4.1rc04 [February 19, 2010] Removed unused gzio.c from contrib/pngminim gather and makefile scripts +version 1.4.1 [February 25, 2010] + Send comments/corrections/commendations 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 6630ce959..46e6551d9 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.1rc04 +# VERSION 14.${PNGLIB_RELEASE}.1.4.1 VERSION 14.${PNGLIB_RELEASE}.0 SOVERSION 14 CLEAN_DIRECT_OUTPUT 1) @@ -1,5 +1,5 @@ -Installing libpng version 1.4.1rc04 - February 20, 2010 +Installing libpng version 1.4.1 - February 25, 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.1rc04" or "libpng14" and "zlib-1.2.3" +might be called "libpng-1.4.1" 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.1rc04, February 20, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.4.1, February 25, 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 -February 20, 2010 +February 25, 2010 diff --git a/Makefile.am b/Makefile.am index 28968f61a..e4e558c75 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.1rc04.txt + example.c libpng-1.4.1.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 22008154e..4a3abdd0b 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.1rc04.txt + example.c libpng-1.4.1.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.1rc04 - February 20, 2010 (shared library 14.0) +README for libpng version 1.4.1 - February 25, 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.1rc04) + gcc, creates libpng14.so.14.1.4.1) makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.1rc04) + (gcc, creates libpng14.so.14.1.4.1) 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.1rc04) + (gcc, creates libpng14.so.14.1.4.1) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng14.so.14.1.4.1rc04) + (gcc, creates libpng14.so.14.1.4.1) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng14.so.14.1.4.1rc04) + (gcc, creates libpng14.so.14.1.4.1) 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.1rc04. +# Generated by GNU Autoconf 2.65 for libpng 1.4.1. # # 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.1rc04' -PACKAGE_STRING='libpng 1.4.1rc04' +PACKAGE_VERSION='1.4.1' +PACKAGE_STRING='libpng 1.4.1' 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.1rc04 to adapt to many kinds of systems. +\`configure' configures libpng 1.4.1 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.1rc04:";; + short | recursive ) echo "Configuration of libpng 1.4.1:";; 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.1rc04 +libpng configure 1.4.1 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.1rc04, which was +It was created by libpng $as_me 1.4.1, 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.1rc04' + VERSION='1.4.1' cat >>confdefs.h <<_ACEOF @@ -2904,7 +2904,7 @@ fi -PNGLIB_VERSION=1.4.1rc04 +PNGLIB_VERSION=1.4.1 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 PNGLIB_RELEASE=1 @@ -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.1rc04, which was +This file was extended by libpng $as_me 1.4.1, 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.1rc04 +libpng config.status 1.4.1 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 7606ff2dd..818c00b21 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.1rc04], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.4.1], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.4.1rc04 +PNGLIB_VERSION=1.4.1 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 PNGLIB_RELEASE=1 diff --git a/libpng-1.4.1rc04.txt b/libpng-1.4.1.txt index 9a5b167d5..4a324a286 100644 --- a/libpng-1.4.1rc04.txt +++ b/libpng-1.4.1.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.1rc04 - February 20, 2010 + libpng version 1.4.1 - February 25, 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.1rc04 - February 20, 2010 + libpng versions 0.97, January 1998, through 1.4.1 - February 25, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -899,7 +899,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.1rc04, not all possible expansions are supported. +As of libpng version 1.4.1, 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 @@ -3245,13 +3245,13 @@ Other rules can be inferred by inspecting the libpng source. XIII. Y2K Compliance in libpng -February 20, 2010 +February 25, 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.1rc04 are Y2K compliant. It is my belief that earlier +upward through 1.4.1 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 "February 20, 2010" +.TH LIBPNG 3 "February 25, 2010" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.1rc04 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.1 .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.1rc04 - February 20, 2010 + libpng version 1.4.1 - February 25, 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.1rc04 - February 20, 2010 + libpng versions 0.97, January 1998, through 1.4.1 - February 25, 2010 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -1684,7 +1684,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.1rc04, not all possible expansions are supported. +As of libpng version 1.4.1, 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 @@ -4030,13 +4030,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XIII. Y2K Compliance in libpng -February 20, 2010 +February 25, 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.1rc04 are Y2K compliant. It is my belief that earlier +upward through 1.4.1 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 @@ -4212,7 +4212,8 @@ the first widely used release: 1.4.1beta01-03 14 10401 14.so.14.1[.0] 1.4.1rc01 14 10401 14.so.14.1[.0] 1.4.1beta04-12 14 10401 14.so.14.1[.0] - 1.4.1rc02-03 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] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -4268,7 +4269,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.1rc04 - February 20, 2010: +Libpng version 1.4.1 - February 25, 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). @@ -4291,7 +4292,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.4.1rc04, February 20, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.4.1, February 25, 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 @@ -4390,7 +4391,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -February 20, 2010 +February 25, 2010 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 726b312a5..b98a2e07b 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "February 20, 2010" +.TH LIBPNGPF 3 "February 25, 2010" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.1rc04 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.1 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "February 20, 2010" +.TH PNG 5 "February 25, 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.1 [February 20, 2010] + * Last changed in libpng 1.4.1 [February 25, 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_1rc04 Your_png_h_is_not_version_1_4_1rc04; +typedef version_1_4_1 Your_png_h_is_not_version_1_4_1; /* 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.1rc04 - February 20, 2010" PNG_STRING_NEWLINE \ + "libpng version 1.4.1 - February 25, 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.1rc04 - February 20, 2010\ + return ((png_charp) "libpng version 1.4.1 - February 25, 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.1rc04 - February 20, 2010 + * libpng version 1.4.1 - February 25, 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.1rc04 - February 20, 2010: Glenn + * libpng versions 0.97, January 1998, through 1.4.1 - February 25, 2010: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -137,7 +137,8 @@ * 1.4.1beta01-03 14 10401 14.so.14.1[.0] * 1.4.1rc01 14 10401 14.so.14.1[.0] * 1.4.1beta04-12 14 10401 14.so.14.1[.0] - * 1.4.1rc02-03 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] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -169,7 +170,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.4.1rc04, February 20, 2010, are + * libpng versions 1.2.6, August 15, 2004, through 1.4.1, February 25, 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: @@ -281,13 +282,13 @@ * Y2K compliance in libpng: * ========================= * - * February 20, 2010 + * February 25, 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.1rc04 are Y2K compliant. It is my belief that earlier + * upward through 1.4.1 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 @@ -343,9 +344,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.4.1rc04" +#define PNG_LIBPNG_VER_STRING "1.4.1" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.1rc04 - February 20, 2010\n" + " libpng version 1.4.1 - February 25, 2010\n" #define PNG_LIBPNG_VER_SONUM 14 #define PNG_LIBPNG_VER_DLLNUM 14 @@ -358,7 +359,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 04 +#define PNG_LIBPNG_VER_BUILD 0 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -1467,7 +1468,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_1rc04; +typedef png_structp version_1_4_1; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.4.1rc04 - February 20, 2010 + * libpng version 1.4.1 - February 25, 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.1 [February 20, 2010] + * Last changed in libpng 1.4.1 [February 25, 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.0 [February 20, 2010] + * Last changed in libpng 1.4.0 [February 25, 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/pngpread.c b/pngpread.c index 0ce8f0acf..bc0df909b 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * Last changed in libpng 1.4.1 [February 20, 2010] + * Last changed in libpng 1.4.1 [February 25, 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.1rc04 - February 20, 2010 + * libpng version 1.4.1 - February 25, 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 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.4.1 [February 20, 2010] + * Last changed in libpng 1.4.1 [February 25, 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 @@ /* pngrio.c - functions for data input * - * Last changed in libpng 1.4.1 [February 20, 2010] + * Last changed in libpng 1.4.1 [February 25, 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/pngrtran.c b/pngrtran.c index 760d31c9e..c7e521517 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.1 [February 20, 2010] + * Last changed in libpng 1.4.1 [February 25, 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/pngrutil.c b/pngrutil.c index 05986f337..47b0eea2a 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.4.1 [February 20, 2010] + * Last changed in libpng 1.4.1 [February 25, 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 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.4.1 [February 20, 2010] + * Last changed in libpng 1.4.1 [February 25, 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 @@ /* pngtest.c - a simple test program to test libpng * - * Last changed in libpng 1.4.1 [February 20, 2010] + * Last changed in libpng 1.4.1 [February 25, 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_1rc04 your_png_h_is_not_version_1_4_1rc04; +typedef version_1_4_1 your_png_h_is_not_version_1_4_1; diff --git a/pngwtran.c b/pngwtran.c index 79c14523f..070caa544 100644 --- a/pngwtran.c +++ b/pngwtran.c @@ -1,7 +1,7 @@ /* pngwtran.c - transforms the data in a row for PNG writers * - * Last changed in libpng 1.4.1 [February 20, 2010] + * Last changed in libpng 1.4.1 [February 25, 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/pngwutil.c b/pngwutil.c index e0068999b..20cff3203 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * Last changed in libpng 1.4.1 [February 20, 2010] + * Last changed in libpng 1.4.1 [February 25, 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/projects/xcode/libpng.xcodeproj/project.pbxproj b/projects/xcode/libpng.xcodeproj/project.pbxproj index 1bce09e4d..9eb88c6f7 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.1rc04; + FRAMEWORK_VERSION = 1.4.1; 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.1rc04; + FRAMEWORK_VERSION = 1.4.1; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; INFOPLIST_FILE = Info.plist; diff --git a/scripts/README.txt b/scripts/README.txt index c8f097dff..6379de5b3 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,8 +1,8 @@ -Makefiles for libpng version 1.4.1rc04 - February 20, 2010 +Makefiles for libpng version 1.4.1 - February 25, 2010 makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.1rc04) + (gcc, creates libpng14.so.14.1.4.1) 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.1rc04 - February 20, 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.1rc04) + gcc, creates libpng14.so.14.1.4.1) 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.1rc04 - February 20, 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.1rc04) + creates libpng14.so.14.1.4.1) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng14.so.14.1.4.1rc04) + creates libpng14.so.14.1.4.1) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng14.so.14.1.4.1rc04) + creates libpng14.so.14.1.4.1) 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 182e78856..f8c089ea4 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.4.1rc04 +version=1.4.1 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 2f92395b1..d033e676a 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.1rc04 +Version: 1.4.1 Libs: -L${libdir} -lpng14 Cflags: -I${includedir} diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 4349de9c6..63c6238b4 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.1rc04 +SHLIB_MINOR= 1.4.1 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 159f41d5b..77b445917 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.1rc04 +SHLIB_MINOR= 1.4.1 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 c75c128dc..8f56ad248 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.1rc04 +SHLIB_MINOR= 1.4.1 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/png32ce.def b/scripts/png32ce.def index 2ae2065b0..693a85ca8 100644 --- a/scripts/png32ce.def +++ b/scripts/png32ce.def @@ -15,7 +15,7 @@ LIBRARY lpngce png_get_int_32 EXPORTS -;Version 1.4.1rc04 +;Version 1.4.1 png_build_grayscale_palette @1 ; png_check_sig @2 png_chunk_error @3 diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 42939b2dc..212356df1 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.4.1rc04 +; Version 1.4.1 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngwin.def b/scripts/pngwin.def index 3214b5d49..741cbfa03 100644 --- a/scripts/pngwin.def +++ b/scripts/pngwin.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.4.1rc04 +;Version 1.4.1 png_build_grayscale_palette png_chunk_error png_chunk_warning |