From 9c76207dbb86e04fd2f5eef088be72ba4a454a36 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Fri, 18 Dec 2015 09:17:41 -0800 Subject: [PATCH] Disable 'methodical' filter selection code It is incomplete; it works but does not do anything useful except, maybe, on really enormous images. Signed-off-by: John Bowler --- scripts/pnglibconf.dfa | 3 ++- scripts/pnglibconf.h.prebuilt | 7 +++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/pnglibconf.dfa b/scripts/pnglibconf.dfa index 0a014070c..bc7fcd092 100644 --- a/scripts/pnglibconf.dfa +++ b/scripts/pnglibconf.dfa @@ -942,7 +942,8 @@ option CONVERT_tIME requires WRITE_ANCILLARY_CHUNKS # See png.h for more description of these options. option WRITE_FILTER requires WRITE option SELECT_FILTER_HEURISTICALLY requires WRITE_FILTER enables SET_OPTION -option SELECT_FILTER_METHODICALLY requires WRITE_FILTER enables SET_OPTION +option SELECT_FILTER_METHODICALLY requires WRITE_FILTER enables SET_OPTION, + disabled # added at libpng-1.5.4 diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt index 794f0a96b..9afb7bd90 100644 --- a/scripts/pnglibconf.h.prebuilt +++ b/scripts/pnglibconf.h.prebuilt @@ -1,8 +1,7 @@ /* libpng 1.7.0beta74 STANDARD API DEFINITION */ - /* pnglibconf.h - library build configuration */ -/* Libpng version 1.7.0beta74, December 11, 2015 */ +/* libpng version 1.7.0beta74, December 14, 2015 */ /* Copyright (c) 1998-2015 Glenn Randers-Pehrson */ @@ -100,6 +99,8 @@ #define PNG_READ_tRNS_SUPPORTED #define PNG_READ_zTXt_SUPPORTED #define PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED +#define PNG_SELECT_FILTER_HEURISTICALLY_SUPPORTED +/*#undef PNG_SELECT_FILTER_METHODICALLY_SUPPORTED*/ #define PNG_SEQUENTIAL_READ_SUPPORTED #define PNG_SETJMP_SUPPORTED #define PNG_SETTING_SUPPORTED @@ -135,13 +136,11 @@ #define PNG_WRITE_FILTER_SUPPORTED #define PNG_WRITE_FLUSH_SUPPORTED #define PNG_WRITE_GET_PALETTE_MAX_SUPPORTED -#define PNG_SELECT_FILTER_HEURISTICALLY_SUPPORTED #define PNG_WRITE_INTERLACING_SUPPORTED #define PNG_WRITE_INT_FUNCTIONS_SUPPORTED #define PNG_WRITE_INVERT_ALPHA_SUPPORTED #define PNG_WRITE_INVERT_SUPPORTED #define PNG_WRITE_OPTIMIZE_CMF_SUPPORTED -#define PNG_SELECT_FILTER_METHODICALLY_SUPPORTED #define PNG_WRITE_PACKSWAP_SUPPORTED #define PNG_WRITE_PACK_SUPPORTED #define PNG_WRITE_PNG_SUPPORTED