From 724b136bf871efdd7f403e85ae0d3a1cbf602454 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 8 Sep 2018 11:11:36 +1000 Subject: [PATCH] Remove the obsolete set_palette method --- cmd/wuffs-c/internal/cgen/base/image-public.h | 34 ++++---------- cmd/wuffs-c/internal/cgen/data.go | 9 ++-- lang/builtin/builtin.go | 3 +- release/c/wuffs-unsupported-snapshot.h | 45 +++++++------------ std/gif/decode_gif.wuffs | 4 +- 5 files changed, 30 insertions(+), 65 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/base/image-public.h b/cmd/wuffs-c/internal/cgen/base/image-public.h index 172b0547..80a55829 100644 --- a/cmd/wuffs-c/internal/cgen/base/image-public.h +++ b/cmd/wuffs-c/internal/cgen/base/image-public.h @@ -799,9 +799,8 @@ typedef struct { #ifdef __cplusplus inline wuffs_base__status set_from_slice(wuffs_base__pixel_config* pixcfg, wuffs_base__slice_u8 pixbuf_memory); - inline wuffs_base__table_u8 plane(uint32_t p); inline wuffs_base__slice_u8 palette(); - inline void set_palette(wuffs_base__slice_u8 palette); + inline wuffs_base__table_u8 plane(uint32_t p); #endif // __cplusplus } wuffs_base__pixel_buffer; @@ -853,13 +852,6 @@ wuffs_base__pixel_buffer__set_from_slice(wuffs_base__pixel_buffer* b, return NULL; } -static inline wuffs_base__table_u8 // -wuffs_base__pixel_buffer__plane(wuffs_base__pixel_buffer* b, uint32_t p) { - return (b && (p < WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX)) - ? b->private_impl.planes[p] - : ((wuffs_base__table_u8){}); -} - // wuffs_base__pixel_buffer__palette returns the palette color data. If // non-empty, it will have length 1024. static inline wuffs_base__slice_u8 // @@ -878,14 +870,11 @@ wuffs_base__pixel_buffer__palette(wuffs_base__pixel_buffer* b) { return ((wuffs_base__slice_u8){}); } -// The palette argument is ignored unless its length is exactly 1024. -static inline void // -wuffs_base__pixel_buffer__set_palette(wuffs_base__pixel_buffer* b, - wuffs_base__slice_u8 palette) { - wuffs_base__slice_u8 dst = wuffs_base__pixel_buffer__palette(b); - if ((dst.len == 1024) && (palette.len == 1024)) { - memmove(dst.ptr, palette.ptr, 1024); - } +static inline wuffs_base__table_u8 // +wuffs_base__pixel_buffer__plane(wuffs_base__pixel_buffer* b, uint32_t p) { + return (b && (p < WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX)) + ? b->private_impl.planes[p] + : ((wuffs_base__table_u8){}); } #ifdef __cplusplus @@ -896,19 +885,14 @@ wuffs_base__pixel_buffer::set_from_slice(wuffs_base__pixel_config* pixcfg, return wuffs_base__pixel_buffer__set_from_slice(this, pixcfg, pixbuf_memory); } -inline wuffs_base__table_u8 // -wuffs_base__pixel_buffer::plane(uint32_t p) { - return wuffs_base__pixel_buffer__plane(this, p); -} - inline wuffs_base__slice_u8 // wuffs_base__pixel_buffer::palette() { return wuffs_base__pixel_buffer__palette(this); } -inline void // -wuffs_base__pixel_buffer::set_palette(wuffs_base__slice_u8 palette) { - wuffs_base__pixel_buffer__set_palette(this, palette); +inline wuffs_base__table_u8 // +wuffs_base__pixel_buffer::plane(uint32_t p) { + return wuffs_base__pixel_buffer__plane(this, p); } #endif // __cplusplus diff --git a/cmd/wuffs-c/internal/cgen/data.go b/cmd/wuffs-c/internal/cgen/data.go index bba3de9a..e4b64509 100644 --- a/cmd/wuffs-c/internal/cgen/data.go +++ b/cmd/wuffs-c/internal/cgen/data.go @@ -155,11 +155,10 @@ const baseImagePublicH = "" + "posal disposal) {\n wuffs_base__frame_config__update(this, bounds, duration, index, io_position,\n blend, disposal);\n}\n\ninline wuffs_base__rect_ie_u32 //\nwuffs_base__frame_config::bounds() {\n return wuffs_base__frame_config__bounds(this);\n}\n\ninline uint32_t //\nwuffs_base__frame_config::width() {\n return wuffs_base__frame_config__width(this);\n}\n\ninline uint32_t //\nwuffs_base__frame_config::height() {\n return wuffs_base__frame_config__height(this);\n}\n\ninline wuffs_base__flicks //\nwuffs_base__frame_config::duration() {\n return wuffs_base__frame_config__duration(this);\n}\n\ninline uint64_t //\nwuffs_base__frame_config::index() {\n return wuffs_base__frame_config__index(this);\n}\n\ninline uint64_t //\nwuffs_base__frame_config::io_position() {\n return wuffs_base__frame_config__io_position(this);\n}\n\ninline wuffs_base__animation_blend //\nwuffs_base__frame_config::blend() {\n return wuffs_base__frame_config__blend(this);\n}\n\ninline wuffs_base__animation_disposal //\nwuffs_base__fr" + "ame_config::disposal() {\n return wuffs_base__frame_config__disposal(this);\n}\n\n#endif // __cplusplus\n\n" + "" + - "// --------\n\ntypedef struct {\n wuffs_base__pixel_config pixcfg;\n\n // Do not access the private_impl's fields directly. There is no API/ABI\n // compatibility or safety guarantee if you do so.\n struct {\n wuffs_base__table_u8 planes[WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX];\n // TODO: color spaces.\n } private_impl;\n\n#ifdef __cplusplus\n inline wuffs_base__status set_from_slice(wuffs_base__pixel_config* pixcfg,\n wuffs_base__slice_u8 pixbuf_memory);\n inline wuffs_base__table_u8 plane(uint32_t p);\n inline wuffs_base__slice_u8 palette();\n inline void set_palette(wuffs_base__slice_u8 palette);\n#endif // __cplusplus\n\n} wuffs_base__pixel_buffer;\n\nstatic inline wuffs_base__status //\nwuffs_base__pixel_buffer__set_from_slice(wuffs_base__pixel_buffer* b,\n wuffs_base__pixel_config* pixcfg,\n wuffs_base__slice_u8 pixbuf_memory) {\n if (!b) {\n return wuffs_base__error__bad_receiver;\n }\n " + - " *b = ((wuffs_base__pixel_buffer){});\n if (!pixcfg) {\n return wuffs_base__error__bad_argument;\n }\n\n uint8_t* ptr = pixbuf_memory.ptr;\n size_t len = pixbuf_memory.len;\n if (wuffs_base__pixel_format__is_indexed(pixcfg->private_impl.pixfmt)) {\n // Split a 1024 byte chunk (256 palette entries × 4 bytes per entry) from\n // the start of pixbuf_memory. We split from the start, not the end, so\n // that the remaining ptr has the same alignment as the original ptr, up to\n // an alignment of 1024.\n if (len < 1024) {\n return wuffs_base__error__bad_argument_length_too_short;\n }\n wuffs_base__table_u8* tab =\n &b->private_impl.planes[WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE];\n tab->ptr = ptr;\n tab->width = 1024;\n tab->height = 1;\n tab->stride = 1024;\n ptr += 1024;\n len -= 1024;\n }\n\n // TODO: don't assume 1 byte per pixel. Don't assume packed.\n uint64_t wh = ((uint64_t)pixcfg->private_impl.width) *\n ((uint64_t)pixcfg->private_impl.height);\n i" + - "f (wh > len) {\n return wuffs_base__error__bad_argument_length_too_short;\n }\n b->pixcfg = *pixcfg;\n wuffs_base__table_u8* tab = &b->private_impl.planes[0];\n tab->ptr = ptr;\n tab->width = pixcfg->private_impl.width;\n tab->height = pixcfg->private_impl.height;\n tab->stride = pixcfg->private_impl.width;\n return NULL;\n}\n\nstatic inline wuffs_base__table_u8 //\nwuffs_base__pixel_buffer__plane(wuffs_base__pixel_buffer* b, uint32_t p) {\n return (b && (p < WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX))\n ? b->private_impl.planes[p]\n : ((wuffs_base__table_u8){});\n}\n\n// wuffs_base__pixel_buffer__palette returns the palette color data. If\n// non-empty, it will have length 1024.\nstatic inline wuffs_base__slice_u8 //\nwuffs_base__pixel_buffer__palette(wuffs_base__pixel_buffer* b) {\n if (b &&\n wuffs_base__pixel_format__is_indexed(b->pixcfg.private_impl.pixfmt)) {\n wuffs_base__table_u8* tab =\n &b->private_impl.planes[WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE];\n if ((tab->" + - "width == 1024) && (tab->height == 1)) {\n return ((wuffs_base__slice_u8){\n .ptr = tab->ptr,\n .len = 1024,\n });\n }\n }\n return ((wuffs_base__slice_u8){});\n}\n\n// The palette argument is ignored unless its length is exactly 1024.\nstatic inline void //\nwuffs_base__pixel_buffer__set_palette(wuffs_base__pixel_buffer* b,\n wuffs_base__slice_u8 palette) {\n wuffs_base__slice_u8 dst = wuffs_base__pixel_buffer__palette(b);\n if ((dst.len == 1024) && (palette.len == 1024)) {\n memmove(dst.ptr, palette.ptr, 1024);\n }\n}\n\n#ifdef __cplusplus\n\ninline wuffs_base__status //\nwuffs_base__pixel_buffer::set_from_slice(wuffs_base__pixel_config* pixcfg,\n wuffs_base__slice_u8 pixbuf_memory) {\n return wuffs_base__pixel_buffer__set_from_slice(this, pixcfg, pixbuf_memory);\n}\n\ninline wuffs_base__table_u8 //\nwuffs_base__pixel_buffer::plane(uint32_t p) {\n return wuffs_base__pixel_buffer__plane(this, p);\n}\n\ninline wuffs_base__s" + - "lice_u8 //\nwuffs_base__pixel_buffer::palette() {\n return wuffs_base__pixel_buffer__palette(this);\n}\n\ninline void //\nwuffs_base__pixel_buffer::set_palette(wuffs_base__slice_u8 palette) {\n wuffs_base__pixel_buffer__set_palette(this, palette);\n}\n\n#endif // __cplusplus\n\n" + + "// --------\n\ntypedef struct {\n wuffs_base__pixel_config pixcfg;\n\n // Do not access the private_impl's fields directly. There is no API/ABI\n // compatibility or safety guarantee if you do so.\n struct {\n wuffs_base__table_u8 planes[WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX];\n // TODO: color spaces.\n } private_impl;\n\n#ifdef __cplusplus\n inline wuffs_base__status set_from_slice(wuffs_base__pixel_config* pixcfg,\n wuffs_base__slice_u8 pixbuf_memory);\n inline wuffs_base__slice_u8 palette();\n inline wuffs_base__table_u8 plane(uint32_t p);\n#endif // __cplusplus\n\n} wuffs_base__pixel_buffer;\n\nstatic inline wuffs_base__status //\nwuffs_base__pixel_buffer__set_from_slice(wuffs_base__pixel_buffer* b,\n wuffs_base__pixel_config* pixcfg,\n wuffs_base__slice_u8 pixbuf_memory) {\n if (!b) {\n return wuffs_base__error__bad_receiver;\n }\n *b = ((wuffs_base__pixel_buffer){});\n if (!pixcfg) {\n " + + " return wuffs_base__error__bad_argument;\n }\n\n uint8_t* ptr = pixbuf_memory.ptr;\n size_t len = pixbuf_memory.len;\n if (wuffs_base__pixel_format__is_indexed(pixcfg->private_impl.pixfmt)) {\n // Split a 1024 byte chunk (256 palette entries × 4 bytes per entry) from\n // the start of pixbuf_memory. We split from the start, not the end, so\n // that the remaining ptr has the same alignment as the original ptr, up to\n // an alignment of 1024.\n if (len < 1024) {\n return wuffs_base__error__bad_argument_length_too_short;\n }\n wuffs_base__table_u8* tab =\n &b->private_impl.planes[WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE];\n tab->ptr = ptr;\n tab->width = 1024;\n tab->height = 1;\n tab->stride = 1024;\n ptr += 1024;\n len -= 1024;\n }\n\n // TODO: don't assume 1 byte per pixel. Don't assume packed.\n uint64_t wh = ((uint64_t)pixcfg->private_impl.width) *\n ((uint64_t)pixcfg->private_impl.height);\n if (wh > len) {\n return wuffs_base__error__bad_argument" + + "_length_too_short;\n }\n b->pixcfg = *pixcfg;\n wuffs_base__table_u8* tab = &b->private_impl.planes[0];\n tab->ptr = ptr;\n tab->width = pixcfg->private_impl.width;\n tab->height = pixcfg->private_impl.height;\n tab->stride = pixcfg->private_impl.width;\n return NULL;\n}\n\n// wuffs_base__pixel_buffer__palette returns the palette color data. If\n// non-empty, it will have length 1024.\nstatic inline wuffs_base__slice_u8 //\nwuffs_base__pixel_buffer__palette(wuffs_base__pixel_buffer* b) {\n if (b &&\n wuffs_base__pixel_format__is_indexed(b->pixcfg.private_impl.pixfmt)) {\n wuffs_base__table_u8* tab =\n &b->private_impl.planes[WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE];\n if ((tab->width == 1024) && (tab->height == 1)) {\n return ((wuffs_base__slice_u8){\n .ptr = tab->ptr,\n .len = 1024,\n });\n }\n }\n return ((wuffs_base__slice_u8){});\n}\n\nstatic inline wuffs_base__table_u8 //\nwuffs_base__pixel_buffer__plane(wuffs_base__pixel_buffer* b, uint32_t p) {\n return (b && (p <" + + " WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX))\n ? b->private_impl.planes[p]\n : ((wuffs_base__table_u8){});\n}\n\n#ifdef __cplusplus\n\ninline wuffs_base__status //\nwuffs_base__pixel_buffer::set_from_slice(wuffs_base__pixel_config* pixcfg,\n wuffs_base__slice_u8 pixbuf_memory) {\n return wuffs_base__pixel_buffer__set_from_slice(this, pixcfg, pixbuf_memory);\n}\n\ninline wuffs_base__slice_u8 //\nwuffs_base__pixel_buffer::palette() {\n return wuffs_base__pixel_buffer__palette(this);\n}\n\ninline wuffs_base__table_u8 //\nwuffs_base__pixel_buffer::plane(uint32_t p) {\n return wuffs_base__pixel_buffer__plane(this, p);\n}\n\n#endif // __cplusplus\n\n" + "" + "// --------\n\ntypedef struct {\n // Do not access the private_impl's fields directly. There is no API/ABI\n // compatibility or safety guarantee if you do so.\n struct {\n uint8_t TODO;\n } private_impl;\n\n#ifdef __cplusplus\n#endif // __cplusplus\n\n} wuffs_base__decode_frame_options;\n\n#ifdef __cplusplus\n\n#endif // __cplusplus\n\n#ifdef __cplusplus\n} // extern \"C\"\n#endif\n" + "" diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index 32be0c67..e10ffa01 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -251,9 +251,8 @@ var Funcs = []string{ // ---- pixel_buffer + "pixel_buffer.palette() slice u8", "pixel_buffer.plane(p u32[..3]) table u8", - - "pixel_buffer.set_palette!(palette slice u8)", } // The "T1" and "T2" types here are placeholders for generic "slice T" or diff --git a/release/c/wuffs-unsupported-snapshot.h b/release/c/wuffs-unsupported-snapshot.h index aa2adf16..f8faadc4 100644 --- a/release/c/wuffs-unsupported-snapshot.h +++ b/release/c/wuffs-unsupported-snapshot.h @@ -1927,9 +1927,8 @@ typedef struct { #ifdef __cplusplus inline wuffs_base__status set_from_slice(wuffs_base__pixel_config* pixcfg, wuffs_base__slice_u8 pixbuf_memory); - inline wuffs_base__table_u8 plane(uint32_t p); inline wuffs_base__slice_u8 palette(); - inline void set_palette(wuffs_base__slice_u8 palette); + inline wuffs_base__table_u8 plane(uint32_t p); #endif // __cplusplus } wuffs_base__pixel_buffer; @@ -1981,13 +1980,6 @@ wuffs_base__pixel_buffer__set_from_slice(wuffs_base__pixel_buffer* b, return NULL; } -static inline wuffs_base__table_u8 // -wuffs_base__pixel_buffer__plane(wuffs_base__pixel_buffer* b, uint32_t p) { - return (b && (p < WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX)) - ? b->private_impl.planes[p] - : ((wuffs_base__table_u8){}); -} - // wuffs_base__pixel_buffer__palette returns the palette color data. If // non-empty, it will have length 1024. static inline wuffs_base__slice_u8 // @@ -2006,14 +1998,11 @@ wuffs_base__pixel_buffer__palette(wuffs_base__pixel_buffer* b) { return ((wuffs_base__slice_u8){}); } -// The palette argument is ignored unless its length is exactly 1024. -static inline void // -wuffs_base__pixel_buffer__set_palette(wuffs_base__pixel_buffer* b, - wuffs_base__slice_u8 palette) { - wuffs_base__slice_u8 dst = wuffs_base__pixel_buffer__palette(b); - if ((dst.len == 1024) && (palette.len == 1024)) { - memmove(dst.ptr, palette.ptr, 1024); - } +static inline wuffs_base__table_u8 // +wuffs_base__pixel_buffer__plane(wuffs_base__pixel_buffer* b, uint32_t p) { + return (b && (p < WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX)) + ? b->private_impl.planes[p] + : ((wuffs_base__table_u8){}); } #ifdef __cplusplus @@ -2024,19 +2013,14 @@ wuffs_base__pixel_buffer::set_from_slice(wuffs_base__pixel_config* pixcfg, return wuffs_base__pixel_buffer__set_from_slice(this, pixcfg, pixbuf_memory); } -inline wuffs_base__table_u8 // -wuffs_base__pixel_buffer::plane(uint32_t p) { - return wuffs_base__pixel_buffer__plane(this, p); -} - inline wuffs_base__slice_u8 // wuffs_base__pixel_buffer::palette() { return wuffs_base__pixel_buffer__palette(this); } -inline void // -wuffs_base__pixel_buffer::set_palette(wuffs_base__slice_u8 palette) { - wuffs_base__pixel_buffer__set_palette(this, palette); +inline wuffs_base__table_u8 // +wuffs_base__pixel_buffer::plane(uint32_t p) { + return wuffs_base__pixel_buffer__plane(this, p); } #endif // __cplusplus @@ -8149,11 +8133,12 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, (4 * ((uint32_t)(self->private_impl.f_gc_transparent_index))) + 3)] = 0; } - wuffs_base__pixel_buffer__set_palette( - a_dst, ((wuffs_base__slice_u8){ - .ptr = self->private_impl - .f_palettes[self->private_impl.f_which_palette], - .len = 1024})); + wuffs_base__slice_u8__copy_from_slice( + wuffs_base__pixel_buffer__palette(a_dst), + ((wuffs_base__slice_u8){ + .ptr = self->private_impl + .f_palettes[self->private_impl.f_which_palette], + .len = 1024})); if (self->private_impl.f_previous_lzw_decode_ended_abruptly) { (memset(&self->private_impl.f_lzw, 0, sizeof((wuffs_lzw__decoder){})), wuffs_base__ignore_check_wuffs_version_status( diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index 98b3a5a3..331f6ada 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -560,9 +560,7 @@ pri func decoder.decode_id_part1!??(dst ptr base.pixel_buffer, src base.io_reade this.palettes[1][(4 * (this.gc_transparent_index as base.u32)) + 3] = 0x00 } - // TODO: remove the set_palette method. Instead, call palette and - // copy_from_slice. - args.dst.set_palette!(palette:this.palettes[this.which_palette][:]) + args.dst.palette().copy_from_slice(s:this.palettes[this.which_palette][:]) // Other GIF implementations accept GIF files that aren't completely spec // compliant. For example, the test/data/gifplayer-muybridge.gif file