From 3ab6ef0aa14d81e6203b057976396dc8bad36036 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Thu, 29 Apr 2010 10:34:18 -0500 Subject: [PATCH] [master] Corrected PNG_UNKNOWN_CHUNKS_SUPPORTED in gregbook/readpng2.c to PNG_HANDLE_AS_UNKNOWN_SUPPORTED --- ANNOUNCE | 2 ++ CHANGES | 2 ++ contrib/gregbook/readpng2.c | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index b955efde3..b9458b2c5 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -54,6 +54,8 @@ version 1.4.2rc04 [April 28, 2010] version 1.4.2rc05 [April 29, 2010] Include png_reset_zstream() in png.c only when PNG_READ_SUPPORTED is defined. Removed dummy_inflate.c and uncompr.c from contrib/pngminim/encoder + Corrected PNG_UNKNOWN_CHUNKS_SUPPORTED to PNG_HANDLE_AS_UNKNOWN_SUPPORTED + in gregbook/readpng2.c Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index ba7f4cf35..77bad2806 100644 --- a/CHANGES +++ b/CHANGES @@ -2565,6 +2565,8 @@ version 1.4.2rc04 [April 28, 2010] version 1.4.2rc05 [April 29, 2010] Include png_reset_zstream() in png.c only when PNG_READ_SUPPORTED is defined. Removed dummy_inflate.c and uncompr.c from contrib/pngminim/encoder + Corrected PNG_UNKNOWN_CHUNKS_SUPPORTED to PNG_HANDLE_AS_UNKNOWN_SUPPORTED + in gregbook/readpng2.c Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/contrib/gregbook/readpng2.c b/contrib/gregbook/readpng2.c index eb53030a6..d974f0cf0 100644 --- a/contrib/gregbook/readpng2.c +++ b/contrib/gregbook/readpng2.c @@ -129,7 +129,7 @@ int readpng2_init(mainprog_info *mainprog_ptr) } -#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED +#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED /* prepare the reader to ignore all recognized chunks whose data won't be * used, i.e., all chunks recognized by libpng except for IHDR, PLTE, IDAT, * IEND, tRNS, bKGD, gAMA, and sRGB (small performance improvement) */ @@ -158,7 +158,7 @@ int readpng2_init(mainprog_info *mainprog_ptr) png_set_keep_unknown_chunks(png_ptr, 1 /* PNG_HANDLE_CHUNK_NEVER */, chunks_to_ignore, sizeof(chunks_to_ignore)/5); } -#endif /* PNG_UNKNOWN_CHUNKS_SUPPORTED */ +#endif /* PNG_HANDLE_AS_UNKNOWN_SUPPORTED */ /* instead of doing png_init_io() here, now we set up our callback