From 81487c8b540d916a16d8cc34baa0c2b1baffde13 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Wed, 10 Jun 2015 07:06:42 -0500 Subject: [PATCH] [libpng16] Removed some unused WEIGHTED_FILTER macros from png.h and pngstruct.h --- ANNOUNCE | 1 + CHANGES | 1 + png.h | 18 +++++------------- pngstruct.h | 12 +----------- 4 files changed, 8 insertions(+), 24 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 4c0a8bf5b..c64a2bdae 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -93,6 +93,7 @@ Version 1.6.18beta08 [June 10, 2015] unsigned char in contrib/tools/png-fix-itxt.c). To use the "secure" file handling, define PNG_USE_MKSTEMP, otherwise "tmpfile()" will be used. + Removed some unused WEIGHTED_FILTER macros from png.h and pngstruct.h Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 80c8b31cb..7fb47d033 100644 --- a/CHANGES +++ b/CHANGES @@ -5278,6 +5278,7 @@ Version 1.6.18beta08 [June 10, 2015] unsigned char in contrib/tools/png-fix-itxt.c). To use the "secure" file handling, define PNG_USE_MKSTEMP, otherwise "tmpfile()" will be used. + Removed some unused WEIGHTED_FILTER macros from png.h and pngstruct.h Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/png.h b/png.h index ee3324e95..149a763a7 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.18beta08, June 6, 2015 + * libpng version 1.6.18beta08, June 10, 2015 * * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -12,7 +12,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.18beta08, June 6, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.6.18beta08, June 10, 2015: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -248,7 +248,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.18beta08, June 6, 2015, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.18beta08, June 10, 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: @@ -360,7 +360,7 @@ * Y2K compliance in libpng: * ========================= * - * June 6, 2015 + * June 10, 2015 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -430,7 +430,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.6.18beta08" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.18beta08 - June 6, 2015\n" + " libpng version 1.6.18beta08 - June 10, 2015\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -1634,14 +1634,6 @@ PNG_FIXED_EXPORT(209, void, png_set_filter_heuristics_fixed, png_const_fixed_point_p filter_costs)) #endif /* WRITE_WEIGHTED_FILTER */ -/* Heuristic used for row filter selection. These defines should NOT be - * changed. - */ -#define PNG_FILTER_HEURISTIC_DEFAULT 0 /* Currently "UNWEIGHTED" */ -#define PNG_FILTER_HEURISTIC_UNWEIGHTED 1 /* Used by libpng < 0.95 */ -#define PNG_FILTER_HEURISTIC_WEIGHTED 2 /* Experimental feature */ -#define PNG_FILTER_HEURISTIC_LAST 3 /* Not a valid value */ - /* Set the library compression level. Currently, valid values range from * 0 - 9, corresponding directly to the zlib compression levels 0 - 9 * (0 - no compression, 9 - "maximal" compression). Note that tests have diff --git a/pngstruct.h b/pngstruct.h index a3d674c4f..a51123afb 100644 --- a/pngstruct.h +++ b/pngstruct.h @@ -348,17 +348,7 @@ struct png_struct_def png_bytep quantize_index; /* index translation for palette files */ #endif -#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED - png_byte heuristic_method; /* heuristic for row filter selection */ - png_byte num_prev_filters; /* number of weights for previous rows */ - png_bytep prev_filters; /* filter type(s) of previous row(s) */ - png_uint_16p filter_weights; /* weight(s) for previous line(s) */ - png_uint_16p inv_filter_weights; /* 1/weight(s) for previous line(s) */ - png_uint_16p filter_costs; /* relative filter calculation cost */ - png_uint_16p inv_filter_costs; /* 1/relative filter calculation cost */ -#endif - - /* Options */ +/* Options */ #ifdef PNG_SET_OPTION_SUPPORTED png_byte options; /* On/off state (up to 4 options) */ #endif