From d3ff44f0d50f9121a0b0e78c3a3c3dce3db9631f Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Tue, 17 Feb 2015 21:06:23 -0600 Subject: [PATCH] [libpng16] Added PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED macro, on by default. --- ANNOUNCE | 5 +++-- CHANGES | 3 ++- png.h | 14 ++++++++------ pngwrite.c | 2 ++ 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 8dba919ee..db352034f 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.17beta04 - February 17, 2015 +Libpng 1.6.17beta04 - February 18, 2015 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. @@ -51,7 +51,8 @@ Version 1.6.17beta03 [February 17, 2015] by the user at build time or run time. This provides a more robust defense against DOS and as-yet undiscovered overflows. -Version 1.6.17beta04 [February 17, 2015] +Version 1.6.17beta04 [February 18, 2015] + Added PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED macro, on by default. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index a80e933c3..663564517 100644 --- a/CHANGES +++ b/CHANGES @@ -5152,7 +5152,8 @@ Version 1.6.17beta03 [February 17, 2015] by the user at build time or run time. This provides a more robust defense against DOS and as-yet undiscovered overflows. -Version 1.6.17beta04 [February 17, 2015] +Version 1.6.17beta04 [February 18, 2015] + Added PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED macro, on by default. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/png.h b/png.h index ce9a5cdcf..2cd068c00 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.17beta04, February 17, 2015 + * libpng version 1.6.17beta04, February 18, 2015 * Copyright (c) 1998-2015 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.17beta04, February 17, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.6.17beta04, February 18, 2015: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -244,7 +244,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.17beta04, February 17, 2015, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.17beta04, February 18, 2015, are * Copyright (c) 2004, 2006-2015 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: @@ -356,7 +356,7 @@ * Y2K compliance in libpng: * ========================= * - * February 17, 2015 + * February 18, 2015 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -426,7 +426,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.6.17beta04" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.17beta04 - February 17, 2015\n" + " libpng version 1.6.17beta04 - February 18, 2015\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -1671,6 +1671,7 @@ PNG_FIXED_EXPORT(209, void, png_set_filter_heuristics_fixed, * for PNG images, and do considerably fewer caclulations. In the future, * these values may not correspond directly to the zlib compression levels. */ +#ifdef PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED PNG_EXPORT(69, void, png_set_compression_level, (png_structrp png_ptr, int level)); @@ -1688,7 +1689,7 @@ PNG_EXPORT(72, void, png_set_compression_window_bits, (png_structrp png_ptr, PNG_EXPORT(73, void, png_set_compression_method, (png_structrp png_ptr, int method)); -#endif +#endif /* WRITE_CUSTOMIZE_COMPRESSION */ #ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED /* Also set zlib parameters for compressing non-IDAT chunks */ @@ -1710,6 +1711,7 @@ PNG_EXPORT(225, void, png_set_text_compression_window_bits, PNG_EXPORT(226, void, png_set_text_compression_method, (png_structrp png_ptr, int method)); #endif /* WRITE_CUSTOMIZE_ZTXT_COMPRESSION */ +#endif /* WRITE */ /* These next functions are called for input/output, memory, and error * handling. They are in the file pngrio.c, pngwio.c, and pngerror.c, diff --git a/pngwrite.c b/pngwrite.c index 94548877b..1a21aa3ad 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1372,6 +1372,7 @@ png_set_filter_heuristics_fixed(png_structrp png_ptr, int heuristic_method, #endif /* FIXED_POINT */ #endif /* WRITE_WEIGHTED_FILTER */ +#ifdef PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED void PNGAPI png_set_compression_level(png_structrp png_ptr, int level) { @@ -1454,6 +1455,7 @@ png_set_compression_method(png_structrp png_ptr, int method) png_ptr->zlib_method = method; } +#endif /* WRITE_CUSTOMIZE_COMPRESSION */ /* The following were added to libpng-1.5.4 */ #ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED