From b0076faf1f0b3dc17b3ffda83585c9f32f5ce1a1 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Mon, 23 Nov 2015 18:14:57 -0800 Subject: [PATCH] Backward compatibility with 1.6 1.6 did not define PNG_READ_PNG_SUPPORTED, ever; it doesn't matter there. Signed-off-by: John Bowler --- contrib/libtests/pngimage.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/libtests/pngimage.c b/contrib/libtests/pngimage.c index 4557658aa..b03b33f67 100644 --- a/contrib/libtests/pngimage.c +++ b/contrib/libtests/pngimage.c @@ -37,7 +37,7 @@ #endif #if defined(PNG_INFO_IMAGE_SUPPORTED) && defined(PNG_SEQUENTIAL_READ_SUPPORTED)\ - && defined(PNG_READ_PNG_SUPPORTED) + && (defined(PNG_READ_PNG_SUPPORTED) || PNG_LIBPNG_VER < 10700) /* If a transform is valid on both read and write this implies that if the * transform is applied to read it must also be applied on write to produce * meaningful data. This is because these transforms when performed on read @@ -948,7 +948,7 @@ update_display(struct display *dp) if ((transform_info[i].valid_chunks == 0 || (transform_info[i].valid_chunks & chunks) != 0) && - (transform_info[i].color_mask_required & ct) == + (transform_info[i].color_mask_required & ct) == transform_info[i].color_mask_required && (transform_info[i].color_mask_absent & ct) == 0 && (transform_info[i].bit_depths & bd) != 0 && @@ -1006,7 +1006,7 @@ compare_read(struct display *dp, int applied_transforms) { unsigned long chunks = png_get_valid(dp->read_pp, dp->read_ip, 0xffffffff); - + if (chunks != dp->chunks) display_log(dp, APP_FAIL, "PNG chunks changed from 0x%lx to 0x%lx", (unsigned long)dp->chunks, chunks);