diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2012-02-18 14:05:39 -0600 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2012-02-18 23:49:33 -0600 |
| commit | 4ae1de1114cb83c6f1462e9f76c8efc23f3924c9 (patch) | |
| tree | beb8ed6de565e112c988d198e655faf6ac4ad1eb | |
| parent | e0e4104db48cd38eda1414718be92984e93b9f0e (diff) | |
| download | libpng-4ae1de1114cb83c6f1462e9f76c8efc23f3924c9.tar.gz | |
[libpng12] Imported from libpng-1.2.47.tarv1.2.47
53 files changed, 135 insertions, 127 deletions
@@ -1,53 +1,52 @@ -Libpng 1.2.47rc01 - February 17, 2012 +Libpng 1.2.47 - February 18, 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 - libpng-1.2.47rc01.tar.xz (LZMA-compressed, recommended) - libpng-1.2.47rc01.tar.gz - libpng-1.2.47rc01.tar.bz2 + libpng-1.2.47.tar.xz (LZMA-compressed, recommended) + libpng-1.2.47.tar.gz + libpng-1.2.47.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.47rc01-no-config.tar.xz (LZMA-compressed, recommended) - libpng-1.2.47rc01-no-config.tar.gz - libpng-1.2.47rc01-no-config.tar.bz2 + libpng-1.2.47-no-config.tar.xz (LZMA-compressed, recommended) + libpng-1.2.47-no-config.tar.gz + libpng-1.2.47-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1247r01.zip - lp1247r01.7z - lp1247r01.tar.bz2 + lpng1247.zip + lpng1247.7z + lpng1247.tar.bz2 Project files - libpng-1.2.47rc01-project-netware.zip - libpng-1.2.47rc01-project-wince.zip + libpng-1.2.47-project-netware.zip + libpng-1.2.47-project-wince.zip Other information: - libpng-1.2.47rc01-README.txt - libpng-1.2.47rc01-KNOWNBUGS.txt - libpng-1.2.47rc01-LICENSE.txt - libpng-1.2.47rc01-Y2K-compliance.txt - libpng-1.2.47rc01-[previous version]-diff.txt + libpng-1.2.47-README.txt + libpng-1.2.47-KNOWNBUGS.txt + libpng-1.2.47-LICENSE.txt + libpng-1.2.47-Y2K-compliance.txt + libpng-1.2.47-[previous version]-diff.txt Changes since the last public release (1.2.46): -version 1.2.47beta01 [February 17, 2012] - Updated contrib/pngminus/makefile.std (Samuli Souminen) +version 1.2.47 [February 18, 2012] -version 1.2.47rc01 [February 17, 2012] + Updated contrib/pngminus/makefile.std (Samuli Souminen) Fixed CVE-2011-3026 buffer overrun bug. +Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement to subscribe) or to glennrp at users.sourceforge.net @@ -2739,9 +2739,12 @@ version 1.2.46 and 1.0.56 [July 9, 2011] version 1.2.47beta01 [February 17, 2012] Updated contrib/pngminus/makefile.std (Samuli Souminen) -version 1.2.47rc01 [February 17, 2012] +version 1.0.57rc01 and 1.2.47rc01 [February 17, 2012] Fixed CVE-2011-3026 buffer overrun bug. +version 1.0.57 and 1.2.47 [February 18, 2012] + No changes. + 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 2419a4198..b8ed1ff73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -215,7 +215,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/libpng-config.in # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 0.${PNGLIB_RELEASE}.1.2.47rc01 +# VERSION 0.${PNGLIB_RELEASE}.1.2.47 VERSION 0.${PNGLIB_RELEASE}.0 SOVERSION 0 CLEAN_DIRECT_OUTPUT 1) @@ -1,5 +1,5 @@ -Installing libpng version 1.2.47rc01 - February 17, 2012 +Installing libpng version 1.2.47 - February 18, 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.2.47rc01" or "libpng12" and "zlib-1.2.3" +might be called "libpng-1.2.47" or "libpng12" 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.2.47rc01 +Known bugs in libpng version 1.2.47 1. February 23, 2006: The custom makefiles don't build libpng with -lz. @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.2.47rc01, February 17, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.2.47, February 18, 2012, 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 -February 17, 2012 +February 18, 2012 diff --git a/Makefile.am b/Makefile.am index c023fb0c3..c06dd8d2d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -89,7 +89,7 @@ EXTRA_DIST= \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.2.47rc01.txt pnggccrd.c pngvcrd.c + example.c libpng-1.2.47.txt pnggccrd.c pngvcrd.c CLEANFILES= pngout.png libpng12.pc libpng12-config libpng.vers \ libpng.sym diff --git a/Makefile.in b/Makefile.in index ccb64f5ed..586207931 100644 --- a/Makefile.in +++ b/Makefile.in @@ -354,7 +354,7 @@ EXTRA_DIST = \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.2.47rc01.txt pnggccrd.c pngvcrd.c + example.c libpng-1.2.47.txt pnggccrd.c pngvcrd.c CLEANFILES = pngout.png libpng12.pc libpng12-config libpng.vers \ libpng.sym @@ -1,4 +1,4 @@ -README for libpng version 1.2.47rc01 - February 17, 2012 (shared library 12.0) +README for libpng version 1.2.47 - February 18, 2012 (shared library 12.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 libpng12.so.0.1.2.47rc01) + creates libpng12.so.0.1.2.47) makefile.linux => Linux/ELF makefile (gcc, creates - libpng12.so.0.1.2.47rc01) + libpng12.so.0.1.2.47) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng12.so.0.1.2.47rc01, previously + libpng12.so.0.1.2.47, 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 libpng12.so.0.1.2.47rc01) + (gcc, creates libpng12.so.0.1.2.47) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.47rc01) + (gcc, creates libpng12.so.0.1.2.47) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.47rc01) + (gcc, creates libpng12.so.0.1.2.47) 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: ========================= - February 17, 2012 + February 18, 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.2.47rc01 are Y2K compliant. It is my belief that earlier + upward through 1.2.47 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.2.47rc01. +# Generated by GNU Autoconf 2.65 for libpng 1.2.47. # # 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.2.47rc01' -PACKAGE_STRING='libpng 1.2.47rc01' +PACKAGE_VERSION='1.2.47' +PACKAGE_STRING='libpng 1.2.47' 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.2.47rc01 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.47 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.2.47rc01:";; + short | recursive ) echo "Configuration of libpng 1.2.47:";; 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.2.47rc01 +libpng configure 1.2.47 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.2.47rc01, which was +It was created by libpng $as_me 1.2.47, 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.2.47rc01' + VERSION='1.2.47' cat >>confdefs.h <<_ACEOF @@ -2909,7 +2909,7 @@ fi -PNGLIB_VERSION=1.2.47rc01 +PNGLIB_VERSION=1.2.47 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=47 @@ -12079,7 +12079,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libpng $as_me 1.2.47rc01, which was +This file was extended by libpng $as_me 1.2.47, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12145,7 +12145,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libpng config.status 1.2.47rc01 +libpng config.status 1.2.47 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index f9537e356..d9967656a 100644 --- a/configure.ac +++ b/configure.ac @@ -18,12 +18,12 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.2.47rc01], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.47], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.47rc01 +PNGLIB_VERSION=1.2.47 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=47 diff --git a/libpng-1.2.47rc01.txt b/libpng-1.2.47.txt index b6f2f839c..1ffa9806d 100644 --- a/libpng-1.2.47rc01.txt +++ b/libpng-1.2.47.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.47rc01 - February 17, 2012 + libpng version 1.2.47 - February 18, 2012 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.2.47rc01 - February 17, 2012 + libpng versions 0.97, January 1998, through 1.2.47 - February 18, 2012 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.2.47rc01, not all possible expansions are supported. +As of libpng version 1.2.47, 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 @@ -3179,13 +3179,13 @@ Other rules can be inferred by inspecting the libpng source. XIII. Y2K Compliance in libpng -February 17, 2012 +February 18, 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.2.47rc01 are Y2K compliant. It is my belief that earlier +upward through 1.2.47 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 17, 2012" +.TH LIBPNG 3 "February 18, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.47rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.47 .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.2.47rc01 - February 17, 2012 + libpng version 1.2.47 - February 18, 2012 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.2.47rc01 - February 17, 2012 + libpng versions 0.97, January 1998, through 1.2.47 - February 18, 2012 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.2.47rc01, not all possible expansions are supported. +As of libpng version 1.2.47, 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 @@ -4000,13 +4000,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XIII. Y2K Compliance in libpng -February 17, 2012 +February 18, 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.2.47rc01 are Y2K compliant. It is my belief that earlier +upward through 1.2.47 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 @@ -4317,6 +4317,9 @@ the first widely used release: 1.2.46 13 10246 12.so.0.46[.0] 1.2.47beta01 13 10247 12.so.0.47[.0] 1.2.47rc01 13 10247 12.so.0.47[.0] + 1.0.57rc01 10 10057 10.so.0.57[.0] + 1.2.47 13 10247 12.so.0.47[.0] + 1.0.57 10 10057 10.so.0.57[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -4372,7 +4375,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.47rc01 - February 17, 2012: +Libpng version 1.2.47 - February 18, 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). @@ -4395,7 +4398,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.2.47rc01, February 17, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.2.47, February 18, 2012, 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 @@ -4494,7 +4497,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -February 17, 2012 +February 18, 2012 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 1c1ffe0f0..62a6161e8 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "February 17, 2012" +.TH LIBPNGPF 3 "February 18, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.47rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.47 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "February 17, 2012" +.TH PNG 5 "February 18, 2012" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -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_2_47rc01 Your_png_h_is_not_version_1_2_47rc01; +typedef version_1_2_47 Your_png_h_is_not_version_1_2_47; /* Version information for C files. This had better match the version * string defined in png.h. @@ -724,13 +724,13 @@ png_get_copyright(png_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.2.47rc01 - February 17, 2012" PNG_STRING_NEWLINE \ + "libpng version 1.2.47 - February 18, 2012" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2011 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ PNG_STRING_NEWLINE); #else - return ((png_charp) "libpng version 1.2.47rc01 - February 17, 2012\ + return ((png_charp) "libpng version 1.2.47 - February 18, 2012\ Copyright (c) 1998-2011 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.2.47rc01 - February 17, 2012 + * libpng version 1.2.47 - February 18, 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.) @@ -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.2.47rc01 - February 17, 2012: Glenn + * libpng versions 0.97, January 1998, through 1.2.47 - February 18, 2012: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -272,6 +272,9 @@ * 1.2.46 13 10246 12.so.0.46[.0] * 1.2.47beta01 13 10247 12.so.0.47[.0] * 1.2.47rc01 13 10247 12.so.0.47[.0] + * 1.0.57rc01 10 10057 10.so.0.57[.0] + * 1.2.47 13 10247 12.so.0.47[.0] + * 1.0.57 10 10057 10.so.0.57[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -303,7 +306,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.2.47rc01, February 17, 2012, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.47, February 18, 2012, are * Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.2.5 * with the following individual added to the list of Contributing Authors: @@ -415,13 +418,13 @@ * Y2K compliance in libpng: * ========================= * - * February 17, 2012 + * February 18, 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.2.47rc01 are Y2K compliant. It is my belief that earlier + * upward through 1.2.47 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 @@ -477,9 +480,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.47rc01" +#define PNG_LIBPNG_VER_STRING "1.2.47" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.47rc01 - February 17, 2012\n" + " libpng version 1.2.47 - February 18, 2012\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 @@ -492,7 +495,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 01 +#define PNG_LIBPNG_VER_BUILD 0 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -509,7 +512,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. @@ -1557,7 +1560,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_2_47rc01; +typedef png_structp version_1_2_47; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.47rc01 - February 17, 2012 + * libpng version 1.2.47 - February 18, 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 543b33f90..21392056e 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.2.47 [February 17, 2012] + * Last changed in libpng 1.2.47 [February 18, 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_2_47rc01 your_png_h_is_not_version_1_2_47rc01; +typedef version_1_2_47 your_png_h_is_not_version_1_2_47; diff --git a/projects/wince.txt b/projects/wince.txt index 4f069d27d..c8ed3c23f 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.2.47rc01-project-wince.zip from a libpng distribution +libpng-1.2.47-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.2.47rc01-project-wince.zip" +"unzip -a libpng-1.2.47-project-wince.zip" diff --git a/projects/xcode/libpng.xcodeproj/project.pbxproj b/projects/xcode/libpng.xcodeproj/project.pbxproj index fef4afe7e..d33bd4385 100644 --- a/projects/xcode/libpng.xcodeproj/project.pbxproj +++ b/projects/xcode/libpng.xcodeproj/project.pbxproj @@ -222,7 +222,7 @@ COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 3; DYLIB_CURRENT_VERSION = 3; - FRAMEWORK_VERSION = 1.2.47rc01; + FRAMEWORK_VERSION = 1.2.47; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; INFOPLIST_FILE = Info.plist; @@ -240,7 +240,7 @@ buildSettings = { DYLIB_COMPATIBILITY_VERSION = 3; DYLIB_CURRENT_VERSION = 3; - FRAMEWORK_VERSION = 1.2.47rc01; + FRAMEWORK_VERSION = 1.2.47; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; INFOPLIST_FILE = Info.plist; diff --git a/scripts/README.txt b/scripts/README.txt index 0b8535cd1..15fd5be3d 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,8 +1,8 @@ -Makefiles for libpng version 1.2.47rc01 - February 17, 2012 +Makefiles for libpng version 1.2.47 - February 18, 2012 makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.47rc01) + (gcc, creates libpng12.so.0.1.2.47) 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.2.47rc01 - February 17, 2012 makefile.dec => DEC Alpha UNIX makefile makefile.dj2 => DJGPP 2 makefile makefile.elf => Linux/ELF makefile symbol versioning, - gcc, creates libpng12.so.0.1.2.47rc01) + gcc, creates libpng12.so.0.1.2.47) 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.2.47rc01 - February 17, 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 libpng12.so.0.1.2.47rc01) + creates libpng12.so.0.1.2.47) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.47rc01) + creates libpng12.so.0.1.2.47) makefile.solaris-x86 => Solaris 2.X makefile (gcc, no MMX code, - creates libpng12.so.0.1.2.47rc01) + creates libpng12.so.0.1.2.47) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.47rc01) + creates libpng12.so.0.1.2.47) 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 0b20c7500..6d06abc82 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.2.47rc01 +version=1.2.47 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 841c4e828..e201301cf 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng12 Name: libpng Description: Loads and saves PNG files -Version: 1.2.47rc01 +Version: 1.2.47 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 9b976448d..e30cdc160 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.47rc01 +PNGMIN = 1.2.47 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 424b6c4ec..951e0123e 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.47rc01 +PNGMIN = 1.2.47 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 49502ab60..9b24135a2 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -23,7 +23,7 @@ LN_SF = ln -f -s LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.47rc01 +PNGMIN = 1.2.47 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 4ac33ecd5..939863d04 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.47rc01 +PNGMIN = 1.2.47 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 7cc8d3df9..5955c42ff 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -77,7 +77,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 CYGDLL = 12 -PNGMIN = 1.2.47rc01 +PNGMIN = 1.2.47 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 36c2feb01..012d32407 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -22,7 +22,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 12 -PNGMIN = 1.2.47rc01 +PNGMIN = 1.2.47 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 58658e2b1..b1eb30a73 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.47rc01 +PNGMIN = 1.2.47 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index a197e9f29..f0b04a682 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.47rc01 +PNGMIN = 1.2.47 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 6de08c512..11d9af02a 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -17,7 +17,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.47rc01 +PNGMIN = 1.2.47 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 74ec863bf..ba45bd610 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -21,7 +21,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.47rc01 +PNGMIN = 1.2.47 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 226555cdf..139bdd623 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.47rc01 +PNGMIN = 1.2.47 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 4cda9e572..828e2b3fc 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -21,7 +21,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.47rc01 +PNGMIN = 1.2.47 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 4940664eb..dd4f74616 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.47rc01 +PNGMIN = 1.2.47 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index c6feb20a8..f1ef42b61 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -81,7 +81,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 MINGDLL = 12 -PNGMIN = 1.2.47rc01 +PNGMIN = 1.2.47 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 12ce7af75..90c60ef37 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng12 LIB= png12 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.47rc01 +SHLIB_MINOR= 1.2.47 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 30d166b3f..3bb543fa7 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.2.47rc01 +SHLIB_MINOR= 1.2.47 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 a9351a5e8..008b03a86 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.47rc01 +PNGMIN = 1.2.47 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 2ba749619..9ace84606 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.2.47rc01 +SHLIB_MINOR= 1.2.47 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 058aff620..d2f23e3b7 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.47rc01 +PNGMIN = 1.2.47 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 415295c53..bb9446e7a 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -9,7 +9,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.47rc01 +PNGMIN = 1.2.47 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 4e686908b..3d7b526d9 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -9,7 +9,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.47rc01 +PNGMIN = 1.2.47 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 623dcd5e1..2e2ccddee 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -11,7 +11,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.47rc01 +PNGMIN = 1.2.47 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index ec38619a1..b42e282dd 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.47rc01 +PNGMIN = 1.2.47 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index 3d37f5c68..246335bcc 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.47rc01 +PNGMIN = 1.2.47 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/png32ce.def b/scripts/png32ce.def index 2ebfdc9dc..a940fa09e 100644 --- a/scripts/png32ce.def +++ b/scripts/png32ce.def @@ -5,7 +5,7 @@ LIBRARY lpngce EXPORTS -;Version 1.2.47rc01 +;Version 1.2.47 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 diff --git a/scripts/pngos2.def b/scripts/pngos2.def index bd155749c..6bf5cb226 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.47rc01 +; Version 1.2.47 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index 56fd7d9c2..5f86a0d6b 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.47rc01 +;Version 1.2.47 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 |