From d08b6bdbf798df16cc650046bc70a50ef9e1a2f2 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 19 Feb 2011 15:50:17 -0600 Subject: [PATCH] [devel] Imported from libpng-1.5.2beta02.tar --- ANNOUNCE | 4 ++-- CHANGES | 2 +- CMakeLists.txt | 2 +- LICENSE | 4 ++-- README | 2 +- configure | 22 +++++++++++----------- configure.ac | 4 ++-- libpng-manual.txt | 11 ++++++----- libpng.3 | 23 ++++++++++++----------- libpngpf.3 | 4 ++-- png.5 | 2 +- png.c | 6 +++--- png.h | 20 ++++++++++---------- pngconf.h | 2 +- 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/symbols.def | 2 +- 24 files changed, 70 insertions(+), 68 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 73c3307dd..09b6e3c47 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.2beta02 - February 16, 2011 +Libpng 1.5.2beta02 - February 19, 2011 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. @@ -39,7 +39,7 @@ Version 1.5.2beta01 [February 13, 2011] Cleaned up ALPHA flags and transformations. Implemented expansion to 16 bits. -Version 1.5.2beta02 [February 16, 2011] +Version 1.5.2beta02 [February 19, 2011] Fixed mistake in the descriptions of user read_transform and write_transform function prototypes in the manual. The row_info struct is png_row_infop. Reverted png_get_current_row_number() to previous (1.5.2beta01) behavior. diff --git a/CHANGES b/CHANGES index 94619aa6f..78951159b 100644 --- a/CHANGES +++ b/CHANGES @@ -3255,7 +3255,7 @@ Version 1.5.2beta01 [February 13, 2011] Cleaned up ALPHA flags and transformations. Implemented expansion to 16 bits. -Version 1.5.2beta02 [February 16, 2011] +Version 1.5.2beta02 [February 19, 2011] Fixed mistake in the descriptions of user read_transform and write_transform function prototypes in the manual. The row_info struct is png_row_infop. Reverted png_get_current_row_number() to previous (1.5.2beta01) behavior. diff --git a/CMakeLists.txt b/CMakeLists.txt index a106d3350..412237405 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -264,7 +264,7 @@ install(CODE ${PNG_CONFIG_INSTALL_CODE}) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 15.${PNGLIB_RELEASE}.1.5.2beta01 +# VERSION 15.${PNGLIB_RELEASE}.1.5.2beta02 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 935bc43fa..d55221874 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.2beta01, February 13, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.5.2beta02, February 19, 2011, 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 -February 13, 2011 +February 19, 2011 diff --git a/README b/README index 528aa6d16..ad10e9243 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.2beta01 - February 13, 2011 (shared library 15.0) +README for libpng version 1.5.2beta02 - February 19, 2011 (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 6320c4e22..bc4a3503f 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.2beta01. +# Generated by GNU Autoconf 2.68 for libpng 1.5.2beta02. # # Report bugs to . # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.2beta01' -PACKAGE_STRING='libpng 1.5.2beta01' +PACKAGE_VERSION='1.5.2beta02' +PACKAGE_STRING='libpng 1.5.2beta02' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1307,7 +1307,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.2beta01 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.2beta02 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1377,7 +1377,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.2beta01:";; + short | recursive ) echo "Configuration of libpng 1.5.2beta02:";; esac cat <<\_ACEOF @@ -1485,7 +1485,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.2beta01 +libpng configure 1.5.2beta02 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1908,7 +1908,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.2beta01, which was +It was created by libpng $as_me 1.5.2beta02, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2723,7 +2723,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.2beta01' + VERSION='1.5.2beta02' cat >>confdefs.h <<_ACEOF @@ -2787,7 +2787,7 @@ fi -PNGLIB_VERSION=1.5.2beta01 +PNGLIB_VERSION=1.5.2beta02 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=2 @@ -13040,7 +13040,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.2beta01, which was +This file was extended by libpng $as_me 1.5.2beta02, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13106,7 +13106,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.2beta01 +libpng config.status 1.5.2beta02 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 24b16c8fd..4c55d86e0 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.2beta01], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.2beta02], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.2beta01 +PNGLIB_VERSION=1.5.2beta02 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=2 diff --git a/libpng-manual.txt b/libpng-manual.txt index 4b6878618..014db9301 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.2beta02 - February 14, 2011 + libpng version 1.5.2beta02 - February 19, 2011 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.2beta02 - February 14, 2011 + libpng versions 0.97, January 1998, through 1.5.2beta02 - February 19, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -3782,7 +3782,8 @@ application code. (It is extremely rare for an application to do this.) Any program that compiled against libpng 1.4 and did not use deprecated features or access internal library structures should compile and work -against libpng 1.5. +against libpng 1.5, except for the change in the prototype for +png_get_iCCP() and png_set_iCCP() API functions mentioned above. libpng 1.5.0 adds PNG_ PASS macros to help in the reading and writing of interlaced images. The macros return the number of rows and columns in @@ -3790,7 +3791,7 @@ each pass and information that can be used to de-interlace and (if absolutely necessary) interlace an image. libpng 1.5.0 adds an API png_longjmp(png_ptr, value). This API calls -the application provided png_longjmp_ptr on the internal, but application +the application-provided png_longjmp_ptr on the internal, but application initialized, jmpbuf. It is provided as a convenience to avoid the need to use the png_jmpbuf macro, which had the unnecessary side effect of resetting the internal png_longjmp_ptr value. @@ -4155,7 +4156,7 @@ Other rules can be inferred by inspecting the libpng source. XIV. Y2K Compliance in libpng -February 14, 2011 +February 19, 2011 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. diff --git a/libpng.3 b/libpng.3 index 376f983d0..a401f175f 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "February 14, 2011" +.TH LIBPNG 3 "February 19, 2011" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.5.2beta02 .SH SYNOPSIS @@ -572,11 +572,11 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.5.2beta02 \fI\fB -\fBvoid png_set_expand_16 (png_structp \fIpng_ptr\fP\fB);\fP +\fBvoid png_set_expand (png_structp \fIpng_ptr\fP\fB);\fP \fI\fB -\fBvoid png_set_expand (png_structp \fIpng_ptr\fP\fB);\fP +\fBvoid png_set_expand_16 (png_structp \fIpng_ptr\fP\fB);\fP \fI\fB @@ -923,7 +923,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.2beta02 - February 14, 2011 + libpng version 1.5.2beta02 - February 19, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -934,7 +934,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.2beta02 - February 14, 2011 + libpng versions 0.97, January 1998, through 1.5.2beta02 - February 19, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -4705,7 +4705,8 @@ application code. (It is extremely rare for an application to do this.) Any program that compiled against libpng 1.4 and did not use deprecated features or access internal library structures should compile and work -against libpng 1.5. +against libpng 1.5, except for the change in the prototype for +png_get_iCCP() and png_set_iCCP() API functions mentioned above. libpng 1.5.0 adds PNG_ PASS macros to help in the reading and writing of interlaced images. The macros return the number of rows and columns in @@ -4713,7 +4714,7 @@ each pass and information that can be used to de-interlace and (if absolutely necessary) interlace an image. libpng 1.5.0 adds an API png_longjmp(png_ptr, value). This API calls -the application provided png_longjmp_ptr on the internal, but application +the application-provided png_longjmp_ptr on the internal, but application initialized, jmpbuf. It is provided as a convenience to avoid the need to use the png_jmpbuf macro, which had the unnecessary side effect of resetting the internal png_longjmp_ptr value. @@ -5078,7 +5079,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XIV. Y2K Compliance in libpng -February 14, 2011 +February 19, 2011 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -5327,7 +5328,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.2beta02 - February 14, 2011: +Libpng version 1.5.2beta02 - February 19, 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). @@ -5350,7 +5351,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.2beta02, February 14, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.5.2beta02, February 19, 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 @@ -5449,7 +5450,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -February 14, 2011 +February 19, 2011 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 55064100a..346518c37 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "February 13, 2011" +.TH LIBPNGPF 3 "February 19, 2011" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.2beta01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.2beta02 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 8c81822e8..8a5fdea7a 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "February 13, 2011" +.TH PNG 5 "February 19, 2011" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 602e9d423..a81ac170c 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_2beta01 Your_png_h_is_not_version_1_5_2beta01; +typedef png_libpng_version_1_5_2beta02 Your_png_h_is_not_version_1_5_2beta02; /* 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 @@ -555,13 +555,13 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.2beta01 - February 13, 2011" PNG_STRING_NEWLINE \ + "libpng version 1.5.2beta02 - February 19, 2011" 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.2beta01 - February 13, 2011\ + return "libpng version 1.5.2beta02 - February 19, 2011\ 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 996d1d6c9..8a1d0df2a 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.2beta01 - February 13, 2011 + * libpng version 1.5.2beta02 - February 19, 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.5.2beta01 - February 13, 2011: Glenn + * libpng versions 0.97, January 1998, through 1.5.2beta02 - February 19, 2011: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -147,7 +147,7 @@ * 1.5.1beta01-11 15 10501 15.so.15.1[.0] * 1.5.1rc01-02 15 10501 15.so.15.1[.0] * 1.5.1 15 10501 15.so.15.1[.0] - * 1.5.2beta01 15 10502 15.so.15.2[.0] + * 1.5.2beta01-02 15 10502 15.so.15.2[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -179,7 +179,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.2beta01, February 13, 2011, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.2beta02, February 19, 2011, 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: @@ -291,13 +291,13 @@ * Y2K compliance in libpng: * ========================= * - * February 13, 2011 + * February 19, 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.5.2beta01 are Y2K compliant. It is my belief that + * upward through 1.5.2beta02 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 @@ -353,9 +353,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.2beta01" +#define PNG_LIBPNG_VER_STRING "1.5.2beta02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.2beta01 - February 13, 2011\n" + " libpng version 1.5.2beta02 - February 19, 2011\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -368,7 +368,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 @@ -510,7 +510,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_2beta01; +typedef char* png_libpng_version_1_5_2beta02; /* 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 8ae5faa73..678b1a1c3 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.2beta01 - (PENDING RELEASE) + * libpng version 1.5.2beta02 - (PENDING RELEASE) * * 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 fb89cbfcf..397e7ce6c 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1784,4 +1784,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_2beta01 Your_png_h_is_not_version_1_5_2beta01; +typedef png_libpng_version_1_5_2beta02 Your_png_h_is_not_version_1_5_2beta02; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index a92b4ba6d..558019d5d 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.2beta01 - February 13, 2011 +libpng version 1.5.2beta02 - February 19, 2011 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index ac205e175..f40ef510c 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@