[libpng17] Delay calling png_init_filter_functions() until a row with nonzero

filter is found.
This commit is contained in:
Glenn Randers-Pehrson 2013-08-20 21:28:19 -05:00
parent 83f1287c02
commit 157e0649e0
3 changed files with 13 additions and 5 deletions

View File

@ -1,5 +1,5 @@
Libpng 1.7.0beta17 - July 15, 2013 Libpng 1.7.0beta17 - August 21, 2013
This is not intended to be a public release. It will be replaced This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version. within a few weeks by a public version or by another test version.
@ -22,6 +22,7 @@ Other information:
1.7.0beta17-README.txt 1.7.0beta17-README.txt
1.7.0beta17-LICENSE.txt 1.7.0beta17-LICENSE.txt
Gnupg/*.asc (PGP armored detached signatures)
Changes since the last public release (1.6.0): Changes since the last public release (1.6.0):
@ -343,10 +344,12 @@ Version 1.7.0beta16 [July 5, 2013]
Ported ARM no-read patch from libpng16. Ported ARM no-read patch from libpng16.
Ported pngfix.c patches from libpng16. Ported pngfix.c patches from libpng16.
Version 1.7.0beta17 [July 15, 2013] Version 1.7.0beta17 [August 21, 2013]
Revised manual about changes in iTXt chunk handling made in libpng-1.6.0. Revised manual about changes in iTXt chunk handling made in libpng-1.6.0.
Added "/* SAFE */" comments in pngrutil.c and pngrtran.c where warnings Added "/* SAFE */" comments in pngrutil.c and pngrtran.c where warnings
may be erroneously issued by code-checking applications. may be erroneously issued by code-checking applications.
Delay calling png_init_filter_functions() until a row with nonzero filter
is found.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

View File

@ -4633,10 +4633,12 @@ Version 1.7.0beta16 [July 5, 2013]
Ported ARM no-read patch from libpng16. Ported ARM no-read patch from libpng16.
Ported pngfix.c patches from libpng16. Ported pngfix.c patches from libpng16.
Version 1.7.0beta17 [July 15, 2013] Version 1.7.0beta17 [August 21, 2013]
Revised manual about changes in iTXt chunk handling made in libpng-1.6.0. Revised manual about changes in iTXt chunk handling made in libpng-1.6.0.
Added "/* SAFE */" comments in pngrutil.c and pngrtran.c where warnings Added "/* SAFE */" comments in pngrutil.c and pngrtran.c where warnings
may be erroneously issued by code-checking applications. may be erroneously issued by code-checking applications.
Delay calling png_init_filter_functions() until a row with nonzero filter
is found.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

View File

@ -3882,10 +3882,13 @@ png_read_filter_row(png_structrp pp, png_row_infop row_info, png_bytep row,
* PNG_FILTER_OPTIMIZATIONS to a function that overrides the generic * PNG_FILTER_OPTIMIZATIONS to a function that overrides the generic
* implementations. See png_init_filter_functions above. * implementations. See png_init_filter_functions above.
*/ */
if (pp->read_filter[0] == NULL)
png_init_filter_functions(pp);
if (filter > PNG_FILTER_VALUE_NONE && filter < PNG_FILTER_VALUE_LAST) if (filter > PNG_FILTER_VALUE_NONE && filter < PNG_FILTER_VALUE_LAST)
{
if (pp->read_filter[0] == NULL)
png_init_filter_functions(pp);
pp->read_filter[filter-1](row_info, row, prev_row); pp->read_filter[filter-1](row_info, row, prev_row);
}
} }
#ifdef PNG_SEQUENTIAL_READ_SUPPORTED #ifdef PNG_SEQUENTIAL_READ_SUPPORTED