[libpng16] Catch up with some recent changes that did not get merged.

This commit is contained in:
Glenn Randers-Pehrson
2013-09-30 13:56:44 -05:00
parent cc93d89e43
commit b3721757a0
4 changed files with 27 additions and 16 deletions

13
png.h
View File

@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
* libpng version 1.6.7beta01 - September 16, 2013
* libpng version 1.6.7beta01 - September 30, 2013
* Copyright (c) 1998-2013 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.6.7beta01 - September 16, 2013: Glenn
* libpng versions 0.97, January 1998, through 1.6.7beta01 - September 30, 2013: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -215,7 +215,7 @@
*
* This code is released under the libpng license.
*
* libpng versions 1.2.6, August 15, 2004, through 1.6.7beta01, September 16, 2013, are
* libpng versions 1.2.6, August 15, 2004, through 1.6.7beta01, September 30, 2013, are
* Copyright (c) 2004, 2006-2013 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:
@@ -327,7 +327,7 @@
* Y2K compliance in libpng:
* =========================
*
* September 16, 2013
* September 30, 2013
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
@@ -395,7 +395,7 @@
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.6.7beta01"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.6.7beta01 - September 16, 2013\n"
" libpng version 1.6.7beta01 - September 30, 2013\n"
#define PNG_LIBPNG_VER_SONUM 16
#define PNG_LIBPNG_VER_DLLNUM 16
@@ -721,7 +721,8 @@ typedef png_time * png_timep;
typedef const png_time * png_const_timep;
typedef png_time * * png_timepp;
#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
#if defined(PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED) ||\
defined(PNG_USER_CHUNKS_SUPPORTED)
/* png_unknown_chunk is a structure to hold queued chunks for which there is
* no specific support. The idea is that we can use this to queue
* up private chunks for output even though the library doesn't actually