diff --git a/ANNOUNCE b/ANNOUNCE index 991538b35..544d6c99a 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.6.0rc07 - February 9, 2013 +Libpng 1.6.0rc07 - 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. @@ -617,7 +617,9 @@ Version 1.6.0rc06 [February 9, 2013] build pngprefix.h and pnglibconf.h, often the error goes unnoticed because there is a system pnglibconf.h to use instead. -Version 1.6.0rc07 [February 9, 2013] +Version 1.6.0rc07 [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 d519782ff..11c5408ef 100644 --- a/CHANGES +++ b/CHANGES @@ -4371,7 +4371,9 @@ Version 1.6.0rc06 [February 9, 2013] build pngprefix.h and pnglibconf.h, often the error goes unnoticed because there is a system pnglibconf.h to use instead. -Version 1.6.0rc07 [February 9, 2013] +Version 1.6.0rc07 [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/png.h b/png.h index ddf061789..3d6991d93 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.0rc07 - February 9, 2013 + * libpng version 1.6.0rc07 - 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.6.0rc07 - February 9, 2013: Glenn + * libpng versions 0.97, January 1998, through 1.6.0rc07 - February 10, 2013: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -199,7 +199,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.0rc07, February 9, 2013, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.0rc07, 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: @@ -311,7 +311,7 @@ * Y2K compliance in libpng: * ========================= * - * February 9, 2013 + * February 10, 2013 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -379,7 +379,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.6.0rc07" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.0rc07 - February 9, 2013\n" + " libpng version 1.6.0rc07 - February 10, 2013\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -3203,12 +3203,15 @@ PNG_EXPORT(240, int, png_image_write_to_stdio, (png_imagep image, FILE *file, defined(PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED) PNG_EXPORT(242, void, png_set_check_for_invalid_index, (png_structrp png_ptr, int allowed)); +#if defined(PNG_READ_GET_PALETTE_MAX_SUPPORTED) || \ + defined(PNG_READ_GET_PALETTE_MAX_SUPPORTED) PNG_EXPORT(243, 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 + * defs, scripts/pnglibconf.h, and scripts/pnglibconf.h.prebuilt */ /* The last ordinal number (this is the *last* one already used; the next diff --git a/pngget.c b/pngget.c index 76ed30006..b93ed43ea 100644 --- a/pngget.c +++ b/pngget.c @@ -1162,6 +1162,7 @@ png_get_io_chunk_type (png_const_structrp 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) { @@ -1171,5 +1172,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 af11ef9a3..1422ae370 100644 --- a/scripts/pnglibconf.dfa +++ b/scripts/pnglibconf.dfa @@ -777,6 +777,12 @@ 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 + # Simplified API options (added at libpng-1.6.0) # Read: option SIMPLIFIED_READ requires SEQUENTIAL_READ READ_TRANSFORMS SETJMP diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt index 3eb4ab74f..6d4c1e7f7 100644 --- a/scripts/pnglibconf.h.prebuilt +++ b/scripts/pnglibconf.h.prebuilt @@ -3,7 +3,7 @@ /* pnglibconf.h - library build configuration */ -/* Libpng 1.6.0rc07 - February 9, 2013 */ +/* Libpng 1.6.0rc07 - February 10, 2013 */ /* Copyright (c) 1998-2013 Glenn Randers-Pehrson */ @@ -65,6 +65,7 @@ #define PNG_FORMAT_BGR_SUPPORTED #define PNG_gAMA_SUPPORTED #define PNG_GAMMA_SUPPORTED +#define PNG_GET_PALETTE_MAX_SUPPORTED #define PNG_HANDLE_AS_UNKNOWN_SUPPORTED #define PNG_hIST_SUPPORTED #define PNG_iCCP_SUPPORTED @@ -93,6 +94,7 @@ #define PNG_READ_FILLER_SUPPORTED #define PNG_READ_gAMA_SUPPORTED #define PNG_READ_GAMMA_SUPPORTED +#define PNG_READ_GET_PALETTE_MAX_SUPPORTED #define PNG_READ_GRAY_TO_RGB_SUPPORTED #define PNG_READ_hIST_SUPPORTED #define PNG_READ_iCCP_SUPPORTED @@ -174,6 +176,7 @@ #define PNG_WRITE_FILTER_SUPPORTED #define PNG_WRITE_FLUSH_SUPPORTED #define PNG_WRITE_gAMA_SUPPORTED +#define PNG_WRITE_GET_PALETTE_MAX_SUPPORTED #define PNG_WRITE_hIST_SUPPORTED #define PNG_WRITE_iCCP_SUPPORTED #define PNG_WRITE_INTERLACING_SUPPORTED