diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2010-01-02 23:03:24 -0600 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2011-09-03 12:26:58 -0500 |
| commit | 73176b9030135e2c6732889c5fffcfb53df2b30c (patch) | |
| tree | 07f93e75a630a17b7190d7ce8dc745989bb5aa58 | |
| parent | d7e43f93ffbfd429aa78373c8693d77830c98f9a (diff) | |
| download | libpng-73176b9030135e2c6732889c5fffcfb53df2b30c.tar.gz | |
[libpng10] Imported from libpng-1.0.52.tarv1.0.52
54 files changed, 160 insertions, 152 deletions
@@ -1,80 +1,66 @@ -Libpng 1.0.52rc02 - January 1, 2010 +Libpng 1.0.52 - January 3, 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 - libpng-1.0.52rc02.tar.xz (LZMA-compressed, recommended) - libpng-1.0.52rc02.tar.gz - libpng-1.0.52rc02.tar.bz2 + libpng-1.0.52.tar.xz (LZMA-compressed, recommended) + libpng-1.0.52.tar.gz + libpng-1.0.52.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.0.52rc02-no-config.tar.xz (LZMA-compressed, recommended) - libpng-1.0.52rc02-no-config.tar.gz - libpng-1.0.52rc02-no-config.tar.bz2 + libpng-1.0.52-no-config.tar.xz (LZMA-compressed, recommended) + libpng-1.0.52-no-config.tar.gz + libpng-1.0.52-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1052r02.zip - lp1052r02.7z - lp1052r02.tar.bz2 + lpng1052.zip + lpng1052.7z + lpng1052.tar.bz2 Project files - libpng-1.0.52rc02-project-netware.zip - libpng-1.0.52rc02-project-wince.zip + libpng-1.0.52-project-netware.zip + libpng-1.0.52-project-wince.zip Other information: - libpng-1.0.52rc02-README.txt - libpng-1.0.52rc02-KNOWNBUGS.txt - libpng-1.0.52rc02-LICENSE.txt - libpng-1.0.52rc02-Y2K-compliance.txt - libpng-1.0.52rc02-[previous version]-diff.txt + libpng-1.0.52-README.txt + libpng-1.0.52-KNOWNBUGS.txt + libpng-1.0.52-LICENSE.txt + libpng-1.0.52-Y2K-compliance.txt Changes since the last public release (1.0.51): -version 1.2.42beta01 [December 4, 2009] +version 1.0.52 [January 3, 2010] + Removed "#define PNG_NO_ERROR_NUMBERS" that was inadvertently added to pngconf.h in version 1.2.41. Revised scripts/makefile.netbsd, makefile.openbsd, and makefile.sco to put png.h and pngconf.h in $prefix/include, like the other scripts, instead of in $prefix/include/libpng. Also revised makefile.sco - to put them in $prefix/include/libpng%NN% instead of in - $prefix/include/libpng/libpng%NN%. + to put them in $prefix/include/libpng12 instead of in + $prefix/include/libpng/libpng12. Removed leftover "-DPNG_CONFIGURE_LIBPNG" from scripts/makefile.darwin - -version 1.2.42beta02 [December 11, 2009] - Removed leftover "-DPNG_CONFIGURE_LIBPNG" from contrib/pngminim/*/makefile - Relocated png_do_chop() to its original position in pngrtran.c. The + and contrib/pngminim/*/makefile + Relocated png_do_chop() to its original position in pngrtran.c; the change in version 1.2.41beta08 caused transparency to be handled wrong in some 16-bit datastreams (Yusaku Sugai). - -version 1.2.42rc01 [December 17, 2009] - No changes. - -version 1.2.42rc02 [December 22, 2009] Renamed libpng-pc.in back to libpng.pc.in and revised CMakeLists.txt - (revising changes made in 1.2.41beta17 and 1.2.41rc01) - -version 1.2.42rc03 [December 25, 2009] - Marked png_memcpy_check() and png_memset_check() PNG_DEPRECATED. + (revising changes made in 1.2.41) Swapped PNG_UNKNOWN_CHUNKS_SUPPORTED and PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngset.c to be consistent with other changes in version 1.2.38. + Avoid deprecated references to png_ptr-io_ptr and png_ptr->error_ptr + in pngtest.c -version 1.2.42rc04 [January 1, 2010] - Marked png_memcpy_check() and png_memset_check() PNG_DEPRECATED. - Updated copyright year. - -version 1.0.52 and 1.2.42 [January 1, 2010] Send comments/corrections/commendations to png-mng-implement at lists.sf.net @@ -2625,6 +2625,12 @@ version 1.2.42rc04 [January 1, 2010] Marked png_memcpy_check() and png_memset_check() PNG_DEPRECATED. Updated copyright year. +version 1.2.42rc05 [January 2, 2010] + Avoid deprecated references to png_ptr-io_ptr and png_ptr->error_ptr + in pngtest.c + +version 1.2.42 and 1.0.52 [January 3, 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 @@ -1,5 +1,5 @@ -Installing libpng version 1.0.52rc02 - January 1, 2010 +Installing libpng version 1.0.52 - January 3, 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.0.52rc02" or "libpng10" and "zlib-1.2.3" +might be called "libpng-1.0.52" 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.52rc02 +Known bugs in libpng version 1.0.52 1. December 4, 2009: The PNG_NO_ERROR_NUMBERS macro was inadvertently defined in libpng-1.2.41/pngconf.h, which may cause a problem with @@ -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.52rc02, January 1, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.0.52, January 3, 2010, 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 -January 1, 2010 +January 3, 2010 diff --git a/Makefile.am b/Makefile.am index 9e8cc8bb5..02b586796 100644 --- a/Makefile.am +++ b/Makefile.am @@ -86,7 +86,7 @@ EXTRA_DIST= \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.0.52rc02.txt pngvcrd.c + example.c libpng-1.0.52.txt pngvcrd.c CLEANFILES= pngout.png libpng10.pc libpng10-config libpng.vers \ libpng.sym diff --git a/Makefile.in b/Makefile.in index 3e0ceee7d..f7d1de11c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -351,7 +351,7 @@ EXTRA_DIST = \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.0.52rc02.txt pngvcrd.c + example.c libpng-1.0.52.txt pngvcrd.c CLEANFILES = pngout.png libpng10.pc libpng10-config libpng.vers \ libpng.sym @@ -1,4 +1,4 @@ -README for libpng version 1.0.52rc02 - January 1, 2010 (shared library 10.0) +README for libpng version 1.0.52 - January 3, 2010 (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.52rc02) + creates libpng10.so.0.1.0.52) makefile.linux => Linux/ELF makefile (gcc, creates - libpng10.so.0.1.0.52rc02) + libpng10.so.0.1.0.52) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng10.so.0.1.0.52rc02, previously + libpng10.so.0.1.0.52, 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.52rc02) + (gcc, creates libpng10.so.0.1.0.52) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng10.so.0.1.0.52rc02) + (gcc, creates libpng10.so.0.1.0.52) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng10.so.0.1.0.52rc02) + (gcc, creates libpng10.so.0.1.0.52) 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: ========================= - January 1, 2010 + January 3, 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.0.52rc02 are Y2K compliant. It is my belief that earlier + upward through 1.0.52 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.52rc02. +# Generated by GNU Autoconf 2.65 for libpng 1.0.52. # # 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.52rc02' -PACKAGE_STRING='libpng 1.0.52rc02' +PACKAGE_VERSION='1.0.52' +PACKAGE_STRING='libpng 1.0.52' 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.52rc02 to adapt to many kinds of systems. +\`configure' configures libpng 1.0.52 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.52rc02:";; + short | recursive ) echo "Configuration of libpng 1.0.52:";; 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.52rc02 +libpng configure 1.0.52 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.52rc02, which was +It was created by libpng $as_me 1.0.52, 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.52rc02' + VERSION='1.0.52' cat >>confdefs.h <<_ACEOF @@ -2909,7 +2909,7 @@ fi -PNGLIB_VERSION=1.0.52rc02 +PNGLIB_VERSION=1.0.52 PNGLIB_MAJOR=1 PNGLIB_MINOR=0 PNGLIB_RELEASE=52 @@ -12074,7 +12074,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.52rc02, which was +This file was extended by libpng $as_me 1.0.52, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12140,7 +12140,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.52rc02 +libpng config.status 1.0.52 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 3843df8ac..03ef74d09 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.52rc02], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.0.52], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.0.52rc02 +PNGLIB_VERSION=1.0.52 PNGLIB_MAJOR=1 PNGLIB_MINOR=0 PNGLIB_RELEASE=52 diff --git a/libpng-1.0.52rc02.txt b/libpng-1.0.52.txt index 462959471..69254aa03 100644 --- a/libpng-1.0.52rc02.txt +++ b/libpng-1.0.52.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.0.52rc02 - January 1, 2010 + libpng version 1.0.52 - January 3, 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.0.52rc02 - January 1, 2010 + libpng versions 0.97, January 1998, through 1.0.52 - January 3, 2010 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.52rc02, not all possible expansions are supported. +As of libpng version 1.0.52, 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 @@ -2933,7 +2933,11 @@ application: png_uint_32 application_vn = PNG_LIBPNG_VER; VIII. (Omitted). + + IX. (Omitted) + + X. Detecting libpng The png_get_io_ptr() function has been present since libpng-0.88, has never @@ -3072,13 +3076,13 @@ Other rules can be inferred by inspecting the libpng source. XIII. Y2K Compliance in libpng -January 1, 2010 +January 3, 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.0.52rc02 are Y2K compliant. It is my belief that earlier +upward through 1.0.52 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 "January 1, 2010" +.TH LIBPNG 3 "January 3, 2010" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.0.52rc02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.52 .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.52rc02 - January 1, 2010 + libpng version 1.0.52 - January 3, 2010 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.52rc02 - January 1, 2010 + libpng versions 0.97, January 1998, through 1.0.52 - January 3, 2010 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.52rc02, not all possible expansions are supported. +As of libpng version 1.0.52, 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 @@ -3754,7 +3754,11 @@ application: png_uint_32 application_vn = PNG_LIBPNG_VER; .SH VIII. (Omitted). + + .SH IX. (Omitted) + + .SH X. Detecting libpng The png_get_io_ptr() function has been present since libpng-0.88, has never @@ -3893,13 +3897,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XIII. Y2K Compliance in libpng -January 1, 2010 +January 3, 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.0.52rc02 are Y2K compliant. It is my belief that earlier +upward through 1.0.52 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 @@ -4189,7 +4193,7 @@ the first widely used release: 1.0.51 10 10051 10.so.0.51[.0] 1.2.41 13 10241 12.so.0.41[.0] 1.2.42beta01-02 13 10242 12.so.0.42[.0] - 1.2.42rc01-04 13 10242 12.so.0.42[.0] + 1.2.42rc01-05 13 10242 12.so.0.42[.0] 1.0.52 10 10052 10.so.0.52[.0] 1.2.42 13 10242 12.so.0.42[.0] @@ -4247,7 +4251,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.0.52rc02 - January 1, 2010: +Libpng version 1.0.52 - January 3, 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). @@ -4270,7 +4274,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.0.52rc02, January 1, 2010, are +libpng versions 1.2.6, August 15, 2004, through 1.0.52, January 3, 2010, 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 @@ -4369,7 +4373,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -January 1, 2010 +January 3, 2010 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index c8de2293f..fd8c2781a 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "January 1, 2010" +.TH LIBPNGPF 3 "January 3, 2010" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.0.52rc02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.52 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "January 1, 2010" +.TH PNG 5 "January 3, 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.2.42 [January 1, 2010] + * Last changed in libpng 1.2.42 [January 3, 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 "png.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_0_52rc02 Your_png_h_is_not_version_1_0_52rc02; +typedef version_1_0_52 Your_png_h_is_not_version_1_0_52; /* Version information for C files. This had better match the version * string defined in png.h. @@ -723,13 +723,13 @@ png_get_copyright(png_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.0.52rc02 - January 1, 2010" PNG_STRING_NEWLINE \ + "libpng version 1.0.52 - January 3, 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.0.52rc02 - January 1, 2010\ + return ((png_charp) "libpng version 1.0.52 - January 3, 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,6 +1,6 @@ /* png.h - header file for PNG reference library * - * libpng version 1.0.52rc02 - January 1, 2010 + * libpng version 1.0.52 - January 3, 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.) @@ -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.52rc02 - January 1, 2010: Glenn + * libpng versions 0.97, January 1998, through 1.0.52 - January 3, 2010: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -251,7 +251,7 @@ * 1.0.51 10 10051 10.so.0.51[.0] * 1.2.41 13 10241 12.so.0.41[.0] * 1.2.42beta01-02 13 10242 12.so.0.42[.0] - * 1.2.42rc01-04 13 10242 12.so.0.42[.0] + * 1.2.42rc01-05 13 10242 12.so.0.42[.0] * 1.0.52 10 10052 10.so.0.52[.0] * 1.2.42 13 10242 12.so.0.42[.0] * @@ -285,7 +285,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.0.52rc02, January 1, 2010, are + * libpng versions 1.2.6, August 15, 2004, through 1.0.52, January 3, 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: @@ -397,13 +397,13 @@ * Y2K compliance in libpng: * ========================= * - * January 1, 2010 + * January 3, 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.0.52rc02 are Y2K compliant. It is my belief that earlier + * upward through 1.0.52 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 @@ -459,9 +459,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.0.52rc02" +#define PNG_LIBPNG_VER_STRING "1.0.52" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.0.52rc02 - January 1, 2010\n" + " libpng version 1.0.52 - January 3, 2010\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 10 @@ -474,7 +474,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 02 +#define PNG_LIBPNG_VER_BUILD 0 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -491,7 +491,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. @@ -1530,7 +1530,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_52rc02; +typedef png_structp version_1_0_52; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.0.52rc02 - January 1, 2010 + * libpng version 1.0.52 - January 3, 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 4e7b6a44f..4f684a887 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.2.42 [January 1, 2010] + * Last changed in libpng 1.2.42 [January 3, 2010] * Copyright (c) 1998-2009 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 5e43a45b6..c7f71e1cc 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.2.42 [January 1, 2010] + * Last changed in libpng 1.2.42 [January 3, 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.2.42 [January 1, 2010] + * Last changed in libpng 1.2.42 [January 3, 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.) @@ -312,12 +312,17 @@ static int wrote_question = 0; static void pngtest_read_data(png_structp png_ptr, png_bytep data, png_size_t length) { - png_size_t check; + png_size_t check = 0; + png_voidp io_ptr; /* fread() returns 0 on error, so it is OK to store this in a png_size_t * instead of an int, which is what fread() actually returns. */ - READFILE((png_FILE_p)png_ptr->io_ptr, data, length, check); + io_ptr = png_get_io_ptr(png_ptr); + if (io_ptr != NULL) + { + READFILE((png_FILE_p)io_ptr, data, length, check); + } if (check != length) { @@ -457,9 +462,12 @@ static void pngtest_warning(png_structp png_ptr, png_const_charp message) { PNG_CONST char *name = "UNKNOWN (ERROR!)"; - if (png_ptr != NULL && png_ptr->error_ptr != NULL) - name = png_ptr->error_ptr; - fprintf(STDERR, "%s: libpng warning: %s\n", name, message); + char *test; + test = png_get_error_ptr(png_ptr); + if (test == NULL) + fprintf(STDERR, "%s: libpng warning: %s\n", name, message); + else + fprintf(STDERR, "%s: libpng warning: %s\n", test, message); } /* This is the default error handling function. Note that replacements for @@ -1690,4 +1698,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_52rc02 your_png_h_is_not_version_1_0_52rc02; +typedef version_1_0_52 your_png_h_is_not_version_1_0_52; diff --git a/pngwrite.c b/pngwrite.c index 195cfc525..386b8af6e 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * Last changed in libpng 1.2.42 [January 1, 2010] + * Last changed in libpng 1.2.42 [January 3, 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/wince.txt b/projects/wince.txt index 265f3f2de..79f0d0de8 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.52rc02-project-wince.zip from a libpng distribution +libpng-1.0.52-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.52rc02-project-wince.zip" +"unzip -a libpng-1.0.52-project-wince.zip" diff --git a/scripts/README.txt b/scripts/README.txt index 86cc5b6f8..e3b2873ed 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,8 +1,8 @@ -Makefiles for libpng version 1.0.52rc02 - January 1, 2010 +Makefiles for libpng version 1.0.52 - January 3, 2010 makefile.linux => Linux/ELF makefile - (gcc, creates libpng10.so.0.1.0.52rc02) + (gcc, creates libpng10.so.0.1.0.52) 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.52rc02 - January 1, 2010 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.52rc02) + gcc, creates libpng10.so.0.1.0.52) 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.52rc02 - January 1, 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 libpng10.so.0.1.0.52rc02) + creates libpng10.so.0.1.0.52) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng10.so.0.1.0.52rc02) + creates libpng10.so.0.1.0.52) makefile.solaris-x86 => Solaris 2.X makefile (gcc, no MMX code, - creates libpng10.so.0.1.0.52rc02) + creates libpng10.so.0.1.0.52) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng10.so.0.1.0.52rc02) + creates libpng10.so.0.1.0.52) 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 2585875ad..6e7d7b7a5 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.0.52rc02 +version=1.0.52 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 34dd9da6d..53641642a 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.52rc02 +Version: 1.0.52 Libs: -L${libdir} -lpng10 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index cfcf820c1..4c7878bcc 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.52rc02 +PNGMIN = 1.0.52 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index d409896e2..3eb96751f 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.52rc02 +PNGMIN = 1.0.52 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 5e63099fe..d28560f40 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.52rc02 +PNGMIN = 1.0.52 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index fec0fb2cd..58546b3e8 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.52rc02 +PNGMIN = 1.0.52 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 7b9326ef5..dd2a45b22 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.52rc02 +PNGMIN = 1.0.52 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index b51f10946..e00e241b2 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -22,7 +22,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng10 PNGMAJ = 10 -PNGMIN = 1.0.52rc02 +PNGMIN = 1.0.52 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 10ceed45a..39f381740 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.0.52rc02 +PNGMIN = 1.0.52 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng10 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 5456457d9..a331581b9 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.52rc02 +PNGMIN = 1.0.52 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index f7d105b53..6ba9dadca 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -17,7 +17,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.52rc02 +PNGMIN = 1.0.52 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index e43b3edc2..4020d81e3 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.52rc02 +PNGMIN = 1.0.52 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 0914136db..d7fae5316 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.52rc02 +PNGMIN = 1.0.52 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index fd85dd156..c82e90615 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.52rc02 +PNGMIN = 1.0.52 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 790ae1a50..cbfb7e8fa 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.52rc02 +PNGMIN = 1.0.52 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 2074d1138..61c6a59e9 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -77,7 +77,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng10 PNGMAJ = 0 MINGDLL = 10 -PNGMIN = 1.0.52rc02 +PNGMIN = 1.0.52 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index e9cb9dda0..c30a4d5ea 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.52rc02 +SHLIB_MINOR= 1.0.52 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 144f3ad56..4856ddb96 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.52rc02 +SHLIB_MINOR= 1.0.52 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 3dd6f59e1..0bc94b29a 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.52rc02 +PNGMIN = 1.0.52 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 758ae137d..98ff3591b 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.52rc02 +SHLIB_MINOR= 1.0.52 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 9372a5e42..bfeb0d47c 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.52rc02 +PNGMIN = 1.0.52 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 3cfbde4df..069b8e950 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -9,7 +9,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.52rc02 +PNGMIN = 1.0.52 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 1716407e8..4b7c29b46 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -9,7 +9,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.52rc02 +PNGMIN = 1.0.52 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 868501757..2db317d95 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -11,7 +11,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.0.52rc02 +PNGMIN = 1.0.52 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng10 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index e579980a6..39250fe1c 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.52rc02 +PNGMIN = 1.0.52 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index 4db255aea..a42ecf205 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.52rc02 +PNGMIN = 1.0.52 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/png32ce.def b/scripts/png32ce.def index a10322546..d98514483 100644 --- a/scripts/png32ce.def +++ b/scripts/png32ce.def @@ -5,7 +5,7 @@ LIBRARY lpngce EXPORTS -;Version 1.0.52rc02 +;Version 1.0.52 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 7441405e9..8054f4980 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.0.52rc02 +; Version 1.0.52 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index d240ab086..5a2cf54e2 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.0.52rc02 +;Version 1.0.52 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 |