sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reenable png interlace test

Browse Source 
reenable png interlace test after the fix in

https://github.com/jcupitt/libvips/pull/821
This commit is contained in:
John Cupitt 2017-12-05 08:38:52 +00:00
parent baab520c9c
commit 0ade2e972f
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libvips/foreign/vipspng.c
View File

@ -484,6 +484,11 @@ png2vips_interlace( Read *read, VipsImage *out )
for( y = 0; y < out->Ysize; y++ ) for( y = 0; y < out->Ysize; y++ )
read->row_pointer[y] = VIPS_IMAGE_ADDR( out, 0, y ); read->row_pointer[y] = VIPS_IMAGE_ADDR( out, 0, y );
/* Some libpng warn you to call png_set_interlace_handling(); here, but
* that can actually break interlace. We have to live with the warning,
* unfortunately.
*/
png_read_image( read->pPng, read->row_pointer ); png_read_image( read->pPng, read->row_pointer );
png_read_end( read->pPng, NULL ); png_read_end( read->pPng, NULL );

3
test/test_formats.sh
View File

@ -196,8 +196,7 @@ if test_supported tiffload; then
fi fi
if test_supported pngload; then if test_supported pngload; then
test_format $image png 0 test_format $image png 0
# sadly broken in libpng 1.6.28 and 29 test_format $image png 0 [compression=9,interlace=1]
# test_format $image png 0 [compression=9,interlace=1]
fi fi
if test_supported jpegload; then if test_supported jpegload; then
test_format $image jpg 90 test_format $image jpg 90