[master] Bump to version 1.2.42beta01

This commit is contained in:
Glenn Randers-Pehrson
2009-12-04 05:47:47 -06:00
parent 6e00020a9f
commit 804cc98cd1
67 changed files with 150 additions and 189 deletions

25
png.h
View File

@@ -1,6 +1,6 @@
/* png.h - header file for PNG reference library
*
* libpng version 1.2.41 - December 3, 2009
* libpng version 1.2.42beta01 - December 4, 2009
* Copyright (c) 1998-2009 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.41 - December 3, 2009: Glenn
* libpng versions 0.97, January 1998, through 1.2.42beta01 - December 4, 2009: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -250,6 +250,7 @@
* 1.2.41rc01-03 13 10241 12.so.0.41[.0]
* 1.0.51 10 10051 10.so.0.51[.0]
* 1.2.41 13 10241 12.so.0.41[.0]
* 1.2.42beta01 13 10242 12.so.0.42[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -281,7 +282,7 @@
*
* This code is released under the libpng license.
*
* libpng versions 1.2.6, August 15, 2004, through 1.2.41, December 3, 2009, are
* libpng versions 1.2.6, August 15, 2004, through 1.2.42beta01, December 4, 2009, 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:
@@ -393,13 +394,13 @@
* Y2K compliance in libpng:
* =========================
*
* December 3, 2009
* December 4, 2009
*
* 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.41 are Y2K compliant. It is my belief that earlier
* upward through 1.2.42beta01 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
@@ -455,9 +456,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.2.41"
#define PNG_LIBPNG_VER_STRING "1.2.42beta01"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.2.41 - December 3, 2009\n"
" libpng version 1.2.42beta01 - December 4, 2009\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 13
@@ -465,12 +466,12 @@
/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
#define PNG_LIBPNG_VER_MAJOR 1
#define PNG_LIBPNG_VER_MINOR 2
#define PNG_LIBPNG_VER_RELEASE 41
#define PNG_LIBPNG_VER_RELEASE 42
/* This should match the numeric part of the final component of
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
*/
#define PNG_LIBPNG_VER_BUILD 0
#define PNG_LIBPNG_VER_BUILD 01
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@@ -487,7 +488,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_STABLE
#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA
/* Careful here. At one time, Guy wanted to use 082, but that would be octal.
* We must not include leading zeros.
@@ -495,7 +496,7 @@
* version 1.0.0 was mis-numbered 100 instead of 10000). From
* version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release
*/
#define PNG_LIBPNG_VER 10241 /* 1.2.41 */
#define PNG_LIBPNG_VER 10242 /* 1.2.42 */
#ifndef PNG_VERSION_INFO_ONLY
/* Include the compression library's header */
@@ -1526,7 +1527,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_41;
typedef png_structp version_1_2_42beta01;
typedef png_struct FAR * FAR * png_structpp;