From ce1244690375ee5d2b411a5c4f353ac20afa9a04 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 13 Jul 2015 07:04:17 -0500 Subject: [PATCH] [libpng15] Restored unused FILTER_HEURISTIC macros removed at libpng-1.5.23beta02 to png.h to avoid compatibility warnings. --- CHANGES | 2 ++ png.h | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/CHANGES b/CHANGES index c9a8d8b92..30d84d0c4 100644 --- a/CHANGES +++ b/CHANGES @@ -4362,6 +4362,8 @@ Version 1.5.23beta02 [June 30, 2015] Version 1.5.23rc01 [July 9, 2015] Belatedly added Mans Rullgard to the list of Contributing Authors. + Restored unused FILTER_HEURISTIC macros removed at libpng-1.5.23beta02 + 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 cd544aa5d..02e822b07 100644 --- a/png.h +++ b/png.h @@ -1679,6 +1679,12 @@ PNG_FIXED_EXPORT(209, void, png_set_filter_heuristics_fixed, filter_weights, png_const_fixed_point_p filter_costs)) #endif /* PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */ +/* 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 */ + #ifdef PNG_WRITE_SUPPORTED /* Set the library compression level. Currently, valid values range from * 0 - 9, corresponding directly to the zlib compression levels 0 - 9