diff --git a/CMakeLists.txt b/CMakeLists.txt index f3a2681b0..ec44fc3fc 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.7rc01 +# VERSION 14.${PNGLIB_RELEASE}.1.4.7 VERSION 14.${PNGLIB_RELEASE}.0 SOVERSION 14 CLEAN_DIRECT_OUTPUT 1) diff --git a/INSTALL b/INSTALL index 1513ad4b2..efe3b358e 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.4.7rc01 - April 9, 2011 +Installing libpng version 1.4.7 - April 10, 2011 On Unix/Linux and similar systems, you can simply type @@ -46,7 +46,7 @@ to have access to the zlib.h and zconf.h include files that correspond to the version of zlib that's installed. You can rename the directories that you downloaded (they -might be called "libpng-1.4.7rc01" or "libpng14" and "zlib-1.2.3" +might be called "libpng-1.4.7" 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: diff --git a/LICENSE b/LICENSE index fa729f676..4915b9440 100644 --- a/LICENSE +++ b/LICENSE @@ -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.7rc01, April 9, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.4.7, April 10, 2011, 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 -April 9, 2011 +April 10, 2011 diff --git a/README b/README index f95784c0f..fe1b500e0 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.4.7rc01 - April 9, 2011 (shared library 14.0) +README for libpng version 1.4.7 - April 10, 2011 (shared library 14.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. @@ -185,9 +185,9 @@ Files in this distribution: makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF makefile symbol versioning, - (gcc, creates libpng14.so.14.1.4.7rc01) + (gcc, creates libpng14.so.14.1.4.7) makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.7rc01) + (gcc, creates libpng14.so.14.1.4.7) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr (Requires ansi2knr.c from @@ -209,12 +209,12 @@ Files in this distribution: makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX (cc, creates static lib) makefile.sggcc => Silicon Graphics - (gcc, creates libpng14.so.14.1.4.7rc01) + (gcc, creates libpng14.so.14.1.4.7) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng14.so.14.1.4.7rc01) + (gcc, creates libpng14.so.14.1.4.7) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng14.so.14.1.4.7rc01) + (gcc, creates libpng14.so.14.1.4.7) 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 diff --git a/configure b/configure index 8984a6317..f24d61288 100755 --- a/configure +++ b/configure @@ -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.7rc01. +# Generated by GNU Autoconf 2.65 for libpng 1.4.7. # # Report bugs to . # @@ -562,8 +562,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.4.7rc01' -PACKAGE_STRING='libpng 1.4.7rc01' +PACKAGE_VERSION='1.4.7' +PACKAGE_STRING='libpng 1.4.7' 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.7rc01 to adapt to many kinds of systems. +\`configure' configures libpng 1.4.7 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.7rc01:";; + short | recursive ) echo "Configuration of libpng 1.4.7:";; 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.7rc01 +libpng configure 1.4.7 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.7rc01, which was +It was created by libpng $as_me 1.4.7, 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.7rc01' + VERSION='1.4.7' cat >>confdefs.h <<_ACEOF @@ -2764,7 +2764,7 @@ fi -PNGLIB_VERSION=1.4.7rc01 +PNGLIB_VERSION=1.4.7 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 PNGLIB_RELEASE=7 @@ -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.7rc01, which was +This file was extended by libpng $as_me 1.4.7, 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.7rc01 +libpng config.status 1.4.7 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 69cca0414..3ea68aa05 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.7rc01], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.4.7], [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.7rc01 +PNGLIB_VERSION=1.4.7 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 PNGLIB_RELEASE=7 diff --git a/libpng-1.4.7rc01.txt b/libpng-1.4.7.txt similarity index 99% rename from libpng-1.4.7rc01.txt rename to libpng-1.4.7.txt index 88bbb361d..ac420234d 100644 --- a/libpng-1.4.7rc01.txt +++ b/libpng-1.4.7.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.7rc01 - April 9, 2011 + libpng version 1.4.7 - April 10, 2011 Updated and distributed by Glenn Randers-Pehrson 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.7rc01 - April 9, 2011 + libpng versions 0.97, January 1998, through 1.4.7 - April 10, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -905,7 +905,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.7rc01, not all possible expansions are supported. +As of libpng version 1.4.7, 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 @@ -3307,13 +3307,13 @@ Other rules can be inferred by inspecting the libpng source. XIII. Y2K Compliance in libpng -April 9, 2011 +April 10, 2011 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.4.7rc01 are Y2K compliant. It is my belief that earlier +upward through 1.4.7 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 diff --git a/libpng.3 b/libpng.3 index cc418a634..339aaa635 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "April 9, 2011" +.TH LIBPNG 3 "April 10, 2011" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.7rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.7 .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.7rc01 - April 9, 2011 + libpng version 1.4.7 - April 10, 2011 Updated and distributed by Glenn Randers-Pehrson 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.7rc01 - April 9, 2011 + libpng versions 0.97, January 1998, through 1.4.7 - April 10, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2010 Glenn Randers-Pehrson @@ -1800,7 +1800,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.7rc01, not all possible expansions are supported. +As of libpng version 1.4.7, 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 @@ -4202,13 +4202,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XIII. Y2K Compliance in libpng -April 9, 2011 +April 10, 2011 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.4.7rc01 are Y2K compliant. It is my belief that earlier +upward through 1.4.7 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 @@ -4404,6 +4404,7 @@ the first widely used release: 1.4.6rc01 14 10406 14.so.14.6[.0] 1.4.6 14 10406 14.so.14.6[.0] 1.4.7rc01 14 10407 14.so.14.7[.0] + 1.4.7 14 10407 14.so.14.7[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -4459,7 +4460,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.7rc01 - April 9, 2011: +Libpng version 1.4.7 - April 10, 2011: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -4482,7 +4483,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.4.7rc01, April 9, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.4.7, April 10, 2011, 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 @@ -4581,7 +4582,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -April 9, 2011 +April 10, 2011 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index d40ebc874..0b1d39f16 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "April 9, 2011" +.TH LIBPNGPF 3 "April 10, 2011" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.7rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.7 (private functions) .SH SYNOPSIS \fB#include \fP diff --git a/png.5 b/png.5 index 229352b43..7289bdc7e 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "April 9, 2011" +.TH PNG 5 "April 10, 2011" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index aae4d4b20..2316a8e25 100644 --- a/png.c +++ b/png.c @@ -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_7rc01 Your_png_h_is_not_version_1_4_7rc01; +typedef version_1_4_7 Your_png_h_is_not_version_1_4_7; /* 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.7rc01 - April 9, 2011" PNG_STRING_NEWLINE \ + "libpng version 1.4.7 - April 10, 2011" 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.7rc01 - April 9, 2011\ + return ((png_charp) "libpng version 1.4.7 - April 10, 2011\ Copyright (c) 1998-2010 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."); diff --git a/png.h b/png.h index d2bb8211e..21b670be7 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.4.7rc01 - April 9, 2011 + * libpng version 1.4.7 - April 10, 2011 * Copyright (c) 1998-2011 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -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.7rc01 - April 9, 2011: Glenn + * libpng versions 0.97, January 1998, through 1.4.7 - April 10, 2011: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -157,6 +157,7 @@ * 1.4.6rc01 14 10406 14.so.14.6[.0] * 1.4.6 14 10406 14.so.14.6[.0] * 1.4.7rc01 14 10407 14.so.14.7[.0] + * 1.4.7 14 10407 14.so.14.7[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -188,7 +189,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.4.7rc01, April 9, 2011, are + * libpng versions 1.2.6, August 15, 2004, through 1.4.7, April 10, 2011, 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: @@ -300,13 +301,13 @@ * Y2K compliance in libpng: * ========================= * - * April 9, 2011 + * April 10, 2011 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.4.7rc01 are Y2K compliant. It is my belief that earlier + * upward through 1.4.7 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 @@ -362,9 +363,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.4.7rc01" +#define PNG_LIBPNG_VER_STRING "1.4.7" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.7rc01 - April 9, 2011\n" + " libpng version 1.4.7 - April 10, 2011\n" #define PNG_LIBPNG_VER_SONUM 14 #define PNG_LIBPNG_VER_DLLNUM 14 @@ -377,7 +378,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 @@ -1488,7 +1489,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_7rc01; +typedef png_structp version_1_4_7; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngget.c b/pngget.c index 286b439e8..cd2054ce8 100644 --- a/pngget.c +++ b/pngget.c @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * Last changed in libpng 1.4.6 [April 9, 2011] + * Last changed in libpng 1.4.6 [April 10, 2011] * Copyright (c) 1998-2011 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) diff --git a/pngmem.c b/pngmem.c index 317b1ac39..911f36881 100644 --- a/pngmem.c +++ b/pngmem.c @@ -1,7 +1,7 @@ /* pngmem.c - stub functions for memory allocation * - * Last changed in libpng 1.4.6 [April 9, 2011] + * Last changed in libpng 1.4.6 [April 10, 2011] * Copyright (c) 1998-2011 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) diff --git a/pngpriv.h b/pngpriv.h index fcaabdd6c..44197cabc 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.4.7rc01 - April 9, 2011 + * libpng version 1.4.7 - April 10, 2011 * 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/pngtest.c b/pngtest.c index 8e235344a..ba4c4c74a 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1687,4 +1687,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_7rc01 your_png_h_is_not_version_1_4_7rc01; +typedef version_1_4_7 your_png_h_is_not_version_1_4_7; diff --git a/pngtrans.c b/pngtrans.c index 55b90f540..05eb2d05a 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -1,7 +1,7 @@ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * - * Last changed in libpng 1.4.6 [April 9, 2011] + * Last changed in libpng 1.4.6 [April 10, 2011] * Copyright (c) 1998-2011 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 438bdcb88..244925607 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.4.7rc01 - April 9, 2011 +libpng version 1.4.7 - April 10, 2011 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index a471523af..8471f9b55 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@