From a4fa1c57f4f22f6ac8c6c2bf6f3d29b1bdc32f71 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 4 Oct 2014 12:38:47 -0500 Subject: [PATCH] [libpng16] Added "chunk iTXt enables TEXT" and "chunk zTXt enables TEXT" to pnglibconf.dfa. --- ANNOUNCE | 2 ++ CHANGES | 2 ++ pngpread.c | 2 +- scripts/pnglibconf.dfa | 5 ++--- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 2bde55637..5cfeff338 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -59,6 +59,8 @@ Version 1.6.14beta06 [October 4, 2014] Conditionally compile some code in png_deflate_claim(), when PNG_WARNINGS_SUPPORTED and PNG_ERROR_TEXT_SUPPORTED are disabled. Replaced repeated code in pngpread.c with PNG_PUSH_SAVE_BUFFER_IF_FULL. + Added "chunk iTXt enables TEXT" and "chunk zTXt enables TEXT" + to pnglibconf.dfa. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index f60b31532..26df049a1 100644 --- a/CHANGES +++ b/CHANGES @@ -5012,6 +5012,8 @@ Version 1.6.14beta06 [October 4, 2014] Conditionally compile some code in png_deflate_claim(), when PNG_WARNINGS_SUPPORTED and PNG_ERROR_TEXT_SUPPORTED are disabled. Replaced repeated code in pngpread.c with PNG_PUSH_SAVE_BUFFER_IF_FULL. + Added "chunk iTXt enables TEXT" and "chunk zTXt enables TEXT" + to pnglibconf.dfa. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/pngpread.c b/pngpread.c index a8cc18d71..b1926a9cd 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * Last changed in libpng 1.6.11 [June 5, 2014] + * Last changed in libpng 1.6.14 [(PENDING RELEASE)] * Copyright (c) 1998-2014 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) diff --git a/scripts/pnglibconf.dfa b/scripts/pnglibconf.dfa index 152eeaab2..28a646678 100644 --- a/scripts/pnglibconf.dfa +++ b/scripts/pnglibconf.dfa @@ -732,7 +732,7 @@ chunk cHRM enables COLORSPACE chunk gAMA enables GAMMA chunk hIST chunk iCCP enables COLORSPACE, GAMMA -chunk iTXt +chunk iTXt enables TEXT chunk oFFs chunk pCAL chunk pHYs @@ -743,7 +743,7 @@ chunk sRGB enables COLORSPACE, GAMMA, SET_OPTION chunk tEXt requires TEXT chunk tIME chunk tRNS -chunk zTXt +chunk zTXt enables TEXT # This only affects support of the optional PLTE chunk in RGB and RGBA # images. Notice that READ_ANCILLARY_CHUNKS therefore disables part @@ -830,7 +830,6 @@ option READ_COMPRESSED_TEXT disabled option READ_iCCP enables READ_COMPRESSED_TEXT option READ_iTXt enables READ_COMPRESSED_TEXT option READ_zTXt enables READ_COMPRESSED_TEXT -option READ_COMPRESSED_TEXT enables READ_TEXT option WRITE_oFFs enables SAVE_INT_32 option WRITE_pCAL enables SAVE_INT_32