From f1a9d34494172b753dbcbe5f21a8bd2973471a7b Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Wed, 27 Mar 2024 21:42:40 +1100 Subject: [PATCH] pixconv: fix -Werror=conversion --- internal/cgen/base/pixconv-submodule-regular.c | 7 +++---- release/c/wuffs-unsupported-snapshot.c | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/internal/cgen/base/pixconv-submodule-regular.c b/internal/cgen/base/pixconv-submodule-regular.c index e0f8fa79..bac14e02 100644 --- a/internal/cgen/base/pixconv-submodule-regular.c +++ b/internal/cgen/base/pixconv-submodule-regular.c @@ -4752,10 +4752,9 @@ wuffs_private_impl__swizzle_ya_nonpremul__ya_nonpremul__src_over( while (n >= 1) { uint32_t d0 = ((uint32_t)(d[1]) << 24) | ((uint32_t)(d[0]) * 0x010101); uint32_t s0 = ((uint32_t)(s[1]) << 24) | ((uint32_t)(s[0]) * 0x010101); - wuffs_base__poke_u16le__no_bounds_check( - d + (0 * 2), - wuffs_private_impl__composite_nonpremul_nonpremul_u32_axxx(d0, s0) >> - 16); + uint32_t c0 = + wuffs_private_impl__composite_nonpremul_nonpremul_u32_axxx(d0, s0); + wuffs_base__poke_u16le__no_bounds_check(d + (0 * 2), (uint16_t)(c0 >> 16)); s += 1 * 2; d += 1 * 2; diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index a764d846..689e0507 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -25717,10 +25717,9 @@ wuffs_private_impl__swizzle_ya_nonpremul__ya_nonpremul__src_over( while (n >= 1) { uint32_t d0 = ((uint32_t)(d[1]) << 24) | ((uint32_t)(d[0]) * 0x010101); uint32_t s0 = ((uint32_t)(s[1]) << 24) | ((uint32_t)(s[0]) * 0x010101); - wuffs_base__poke_u16le__no_bounds_check( - d + (0 * 2), - wuffs_private_impl__composite_nonpremul_nonpremul_u32_axxx(d0, s0) >> - 16); + uint32_t c0 = + wuffs_private_impl__composite_nonpremul_nonpremul_u32_axxx(d0, s0); + wuffs_base__poke_u16le__no_bounds_check(d + (0 * 2), (uint16_t)(c0 >> 16)); s += 1 * 2; d += 1 * 2;