From 2d032e966dd0536a6ad2aabdfaf07c875014911a Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Wed, 5 Feb 2014 15:19:13 -0600 Subject: [PATCH] [libpng17' Restored a line, "c = b;", that was inadvertently deleted from the PAETH filtering code from libpng-1.7.0beta24/pngrutil.c and reenabled the pngimage tests. --- ANNOUNCE | 2 ++ CHANGES | 2 ++ pngrutil.c | 1 + tests/pngimage-full | 4 +--- tests/pngimage-quick | 4 +--- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 53e0108fd..07b3f48d3 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -520,6 +520,8 @@ Version 1.7.0beta31 [February 5, 2014] the read code to return an invalid sBIT chunk, which might lead to application errors or crashes. Such chunks are now skipped (with chunk_benign_error). + Restored a line, "c = b;", that was inadvertently deleted from the + PAETH filtering code from libpng-1.7.0beta24/pngrutil.c. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index a88a93b90..2c16f9ce5 100644 --- a/CHANGES +++ b/CHANGES @@ -4809,6 +4809,8 @@ Version 1.7.0beta31 [February 5, 2014] the read code to return an invalid sBIT chunk, which might lead to application errors or crashes. Such chunks are now skipped (with chunk_benign_error). + Restored a line, "c = b;", that was inadvertently deleted from the + PAETH filtering code from libpng-1.7.0beta24/pngrutil.c. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/pngrutil.c b/pngrutil.c index 60ed29e0c..3140ec050 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -3807,6 +3807,7 @@ png_read_filter_row_paeth_1byte_pixel(png_row_infop row_info, png_bytep row, /* Calculate the current pixel in a, and move the previous row pixel to c * for the next time round the loop */ + c = b; a += *row; *row++ = (png_byte)a; } diff --git a/tests/pngimage-full b/tests/pngimage-full index 49cf7700e..f5eb9895e 100755 --- a/tests/pngimage-full +++ b/tests/pngimage-full @@ -1,4 +1,2 @@ #!/bin/sh -# does not work -# exec ./pngimage --exhaustive --log "${srcdir}/contrib/pngsuite/"*.png -exit 77 +exec ./pngimage --exhaustive --log "${srcdir}/contrib/pngsuite/"*.png diff --git a/tests/pngimage-quick b/tests/pngimage-quick index 94eb3f7f7..2d4b5db22 100755 --- a/tests/pngimage-quick +++ b/tests/pngimage-quick @@ -1,4 +1,2 @@ #!/bin/sh -# does not work -# exec ./pngimage --log "${srcdir}/contrib/pngsuite/"*.png -exit 77 +exec ./pngimage --log "${srcdir}/contrib/pngsuite/"*.png