From 9f01d0d6653a863a85c6053a61df18792240bf2d Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Wed, 25 Jan 2012 16:10:03 -0600 Subject: [libpng15] Imported from libpng-1.5.8rc02.tar --- LICENSE | 4 ++-- Makefile.am | 1 + Makefile.in | 1 + README | 2 +- configure | 22 +++++++++++----------- configure.ac | 4 ++-- libpng-manual.txt | 8 ++++---- libpng.3 | 19 ++++++++++--------- libpngpf.3 | 4 ++-- png.5 | 2 +- png.c | 6 +++--- png.h | 19 ++++++++++--------- pngconf.h | 2 +- pngerror.c | 12 +++++++----- pngtest.c | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 12 ++++++------ scripts/libpng-config-head.in | 2 +- scripts/libpng.pc.in | 2 +- scripts/makefile.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.openbsd | 2 +- scripts/pnglibconf.h.prebuilt | 2 +- scripts/symbols.def | 2 +- 25 files changed, 72 insertions(+), 66 deletions(-) diff --git a/LICENSE b/LICENSE index c226242b1..49fa84a47 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.5.8beta01, January 15, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.5.8rc02, January 25, 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 @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -January 15, 2012 +January 25, 2012 diff --git a/Makefile.am b/Makefile.am index def4bd117..822811576 100644 --- a/Makefile.am +++ b/Makefile.am @@ -225,3 +225,4 @@ uninstall-hook: rm -f $(DESTDIR)$(bindir)/libpng-config rm -f $(DESTDIR)$(libdir)/libpng.a rm -f $(DESTDIR)$(libdir)/libpng.la + rm -f $(DESTDIR)$(libdir)/libpng.dll.a diff --git a/Makefile.in b/Makefile.in index cc6427780..0fc76d3b8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1436,6 +1436,7 @@ uninstall-hook: rm -f $(DESTDIR)$(bindir)/libpng-config rm -f $(DESTDIR)$(libdir)/libpng.a rm -f $(DESTDIR)$(libdir)/libpng.la + rm -f $(DESTDIR)$(libdir)/libpng.dll.a # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/README b/README index 50ad78915..0c7423719 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.8beta01 - January 15, 2012 (shared library 15.0) +README for libpng version 1.5.8rc02 - January 25, 2012 (shared library 15.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. diff --git a/configure b/configure index 5ffac5634..9e7f4c1a9 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.68 for libpng 1.5.8beta01. +# Generated by GNU Autoconf 2.68 for libpng 1.5.8rc02. # # Report bugs to . # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.8beta01' -PACKAGE_STRING='libpng 1.5.8beta01' +PACKAGE_VERSION='1.5.8rc02' +PACKAGE_STRING='libpng 1.5.8rc02' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1320,7 +1320,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.5.8beta01 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.8rc02 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1390,7 +1390,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.8beta01:";; + short | recursive ) echo "Configuration of libpng 1.5.8rc02:";; esac cat <<\_ACEOF @@ -1501,7 +1501,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.8beta01 +libpng configure 1.5.8rc02 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1924,7 +1924,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.5.8beta01, which was +It was created by libpng $as_me 1.5.8rc02, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2739,7 +2739,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.8beta01' + VERSION='1.5.8rc02' cat >>confdefs.h <<_ACEOF @@ -2803,7 +2803,7 @@ fi -PNGLIB_VERSION=1.5.8beta01 +PNGLIB_VERSION=1.5.8rc02 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=8 @@ -13414,7 +13414,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.5.8beta01, which was +This file was extended by libpng $as_me 1.5.8rc02, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13480,7 +13480,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.5.8beta01 +libpng config.status 1.5.8rc02 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 0110822c2..d03866d0d 100644 --- a/configure.ac +++ b/configure.ac @@ -18,12 +18,12 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.5.8beta01], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.8rc02], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.8beta01 +PNGLIB_VERSION=1.5.8rc02 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=8 diff --git a/libpng-manual.txt b/libpng-manual.txt index 6a0e41e76..bc85ec72b 100644 --- a/libpng-manual.txt +++ b/libpng-manual.txt @@ -1,6 +1,6 @@ libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.5.8beta01 - January 15, 2012 + libpng version 1.5.8rc02 - January 25, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.8beta01 - January 15, 2012 + libpng versions 0.97, January 1998, through 1.5.8rc02 - January 25, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -4573,13 +4573,13 @@ Other rules can be inferred by inspecting the libpng source. XIV. Y2K Compliance in libpng -January 15, 2012 +January 25, 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.5.8beta01 are Y2K compliant. It is my belief that earlier +upward through 1.5.8rc02 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 f260c7fa0..c25cbc618 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "January 15, 2012" +.TH LIBPNG 3 "January 25, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.8beta01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.8rc02 .SH SYNOPSIS \fI\fB @@ -977,7 +977,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng. .SH LIBPNG.TXT libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.5.8beta01 - January 15, 2012 + libpng version 1.5.8rc02 - January 25, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -988,7 +988,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.8beta01 - January 15, 2012 + libpng versions 0.97, January 1998, through 1.5.8rc02 - January 25, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -5551,13 +5551,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XIV. Y2K Compliance in libpng -January 15, 2012 +January 25, 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.5.8beta01 are Y2K compliant. It is my belief that earlier +upward through 1.5.8rc02 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 @@ -5763,6 +5763,7 @@ the first widely used release: 1.5.7rc01-03 15 10507 15.so.15.7[.0] 1.5.7 15 10507 15.so.15.7[.0] 1.5.8beta01 15 10508 15.so.15.8[.0] + 1.5.8rc01 15 10508 15.so.15.8[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -5819,7 +5820,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.8beta01 - January 15, 2012: +Libpng version 1.5.8rc02 - January 25, 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). @@ -5842,7 +5843,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.8beta01, January 15, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.5.8rc02, January 25, 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 @@ -5941,7 +5942,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -January 15, 2012 +January 25, 2012 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index ca183fb2b..7607928b7 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "January 15, 2012" +.TH LIBPNGPF 3 "January 25, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.8beta01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.8rc02 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 54285d91b..53892a0e6 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "January 15, 2012" +.TH PNG 5 "January 25, 2012" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 2c038d416..9314968ef 100644 --- a/png.c +++ b/png.c @@ -14,7 +14,7 @@ #include "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_5_8beta01 Your_png_h_is_not_version_1_5_8beta01; +typedef png_libpng_version_1_5_8rc02 Your_png_h_is_not_version_1_5_8rc02; /* 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 @@ -655,13 +655,13 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.8beta01 - January 15, 2012" PNG_STRING_NEWLINE \ + "libpng version 1.5.8rc02 - January 25, 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 "libpng version 1.5.8beta01 - January 15, 2012\ + return "libpng version 1.5.8rc02 - January 25, 2012\ Copyright (c) 1998-2011 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 d711c13bc..776e064c2 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.8beta01 - January 15, 2012 + * libpng version 1.5.8rc02 - January 25, 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.) @@ -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.5.8beta01 - January 15, 2012: Glenn + * libpng versions 0.97, January 1998, through 1.5.8rc02 - January 25, 2012: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -167,6 +167,7 @@ * 1.5.7rc01-03 15 10507 15.so.15.7[.0] * 1.5.7 15 10507 15.so.15.7[.0] * 1.5.8beta01 15 10508 15.so.15.8[.0] + * 1.5.8rc01 15 10508 15.so.15.8[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -198,7 +199,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.8beta01, January 15, 2012, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.8rc02, January 25, 2012, are * Copyright (c) 2004, 2006-2012 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: @@ -310,13 +311,13 @@ * Y2K compliance in libpng: * ========================= * - * January 15, 2012 + * January 25, 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.5.8beta01 are Y2K compliant. It is my belief that + * upward through 1.5.8rc02 are Y2K compliant. It is my belief that * earlier versions were also Y2K compliant. * * Libpng only has two year fields. One is a 2-byte unsigned integer @@ -374,9 +375,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.8beta01" +#define PNG_LIBPNG_VER_STRING "1.5.8rc02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.8beta01 - January 15, 2012\n" + " libpng version 1.5.8rc02 - January 25, 2012\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -390,7 +391,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 01 +#define PNG_LIBPNG_VER_BUILD 02 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -537,7 +538,7 @@ extern "C" { /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -typedef char* png_libpng_version_1_5_8beta01; +typedef char* png_libpng_version_1_5_8rc02; /* Three color definitions. The order of the red, green, and blue, (and the * exact size) is not important, although the size of the fields need to diff --git a/pngconf.h b/pngconf.h index ed4e3894e..83d0126a2 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.8beta01 - January 15, 2012 + * libpng version 1.5.8rc02 - January 25, 2012 * * Copyright (c) 1998-2012 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngerror.c b/pngerror.c index e53da05bd..967915209 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,8 +1,8 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * Last changed in libpng 1.5.7 [December 15, 2011] - * Copyright (c) 1998-2011 Glenn Randers-Pehrson + * Last changed in libpng 1.5.7 [(PENDING RELEASE)] + * 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.) * @@ -281,11 +281,13 @@ void png_formatted_warning(png_structp png_ptr, png_warning_parameters p, png_const_charp message) { - /* The internal buffer is just 128 bytes - enough for all our messages, - * overflow doesn't happen because this code checks! + /* The internal buffer is just 192 bytes - enough for all our messages, + * overflow doesn't happen because this code checks! If someone figures + * out how to send us a message longer than 192 bytes, all that will + * happen is that the message will be truncated appropriately. */ size_t i = 0; /* Index in the msg[] buffer: */ - char msg[128]; + char msg[192]; /* Each iteration through the following loop writes at most one character * to msg[i++] then returns here to validate that there is still space for diff --git a/pngtest.c b/pngtest.c index 1f964e5f5..0c1e1f371 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1817,4 +1817,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_5_8beta01 Your_png_h_is_not_version_1_5_8beta01; +typedef png_libpng_version_1_5_8rc02 Your_png_h_is_not_version_1_5_8rc02; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 4405cf472..058f1d9f1 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.8beta01 - January 15, 2012 +libpng version 1.5.8rc02 - January 25, 2012 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 46378fe96..bbb889837 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@