From 8849c000ea471289a1129a845a35ffb802c2f2b1 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sun, 10 Feb 2013 16:14:54 -0600 Subject: [PATCH] [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. --- ANNOUNCE | 6 ++++-- CHANGES | 4 +++- png.h | 13 ++++++++----- pngget.c | 2 ++ scripts/pnglibconf.dfa | 6 ++++++ scripts/pnglibconf.h.prebuilt | 5 ++++- 6 files changed, 27 insertions(+), 9 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 1ec21689d..7d36b20c1 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.15beta04 - February 7, 2013 +Libpng 1.5.15beta04 - February 10, 2013 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. @@ -45,7 +45,9 @@ Version 1.5.15beta03 [February 7, 2013] Remove SUN OS cc -E workround - no longer required Turn serial tests back on (recently turned off by autotools upgrade). -Version 1.5.15beta04 [February 7, 2013] +Version 1.5.15beta04 [February 10, 2013] + Enclosed the new png_get_palette_max in #ifdef PNG_GET_PALETTE_MAX_SUPPORTED + block, and revised pnglibconf.h and pnglibconf.h.prebuilt accordingly. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index b9bba2988..7c19195f4 100644 --- a/CHANGES +++ b/CHANGES @@ -4002,7 +4002,9 @@ Version 1.5.15beta03 [February 7, 2013] Remove SUN OS cc -E workround - no longer required Turn serial tests back on (recently turned off by autotools upgrade). -Version 1.5.15beta04 [February 7, 2013] +Version 1.5.15beta04 [February 10, 2013] + Enclosed the new png_get_palette_max in #ifdef PNG_GET_PALETTE_MAX_SUPPORTED + block, and revised pnglibconf.h and pnglibconf.h.prebuilt accordingly. =========================================================================== NOTICE November 17, 2012: diff --git a/png.h b/png.h index 9465835a6..6e19ea887 100644 --- a/png.h +++ b/png.h @@ -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 diff --git a/pngget.c b/pngget.c index fb318dd4a..1a23e80d8 100644 --- a/pngget.c +++ b/pngget.c @@ -1128,6 +1128,7 @@ png_get_io_chunk_name (png_structp png_ptr) #endif /* ?PNG_IO_STATE_SUPPORTED */ #ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED +#ifdef PNG_GET_PALETTE_MAX_SUPPORTED int PNGAPI png_get_palette_max(png_const_structp png_ptr, png_const_infop info_ptr) { @@ -1137,5 +1138,6 @@ png_get_palette_max(png_const_structp png_ptr, png_const_infop info_ptr) return (-1); } #endif +#endif #endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */ diff --git a/scripts/pnglibconf.dfa b/scripts/pnglibconf.dfa index 794c203ba..f97eb740c 100644 --- a/scripts/pnglibconf.dfa +++ b/scripts/pnglibconf.dfa @@ -588,3 +588,9 @@ option CHECK_FOR_INVALID_INDEX enables WRITE_CHECK_FOR_INVALID_INDEX option READ_CHECK_FOR_INVALID_INDEX requires READ CHECK_FOR_INVALID_INDEX option WRITE_CHECK_FOR_INVALID_INDEX requires WRITE CHECK_FOR_INVALID_INDEX +# added at libpng-1.5.15 +option GET_PALETTE_MAX enables READ_GET_PALETTE_MAX +option GET_PALETTE_MAX enables WRITE_GET_PALETTE_MAX +option READ_GET_PALETTE_MAX requires CHECK_FOR_INVALID_INDEX +option WRITE_GET_PALETTE_MAX requires CHECK_FOR_INVALID_INDEX + diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt index eac2f4e32..a73b905a2 100644 --- a/scripts/pnglibconf.h.prebuilt +++ b/scripts/pnglibconf.h.prebuilt @@ -3,7 +3,7 @@ /* pnglibconf.h - library build configuration */ -/* Libpng 1.5.15beta04 - February 7, 2013 */ +/* Libpng 1.5.15beta04 - February 10, 2013 */ /* Copyright (c) 1998-2012 Glenn Randers-Pehrson */ @@ -49,6 +49,7 @@ #define PNG_FIXED_POINT_SUPPORTED 1 #define PNG_FLOATING_ARITHMETIC_SUPPORTED 1 #define PNG_FLOATING_POINT_SUPPORTED 1 +#define PNG_GET_PALETTE_MAX_SUPPORTED 1 #define PNG_HANDLE_AS_UNKNOWN_SUPPORTED 1 #define PNG_INCH_CONVERSIONS_SUPPORTED 1 #define PNG_INFO_IMAGE_SUPPORTED 1 @@ -68,6 +69,7 @@ #define PNG_READ_EXPAND_SUPPORTED 1 #define PNG_READ_FILLER_SUPPORTED 1 #define PNG_READ_GAMMA_SUPPORTED 1 +#define PNG_READ_GET_PALETTE_MAX_SUPPORTED 1 #define PNG_READ_GRAY_TO_RGB_SUPPORTED 1 #define PNG_READ_INTERLACING_SUPPORTED 1 #define PNG_READ_INT_FUNCTIONS_SUPPORTED 1 @@ -133,6 +135,7 @@ #define PNG_WRITE_FILLER_SUPPORTED 1 #define PNG_WRITE_FILTER_SUPPORTED 1 #define PNG_WRITE_FLUSH_SUPPORTED 1 +#define PNG_WRITE_GET_PALETTE_MAX_SUPPORTED 1 #define PNG_WRITE_INTERLACING_SUPPORTED 1 #define PNG_WRITE_INT_FUNCTIONS_SUPPORTED 1 #define PNG_WRITE_INVERT_ALPHA_SUPPORTED 1