diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2012-03-14 23:26:59 -0500 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2012-03-14 23:39:48 -0500 |
commit | 7d76ba739364941aa87f57c01e2bc3e1ee301980 (patch) | |
tree | 779447468cc31507942e6c3841e529eca3269b81 | |
parent | 8f23c9264274a1638b7ef385175f881ded4b885d (diff) | |
download | libpng-1.4.10.tar.gz |
[libpng14] Imported from libpng-1.4.10.tarv1.4.10
-rw-r--r-- | ANNOUNCE | 24 | ||||
-rw-r--r-- | CHANGES | 2 | ||||
-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.10.txt (renamed from libpng-1.4.10rc02.txt) | 14 | ||||
-rw-r--r-- | libpng.3 | 25 | ||||
-rw-r--r-- | libpngpf.3 | 4 | ||||
-rw-r--r-- | png.5 | 2 | ||||
-rw-r--r-- | png.c | 6 | ||||
-rw-r--r-- | png.h | 21 | ||||
-rw-r--r-- | pngconf.h | 2 | ||||
-rw-r--r-- | pngpread.c | 2 | ||||
-rw-r--r-- | pngpriv.h | 2 | ||||
-rw-r--r-- | pngread.c | 2 | ||||
-rw-r--r-- | pngrutil.c | 2 | ||||
-rw-r--r-- | pngtest.c | 2 | ||||
-rw-r--r-- | projects/vstudio/readme.txt | 2 | ||||
-rw-r--r-- | projects/vstudio/zlib.props | 2 | ||||
-rw-r--r-- | scripts/README.txt | 12 | ||||
-rwxr-xr-x | scripts/libpng-config-head.in | 2 | ||||
-rw-r--r-- | scripts/libpng.pc.in | 2 | ||||
-rw-r--r-- | scripts/makefile.ne12bsd | 2 | ||||
-rw-r--r-- | scripts/makefile.netbsd | 2 | ||||
-rw-r--r-- | scripts/makefile.openbsd | 2 | ||||
-rw-r--r-- | scripts/png32ce.def | 2 | ||||
-rw-r--r-- | scripts/pngos2.def | 2 | ||||
-rw-r--r-- | scripts/pngwin.def | 2 |
33 files changed, 96 insertions, 98 deletions
@@ -1,32 +1,30 @@ -Libpng 1.4.10rc02 - March 6, 2012 +Libpng 1.4.10 - March 15, 2012 -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.10rc02.tar.xz (LZMA-compressed, recommended) - 1.4.10rc02.tar.gz - 1.4.10rc02.tar.bz2 + libpng-1.4.10.tar.xz (LZMA-compressed, recommended) + libpng-1.4.10.tar.gz + libpng-1.4.10.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1410r02.7z (LZMA-compressed, recommended) - lp1410r02.zip + lpng1410.7z (LZMA-compressed, recommended) + lpng1410.zip Other information: - 1.4.10rc02-README.txt - 1.4.10rc02-LICENSE.txt + libpng-1.4.10-README.txt + libpng-1.4.10-LICENSE.txt Changes since the last public release (1.4.9): -version 1.4.10beta01 [February 27, 2011] Removed two useless #ifdef directives from pngread.c and one from pngrutil.c Eliminated redundant png_push_read_tEXt|zTXt|iTXt|unknown code from pngpread.c and use the sequential png_handle_tEXt, etc., in pngrutil.c; @@ -38,11 +36,7 @@ version 1.4.10beta01 [February 27, 2011] causing out-of-bounds read in png_set_sCAL() because of failure to copy the string terminators. This bug was introduced in libpng-1.0.6 (Frank Busse). - -version 1.4.10rc01 [March 2, 2012] Removed the png_free() of unused png_ptr->current_text from pngread.c. - -version 1.4.10rc02 [March 6, 2012] Fixed PNG_LIBPNG_BUILD_BASE_TYPE definition in png.h Send comments/corrections/commendations to glennrp at users.sourceforge.net @@ -2859,6 +2859,8 @@ version 1.4.10rc01 [March 2, 2012] version 1.4.10rc02 [March 6, 2012] Fixed PNG_LIBPNG_BUILD_BASE_TYPE definition in png.h +version 1.4.10 [March 15, 2012] + Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement). diff --git a/CMakeLists.txt b/CMakeLists.txt index 44fa45e8c..c730a6d27 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -255,7 +255,7 @@ install(CODE ${PNG_CONFIG_INSTALL_CODE}) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 14.${PNGLIB_RELEASE}.1.4.10rc02 +# VERSION 14.${PNGLIB_RELEASE}.1.4.10 VERSION 14.${PNGLIB_RELEASE}.0 SOVERSION 14 CLEAN_DIRECT_OUTPUT 1) @@ -1,5 +1,5 @@ -Installing libpng version 1.4.10rc02 - March 6, 2012 +Installing libpng version 1.4.10 - March 15, 2012 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.10rc02" or "libpng14" and "zlib-1.2.3" +might be called "libpng-1.4.10" 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.10rc02, March 6, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.4.10, March 15, 2012, 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 @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 6, 2012 +March 15, 2012 diff --git a/Makefile.am b/Makefile.am index 5b3b8107e..87e14a2ca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -79,7 +79,7 @@ EXTRA_DIST= \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.4.10rc02.txt + example.c libpng-1.4.10.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 93874807f..ff8d83214 100644 --- a/Makefile.in +++ b/Makefile.in @@ -332,7 +332,7 @@ EXTRA_DIST = \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.4.10rc02.txt + example.c libpng-1.4.10.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.10rc02 - March 6, 2012 (shared library 14.0) +README for libpng version 1.4.10 - March 15, 2012 (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. @@ -182,9 +182,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.10rc02) + (gcc, creates libpng14.so.14.1.4.10) makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.10rc02) + (gcc, creates libpng14.so.14.1.4.10) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr (Requires ansi2knr.c from @@ -206,12 +206,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.10rc02) + (gcc, creates libpng14.so.14.1.4.10) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng14.so.14.1.4.10rc02) + (gcc, creates libpng14.so.14.1.4.10) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng14.so.14.1.4.10rc02) + (gcc, creates libpng14.so.14.1.4.10) 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.10rc02. +# Generated by GNU Autoconf 2.65 for libpng 1.4.10. # # Report bugs to <png-mng-implement@lists.sourceforge.net>. # @@ -562,8 +562,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.4.10rc02' -PACKAGE_STRING='libpng 1.4.10rc02' +PACKAGE_VERSION='1.4.10' +PACKAGE_STRING='libpng 1.4.10' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1292,7 +1292,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.10rc02 to adapt to many kinds of systems. +\`configure' configures libpng 1.4.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1362,7 +1362,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.4.10rc02:";; + short | recursive ) echo "Configuration of libpng 1.4.10:";; esac cat <<\_ACEOF @@ -1467,7 +1467,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.4.10rc02 +libpng configure 1.4.10 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1892,7 +1892,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.10rc02, which was +It was created by libpng $as_me 1.4.10, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2700,7 +2700,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.4.10rc02' + VERSION='1.4.10' cat >>confdefs.h <<_ACEOF @@ -2764,7 +2764,7 @@ fi -PNGLIB_VERSION=1.4.10rc02 +PNGLIB_VERSION=1.4.10 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 PNGLIB_RELEASE=10 @@ -12175,7 +12175,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.10rc02, which was +This file was extended by libpng $as_me 1.4.10, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12241,7 +12241,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.10rc02 +libpng config.status 1.4.10 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 5ad5400da..f93292b49 100644 --- a/configure.ac +++ b/configure.ac @@ -16,14 +16,14 @@ dnl should not be necessary to regenerate configure if the time dnl stamps are correct AC_PREREQ(2.59) -AC_INIT([libpng], [1.4.10rc02], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.4.10], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE dnl Version number stuff here: -PNGLIB_VERSION=1.4.10rc02 +PNGLIB_VERSION=1.4.10 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 PNGLIB_RELEASE=10 diff --git a/libpng-1.4.10rc02.txt b/libpng-1.4.10.txt index 12d923ff4..8456e2487 100644 --- a/libpng-1.4.10rc02.txt +++ b/libpng-1.4.10.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.10rc02 - March 6, 2012 + libpng version 1.4.10 - March 15, 2012 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2010 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.10rc02 - March 6, 2012 + libpng versions 0.97, January 1998, through 1.4.10 - March 15, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -906,7 +906,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.10rc02, not all possible expansions are supported. +As of libpng version 1.4.10, 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 @@ -3287,8 +3287,8 @@ above the comment that says /* Maintainer: Put new private prototypes here ^ and in libpngpf.3 */ To avoid polluting the global namespace, the names of all exported -functions and variables begin with "png_", and all publicly visible C -preprocessor macros begin with "PNG_". We request that applications that +functions and variables begin with "png_", and all publicly visible C +preprocessor macros begin with "PNG". We request that applications that use libpng *not* begin any of their own symbols with either of these strings. We put a space after each comma and after each semicolon @@ -3312,13 +3312,13 @@ Other rules can be inferred by inspecting the libpng source. XIII. Y2K Compliance in libpng -March 6, 2012 +March 15, 2012 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.10rc02 are Y2K compliant. It is my belief that earlier +upward through 1.4.10 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 "March 6, 2012" +.TH LIBPNG 3 "March 15, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.10rc02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.10 .SH SYNOPSIS \fI\fB @@ -895,7 +895,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.4.10rc02 - March 6, 2012 + libpng version 1.4.10 - March 15, 2012 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -906,7 +906,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.4.10rc02 - March 6, 2012 + libpng versions 0.97, January 1998, through 1.4.10 - March 15, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -1801,7 +1801,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.10rc02, not all possible expansions are supported. +As of libpng version 1.4.10, 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 @@ -4182,8 +4182,8 @@ above the comment that says /* Maintainer: Put new private prototypes here ^ and in libpngpf.3 */ To avoid polluting the global namespace, the names of all exported -functions and variables begin with "png_", and all publicly visible C -preprocessor macros begin with "PNG_". We request that applications that +functions and variables begin with "png_", and all publicly visible C +preprocessor macros begin with "PNG". We request that applications that use libpng *not* begin any of their own symbols with either of these strings. We put a space after each comma and after each semicolon @@ -4207,13 +4207,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XIII. Y2K Compliance in libpng -March 6, 2012 +March 15, 2012 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.10rc02 are Y2K compliant. It is my belief that earlier +upward through 1.4.10 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 @@ -4418,6 +4418,7 @@ the first widely used release: 1.4.9 14 10409 14.so.14.9[.0] 1.4.10beta01 14 10410 14.so.14.10[.0] 1.4.10rc01-02 14 10410 14.so.14.10[.0] + 1.4.10 14 10410 14.so.14.10[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -4473,7 +4474,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.10rc02 - March 6, 2012: +Libpng version 1.4.10 - March 15, 2012: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -4496,7 +4497,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.4.10rc02, March 6, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.4.10, March 15, 2012, 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 @@ -4595,7 +4596,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 6, 2012 +March 15, 2012 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 93a0edf91..e9894739c 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "March 6, 2012" +.TH LIBPNGPF 3 "March 15, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.10rc02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.10 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "March 6, 2012" +.TH PNG 5 "March 15, 2012" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -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_10rc02 Your_png_h_is_not_version_1_4_10rc02; +typedef version_1_4_10 Your_png_h_is_not_version_1_4_10; /* Tells libpng that we have already handled the first "num_bytes" bytes * of the PNG file signature. If the PNG data is embedded into another @@ -547,13 +547,13 @@ png_get_copyright(png_const_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.4.10rc02 - March 6, 2012" PNG_STRING_NEWLINE \ + "libpng version 1.4.10 - March 15, 2012" 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.10rc02 - March 6, 2012\ + return ((png_charp) "libpng version 1.4.10 - March 15, 2012\ 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.10rc02 - March 6, 2012 + * libpng version 1.4.10 - March 15, 2012 * 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.) @@ -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.10rc02 - March 6, 2012: Glenn + * libpng versions 0.97, January 1998, through 1.4.10 - March 15, 2012: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -166,6 +166,7 @@ * 1.4.9 14 10409 14.so.14.9[.0] * 1.4.10beta01 14 10410 14.so.14.10[.0] * 1.4.10rc01-02 14 10410 14.so.14.10[.0] + * 1.4.10 14 10410 14.so.14.10[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -197,7 +198,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.4.10rc02, March 6, 2012, are + * libpng versions 1.2.6, August 15, 2004, through 1.4.10, March 15, 2012, 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: @@ -309,13 +310,13 @@ * Y2K compliance in libpng: * ========================= * - * March 6, 2012 + * March 15, 2012 * * 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.10rc02 are Y2K compliant. It is my belief that earlier + * upward through 1.4.10 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 @@ -371,9 +372,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.4.10rc02" +#define PNG_LIBPNG_VER_STRING "1.4.10" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.10rc02 - March 6, 2012\n" + " libpng version 1.4.10 - March 15, 2012\n" #define PNG_LIBPNG_VER_SONUM 14 #define PNG_LIBPNG_VER_DLLNUM 14 @@ -386,7 +387,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 @@ -403,7 +404,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. @@ -1497,7 +1498,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_10rc02; +typedef png_structp version_1_4_10; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.4.10rc02 - March 6, 2012 + * libpng version 1.4.10 - March 15, 2012 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2011 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpread.c b/pngpread.c index 1ae5d7a2a..f959a86bc 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.10 [March 6, 2012] + * Last changed in libpng 1.4.10 [March 15, 2012] * Copyright (c) 1998-2012 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.10rc02 - March 6, 2012 + * libpng version 1.4.10 - March 15, 2012 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2011 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.10 [March 6, 2012] + * Last changed in libpng 1.4.10 [March 15, 2012] * Copyright (c) 1998-2012 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 5731bf1b1..d65eb4250 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.10 [March 6, 2012] + * Last changed in libpng 1.4.10 [March 15, 2012] * Copyright (c) 1998-2012 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_4_10rc02 your_png_h_is_not_version_1_4_10rc02; +typedef version_1_4_10 your_png_h_is_not_version_1_4_10; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 3721e9bfc..c0975e0bd 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.4.10rc02 - March 6, 2012 +libpng version 1.4.10 - March 15, 2012 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 17a1f66cd..a5a4aca53 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@ <!-- * zlib.props - location of zlib source and build * - * libpng version 1.4.10rc02 - March 6, 2012 + * libpng version 1.4.10 - March 15, 2012 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * diff --git a/scripts/README.txt b/scripts/README.txt index fb6740b0d..8a78ccc26 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,8 +1,8 @@ -Makefiles for libpng version 1.4.10rc02 - March 6, 2012 +Makefiles for libpng version 1.4.10 - March 15, 2012 makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.10rc02) + (gcc, creates libpng14.so.14.1.4.10) 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.10rc02 - March 6, 2012 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.10rc02) + (gcc, creates libpng14.so.14.1.4.10) 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.10rc02 - March 6, 2012 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.10rc02) + creates libpng14.so.14.1.4.10) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng14.so.14.1.4.10rc02) + creates libpng14.so.14.1.4.10) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng14.so.14.1.4.10rc02) + creates libpng14.so.14.1.4.10) 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 64962600f..a68fd5473 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.4.10rc02 +version=1.4.10 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index f257f7177..6e834dfd0 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.10rc02 +Version: 1.4.10 Libs: -L${libdir} -lpng14 Cflags: -I${includedir} diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index bb38e4700..c68a19947 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.10rc02 +SHLIB_MINOR= 1.4.10 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 7d97c56ac..d469352ad 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.10rc02 +SHLIB_MINOR= 1.4.10 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 a730dc35e..3e4db6057 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.10rc02 +SHLIB_MINOR= 1.4.10 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/png32ce.def b/scripts/png32ce.def index 4d0cedd56..ad68df868 100644 --- a/scripts/png32ce.def +++ b/scripts/png32ce.def @@ -15,7 +15,7 @@ LIBRARY lpngce png_get_int_32 EXPORTS -;Version 1.4.10rc02 +;Version 1.4.10 png_build_grayscale_palette @1 ; png_check_sig @2 png_chunk_error @3 diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 47943168a..e64a5de50 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.4.10rc02 +; Version 1.4.10 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngwin.def b/scripts/pngwin.def index 5b219052c..fd2c98219 100644 --- a/scripts/pngwin.def +++ b/scripts/pngwin.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.4.10rc02 +;Version 1.4.10 png_build_grayscale_palette png_chunk_error png_chunk_warning |