From a138188d5742c0469de983878a430bdbe7e50e77 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 19 Apr 2024 21:41:16 +1000 Subject: [PATCH] std/png: ignore tRNS chunks for color types 4, 6 This backports commit da0d51d802379cd44edf60040301d71ecd723623 from the main branch (working on an unstable v0.4) to the v0.3 branch. Updates #146 --- doc/changelog.md | 5 +++++ release/c/wuffs-unsupported-snapshot.c | 26 ++++++++++++++------------ std/png/decode_png.wuffs | 13 +++++++++++-- 3 files changed, 30 insertions(+), 14 deletions(-) diff --git a/doc/changelog.md b/doc/changelog.md index 1b51f939..e624f567 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -1,6 +1,11 @@ # Changelog +## 2024-04-19 version 0.3.4 + +- Have `std/png` ignore tRNS chunks for color types 4 (YA) and 6 (RGBA). + + ## 2023-04-08 version 0.3.3 The `wuffs_base__parse_number_f64` function has been further optimized. diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 41edefa0..8c4a0a0f 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -41568,20 +41568,22 @@ wuffs_png__decoder__decode_other_chunk( self->private_impl.f_seen_srgb = true; } } else if (self->private_impl.f_chunk_type == 1397641844) { - if (self->private_impl.f_seen_trns || (self->private_impl.f_color_type > 3) || ((self->private_impl.f_color_type == 3) && ! self->private_impl.f_seen_plte)) { + if (self->private_impl.f_seen_trns || ((self->private_impl.f_color_type == 3) && ! self->private_impl.f_seen_plte)) { status = wuffs_base__make_status(wuffs_png__error__bad_chunk); goto exit; - } - if (a_src) { - a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr)); - } - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9); - status = wuffs_png__decoder__decode_trns(self, a_src); - if (a_src) { - iop_a_src = a_src->data.ptr + a_src->meta.ri; - } - if (status.repr) { - goto suspend; + } else if (self->private_impl.f_color_type > 3) { + } else { + if (a_src) { + a_src->meta.ri = ((size_t)(iop_a_src - a_src->data.ptr)); + } + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9); + status = wuffs_png__decoder__decode_trns(self, a_src); + if (a_src) { + iop_a_src = a_src->data.ptr + a_src->meta.ri; + } + if (status.repr) { + goto suspend; + } } self->private_impl.f_seen_trns = true; } diff --git a/std/png/decode_png.wuffs b/std/png/decode_png.wuffs index 33dd2279..35487faf 100644 --- a/std/png/decode_png.wuffs +++ b/std/png/decode_png.wuffs @@ -615,11 +615,20 @@ pri func decoder.decode_other_chunk?(src: base.io_reader, framy: base.bool) { } } else if this.chunk_type == 'tRNS'le { - if this.seen_trns or (this.color_type > 3) or + if this.seen_trns or ((this.color_type == 3) and (not this.seen_plte)) { return "#bad chunk" + } else if this.color_type > 3 { + // No-op, ignoring the chunk. The PNG spec section "11.3.2.1 + // tRNS Transparency" says that "A tRNS chunk shall not appear + // for colour types 4 and 6, since a full alpha channel is + // already present in those cases." However, some real-world + // PNG images (incorrectly) have these. libpng treats this as a + // "benign error", not a fatal one. See + // https://github.com/google/wuffs/issues/146 + } else { + this.decode_trns?(src: args.src) } - this.decode_trns?(src: args.src) this.seen_trns = true } }