From aa39d25ca4d8ceaa3ebb5c2787dd8e300ca36bb0 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 7 Oct 2023 11:16:00 +1100 Subject: [PATCH] base: fix wuffs_base__base_16__encode4 prototype Also fix wuffs_base__pixel_buffer__set_color_u32_fill_rect copy/paste. This was discovered by "gcc -Wredundant-decls". Updates #132 --- internal/cgen/base/image-public.h | 6 ------ internal/cgen/base/strconv-public.h | 2 +- release/c/wuffs-unsupported-snapshot.c | 8 +------- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/internal/cgen/base/image-public.h b/internal/cgen/base/image-public.h index ce16e1f0..912475f1 100644 --- a/internal/cgen/base/image-public.h +++ b/internal/cgen/base/image-public.h @@ -1453,12 +1453,6 @@ wuffs_base__pixel_buffer::color_u32_at(uint32_t x, uint32_t y) const { return wuffs_base__pixel_buffer__color_u32_at(this, x, y); } -WUFFS_BASE__MAYBE_STATIC wuffs_base__status // -wuffs_base__pixel_buffer__set_color_u32_fill_rect( - wuffs_base__pixel_buffer* pb, - wuffs_base__rect_ie_u32 rect, - wuffs_base__color_u32_argb_premul color); - inline wuffs_base__status // wuffs_base__pixel_buffer::set_color_u32_at( uint32_t x, diff --git a/internal/cgen/base/strconv-public.h b/internal/cgen/base/strconv-public.h index 1f5efb18..f559b171 100644 --- a/internal/cgen/base/strconv-public.h +++ b/internal/cgen/base/strconv-public.h @@ -407,7 +407,7 @@ wuffs_base__base_16__encode2(wuffs_base__slice_u8 dst, // function requires the WUFFS_CONFIG__MODULE__BASE__INTCONV sub-module, not // just WUFFS_CONFIG__MODULE__BASE__CORE. WUFFS_BASE__MAYBE_STATIC wuffs_base__transform__output // -wuffs_base__base_16__encode2(wuffs_base__slice_u8 dst, +wuffs_base__base_16__encode4(wuffs_base__slice_u8 dst, wuffs_base__slice_u8 src, bool src_closed, uint32_t options); diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index dcbe66f4..82687358 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -5221,12 +5221,6 @@ wuffs_base__pixel_buffer::color_u32_at(uint32_t x, uint32_t y) const { return wuffs_base__pixel_buffer__color_u32_at(this, x, y); } -WUFFS_BASE__MAYBE_STATIC wuffs_base__status // -wuffs_base__pixel_buffer__set_color_u32_fill_rect( - wuffs_base__pixel_buffer* pb, - wuffs_base__rect_ie_u32 rect, - wuffs_base__color_u32_argb_premul color); - inline wuffs_base__status // wuffs_base__pixel_buffer::set_color_u32_at( uint32_t x, @@ -5770,7 +5764,7 @@ wuffs_base__base_16__encode2(wuffs_base__slice_u8 dst, // function requires the WUFFS_CONFIG__MODULE__BASE__INTCONV sub-module, not // just WUFFS_CONFIG__MODULE__BASE__CORE. WUFFS_BASE__MAYBE_STATIC wuffs_base__transform__output // -wuffs_base__base_16__encode2(wuffs_base__slice_u8 dst, +wuffs_base__base_16__encode4(wuffs_base__slice_u8 dst, wuffs_base__slice_u8 src, bool src_closed, uint32_t options);