[libpng15] Enclosed the new png_get_palette_max

in #ifdef PNG_GET_PALETTE_MAX_SUPPORTED block, and revised pnglibconf.h
and pnglibconf.h.prebuilt accordingly.
This commit is contained in:
Glenn Randers-Pehrson
2013-02-10 16:14:54 -06:00
parent 06364d4585
commit 8849c000ea
6 changed files with 27 additions and 9 deletions

13
png.h
View File

@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
* libpng version 1.5.15beta04 - February 7, 2013
* libpng version 1.5.15beta04 - February 10, 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.5.15beta04 - February 7, 2013: Glenn
* libpng versions 0.97, January 1998, through 1.5.15beta04 - February 10, 2013: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -216,7 +216,7 @@
*
* This code is released under the libpng license.
*
* libpng versions 1.2.6, August 15, 2004, through 1.5.15beta04, February 7, 2013, are
* libpng versions 1.2.6, August 15, 2004, through 1.5.15beta04, February 10, 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:
@@ -328,7 +328,7 @@
* Y2K compliance in libpng:
* =========================
*
* February 7, 2013
* February 10, 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.5.15beta04"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.5.15beta04 - February 7, 2013\n"
" libpng version 1.5.15beta04 - February 10, 2013\n"
#define PNG_LIBPNG_VER_SONUM 15
#define PNG_LIBPNG_VER_DLLNUM 15
@@ -2655,9 +2655,12 @@ PNG_EXPORT(207, void, png_save_uint_16, (png_bytep buf, unsigned int i));
defined(PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED)
PNG_EXPORT(234, void, png_set_check_for_invalid_index, (png_structp png_ptr,
int allowed));
#if defined(PNG_READ_GET_PALETTE_MAX_SUPPORTED) || \
defined(PNG_READ_GET_PALETTE_MAX_SUPPORTED)
PNG_EXPORT(235, int, png_get_palette_max, (png_const_structp png_ptr,
png_const_infop info_ptr));
#endif
#endif
/* Maintainer: Put new public prototypes here ^, in libpng.3, and project
* defs