mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'libpng17' of /home/jbowler/src/libpng/libpng into libpng17

Browse Source
This commit is contained in:
John Bowler
2015-09-16 21:42:04 -07:00
parent fea86b1c29 36ada4acae
commit 62dff2f97e
60 changed files with 548 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/libtests/pngvalid.c
View File

@@ -5408,7 +5408,7 @@ test_size(png_modifier* const pm, png_byte const colour_type,
# ifdef PNG_READ_DEINTERLACE_SUPPORTED
# ifdef PNG_WRITE_INTERLACING_SUPPORTED
/* Test both togeher: */
/* Test both together: */
standard_test(&pm->this, FILEID(colour_type, DEPTH(bdlo), 0/*palette*/,
PNG_INTERLACE_ADAM7, w, h, 0), 0/*do_interlace*/,
pm->use_update_info);
@@ -6604,8 +6604,8 @@ image_transform_png_set_tRNS_to_alpha_add(image_transform *this,
/* We don't know yet whether there will be a tRNS chunk, but we know that
* this transformation should do nothing if there already is an alpha
* channel. In addition, afte the bug fix in 1.7.0, there is no longer any
* action on a palette image.
* channel. In addition, after the bug fix in 1.7.0, there is no longer
* any action on a palette image.
*/
return
# if PNG_LIBPNG_VER >= 10700