From 3c1df67681792d4c1075d3f37aae2f5a1d520946 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Tue, 7 May 2024 10:06:34 +1000 Subject: [PATCH] std/bmp: let decoded pixfmt be transparent Fixes #147 --- release/c/wuffs-unsupported-snapshot.c | 2 ++ std/bmp/decode_bmp.wuffs | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 1e4befba..241a2ae6 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -31116,6 +31116,8 @@ wuffs_bmp__decoder__do_decode_image_config( (self->private_impl.f_channel_num_bits[2u] > 8u) || (self->private_impl.f_channel_num_bits[3u] > 8u)) { v_dst_pixfmt = 2164308923u; + } else if (((self->private_impl.f_src_pixfmt == 2198077448u) || (self->private_impl.f_src_pixfmt == 2147485832u) || (self->private_impl.f_src_pixfmt == 2415954056u)) || ((self->private_impl.f_src_pixfmt == 2164308923u) && (self->private_impl.f_channel_masks[3u] == 0u))) { + v_dst_pixfmt = 2415954056u; } wuffs_base__image_config__set( a_dst, diff --git a/std/bmp/decode_bmp.wuffs b/std/bmp/decode_bmp.wuffs index 938b9d8e..695f3899 100644 --- a/std/bmp/decode_bmp.wuffs +++ b/std/bmp/decode_bmp.wuffs @@ -383,6 +383,11 @@ pri func decoder.do_decode_image_config?(dst: nptr base.image_config, src: base. (this.channel_num_bits[2] > 8) or (this.channel_num_bits[3] > 8) { dst_pixfmt = base.PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE + } else if ((this.src_pixfmt == base.PIXEL_FORMAT__INDEXED__BGRA_BINARY) or + (this.src_pixfmt == base.PIXEL_FORMAT__BGR) or + (this.src_pixfmt == base.PIXEL_FORMAT__BGRX)) or + ((this.src_pixfmt == base.PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE) and (this.channel_masks[3] == 0)) { + dst_pixfmt = base.PIXEL_FORMAT__BGRX } args.dst.set!(