From c75a0a40b438b790c2e230ed61d7d811e06977da Mon Sep 17 00:00:00 2001 From: John Bowler Date: Fri, 18 Dec 2015 09:30:55 -0800 Subject: [PATCH] Revert "Disable 'methodical' filter selection code" This reverts commit 9c76207dbb86e04fd2f5eef088be72ba4a454a36. Signed-off-by: John Bowler --- scripts/pnglibconf.dfa | 3 +-- scripts/pnglibconf.h.prebuilt | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/pnglibconf.dfa b/scripts/pnglibconf.dfa index bc7fcd092..0a014070c 100644 --- a/scripts/pnglibconf.dfa +++ b/scripts/pnglibconf.dfa @@ -942,8 +942,7 @@ 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, - disabled +option SELECT_FILTER_METHODICALLY requires WRITE_FILTER enables SET_OPTION # added at libpng-1.5.4 diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt index 8092718b8..741885deb 100644 --- a/scripts/pnglibconf.h.prebuilt +++ b/scripts/pnglibconf.h.prebuilt @@ -101,7 +101,7 @@ #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_SELECT_FILTER_METHODICALLY_SUPPORTED #define PNG_SEQUENTIAL_READ_SUPPORTED #define PNG_SETJMP_SUPPORTED #define PNG_SETTING_SUPPORTED