[master] Bump to version 1.4.8beta01

This commit is contained in:
Glenn Randers-Pehrson
2011-05-02 12:21:42 -05:00
parent 16ee3e9870
commit f512ca7625
35 changed files with 101 additions and 95 deletions

23
png.h
View File

@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
* libpng version 1.4.7 - April 10, 2011
* libpng version 1.4.8beta01 - May 2, 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.7 - April 10, 2011: Glenn
* libpng versions 0.97, January 1998, through 1.4.8beta01 - May 2, 2011: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -158,6 +158,7 @@
* 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]
* 1.4.8beta01 14 10408 14.so.14.8[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -189,7 +190,7 @@
*
* This code is released under the libpng license.
*
* libpng versions 1.2.6, August 15, 2004, through 1.4.7, April 10, 2011, are
* libpng versions 1.2.6, August 15, 2004, through 1.4.8beta01, May 2, 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:
@@ -301,13 +302,13 @@
* Y2K compliance in libpng:
* =========================
*
* April 10, 2011
* May 2, 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.7 are Y2K compliant. It is my belief that earlier
* upward through 1.4.8beta01 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
@@ -363,9 +364,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.4.7"
#define PNG_LIBPNG_VER_STRING "1.4.8beta01"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.4.7 - April 10, 2011\n"
" libpng version 1.4.8beta01 - May 2, 2011\n"
#define PNG_LIBPNG_VER_SONUM 14
#define PNG_LIBPNG_VER_DLLNUM 14
@@ -373,12 +374,12 @@
/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
#define PNG_LIBPNG_VER_MAJOR 1
#define PNG_LIBPNG_VER_MINOR 4
#define PNG_LIBPNG_VER_RELEASE 7
#define PNG_LIBPNG_VER_RELEASE 8
/* 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
@@ -403,7 +404,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 10407 /* 1.4.7 */
#define PNG_LIBPNG_VER 10408 /* 1.4.8 */
#ifndef PNG_VERSION_INFO_ONLY
/* Include the compression library's header */
@@ -1489,7 +1490,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_7;
typedef png_structp version_1_4_8beta01;
typedef png_struct FAR * FAR * png_structpp;