From e0874e193431cfb87b957cf026e1fe5e264b3bae Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 13 Jul 2015 07:08:15 -0500 Subject: [PATCH] [libpng16] Restored unused WEIGHTED_FILTER macros removed at libpng-1.6.18beta08 to png.h to avoid compatibility warnings. --- CHANGES | 2 ++ png.h | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/CHANGES b/CHANGES index 8ae43505f..e5cc470e7 100644 --- a/CHANGES +++ b/CHANGES @@ -5294,6 +5294,8 @@ Version 1.6.18beta09 [July 5, 2015] Version 1.6.18rc01 [July 9, 2015] Belatedly added Mans Rullgard and James Yu to the list of Contributing Authors. + Restored unused WEIGHTED_FILTER macros removed at libpng-1.6.18beta08 + to png.h to avoid compatibility warnings. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/png.h b/png.h index bc28740ec..72072ba84 100644 --- a/png.h +++ b/png.h @@ -1632,6 +1632,12 @@ PNG_FIXED_EXPORT(209, void, png_set_filter_heuristics_fixed, png_const_fixed_point_p filter_costs)) #endif /* WRITE_WEIGHTED_FILTER */ +/* The following are no longer used and will be removed from libpng-1.7: */ +#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