diff --git a/cmd/wuffs-c/internal/cgen/base/image-impl.c b/cmd/wuffs-c/internal/cgen/base/image-impl.c index 7cdd91e6..aa72e66d 100644 --- a/cmd/wuffs-c/internal/cgen/base/image-impl.c +++ b/cmd/wuffs-c/internal/cgen/base/image-impl.c @@ -18,30 +18,70 @@ static uint64_t // wuffs_base__pixel_swizzler__copy_1_1(wuffs_base__slice_u8 dst, + wuffs_base__slice_u8 dst_palette, wuffs_base__slice_u8 src) { return wuffs_base__slice_u8__copy_from_slice(dst, src); } +static uint64_t // +wuffs_base__pixel_swizzler__swap_rgbx_bgrx(wuffs_base__slice_u8 dst, + wuffs_base__slice_u8 src) { + size_t length4 = (dst.len < src.len ? dst.len : src.len) / 4; + uint8_t* d = dst.ptr; + uint8_t* s = src.ptr; + size_t n = length4; + while (n--) { + uint8_t b0 = s[0]; + uint8_t b1 = s[1]; + uint8_t b2 = s[2]; + uint8_t b3 = s[3]; + d[0] = b2; + d[1] = b1; + d[2] = b0; + d[3] = b3; + s += 4; + d += 4; + } + return length4 * 4; +} + void // wuffs_base__pixel_swizzler__initialize(wuffs_base__pixel_swizzler* p, wuffs_base__pixel_format dst_format, - wuffs_base__pixel_format src_format) { + wuffs_base__slice_u8 dst_palette, + wuffs_base__pixel_format src_format, + wuffs_base__slice_u8 src_palette) { if (!p) { return; } // TODO: support many more formats. - uint64_t (*func)(wuffs_base__slice_u8 dst, wuffs_base__slice_u8 src) = NULL; + uint64_t (*func)(wuffs_base__slice_u8 dst, wuffs_base__slice_u8 dst_palette, + wuffs_base__slice_u8 src) = NULL; switch (src_format) { case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL: switch (dst_format) { case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL: + if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) != + 1024) { + break; + } func = wuffs_base__pixel_swizzler__copy_1_1; break; case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL: + if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) != + 1024) { + break; + } + // TODO: implement. + break; case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL: + if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(dst_palette, + src_palette) != 1024) { + break; + } // TODO: implement. break; default: @@ -59,9 +99,10 @@ wuffs_base__pixel_swizzler__initialize(wuffs_base__pixel_swizzler* p, uint64_t // wuffs_base__pixel_swizzler__swizzle_packed(wuffs_base__pixel_swizzler* p, wuffs_base__slice_u8 dst, + wuffs_base__slice_u8 dst_palette, wuffs_base__slice_u8 src) { if (p && p->private_impl.func) { - return (*(p->private_impl.func))(dst, src); + return (*(p->private_impl.func))(dst, dst_palette, src); } return 0; } diff --git a/cmd/wuffs-c/internal/cgen/base/image-public.h b/cmd/wuffs-c/internal/cgen/base/image-public.h index 0bdc1373..00bfbd37 100644 --- a/cmd/wuffs-c/internal/cgen/base/image-public.h +++ b/cmd/wuffs-c/internal/cgen/base/image-public.h @@ -922,13 +922,18 @@ typedef struct { // compatibility or safety guarantee if you do so. struct { // TODO: should the func type take restrict pointers? - uint64_t (*func)(wuffs_base__slice_u8 dst, wuffs_base__slice_u8 src); + uint64_t (*func)(wuffs_base__slice_u8 dst, + wuffs_base__slice_u8 dst_palette, + wuffs_base__slice_u8 src); } private_impl; #ifdef __cplusplus inline void initialize(wuffs_base__pixel_format dst_format, - wuffs_base__pixel_format src_format); + wuffs_base__slice_u8 dst_palette, + wuffs_base__pixel_format src_format, + wuffs_base__slice_u8 src_palette); inline uint64_t swizzle_packed(wuffs_base__slice_u8 dst, + wuffs_base__slice_u8 dst_palette, wuffs_base__slice_u8 src); #endif // __cplusplus @@ -939,25 +944,33 @@ typedef struct { void // wuffs_base__pixel_swizzler__initialize(wuffs_base__pixel_swizzler* p, wuffs_base__pixel_format dst_format, - wuffs_base__pixel_format src_format); + wuffs_base__slice_u8 dst_palette, + wuffs_base__pixel_format src_format, + wuffs_base__slice_u8 src_palette); uint64_t // wuffs_base__pixel_swizzler__swizzle_packed(wuffs_base__pixel_swizzler* p, wuffs_base__slice_u8 dst, + wuffs_base__slice_u8 dst_palette, wuffs_base__slice_u8 src); #ifdef __cplusplus inline void // wuffs_base__pixel_swizzler::initialize(wuffs_base__pixel_format dst_format, - wuffs_base__pixel_format src_format) { - wuffs_base__pixel_swizzler__initialize(this, dst_format, src_format); + wuffs_base__slice_u8 dst_palette, + wuffs_base__pixel_format src_format, + wuffs_base__slice_u8 src_palette) { + wuffs_base__pixel_swizzler__initialize(this, dst_format, dst_palette, + src_format, src_palette); } uint64_t // wuffs_base__pixel_swizzler::swizzle_packed(wuffs_base__slice_u8 dst, + wuffs_base__slice_u8 dst_palette, wuffs_base__slice_u8 src) { - wuffs_base__pixel_swizzler__swizzle_packed(this, dst, src); + return wuffs_base__pixel_swizzler__swizzle_packed(this, dst, dst_palette, + src); } #endif // __cplusplus diff --git a/cmd/wuffs-c/internal/cgen/data.go b/cmd/wuffs-c/internal/cgen/data.go index 2ce47a23..779ef4d0 100644 --- a/cmd/wuffs-c/internal/cgen/data.go +++ b/cmd/wuffs-c/internal/cgen/data.go @@ -24,8 +24,9 @@ const baseAllImplC = "" + "" const baseImageImplC = "" + - "// ---------------- Images\n\nstatic uint64_t //\nwuffs_base__pixel_swizzler__copy_1_1(wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 src) {\n return wuffs_base__slice_u8__copy_from_slice(dst, src);\n}\n\nvoid //\nwuffs_base__pixel_swizzler__initialize(wuffs_base__pixel_swizzler* p,\n wuffs_base__pixel_format dst_format,\n wuffs_base__pixel_format src_format) {\n if (!p) {\n return;\n }\n\n // TODO: support many more formats.\n\n uint64_t (*func)(wuffs_base__slice_u8 dst, wuffs_base__slice_u8 src) = NULL;\n\n switch (src_format) {\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL:\n switch (dst_format) {\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL:\n func = wuffs_base__pixel_swizzler__copy_1_1;\n break;\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:\n // TODO: implement.\n break;\n " + - " default:\n break;\n }\n break;\n\n default:\n break;\n }\n\n p->private_impl.func = func;\n}\n\nuint64_t //\nwuffs_base__pixel_swizzler__swizzle_packed(wuffs_base__pixel_swizzler* p,\n wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 src) {\n if (p && p->private_impl.func) {\n return (*(p->private_impl.func))(dst, src);\n }\n return 0;\n}\n" + + "// ---------------- Images\n\nstatic uint64_t //\nwuffs_base__pixel_swizzler__copy_1_1(wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src) {\n return wuffs_base__slice_u8__copy_from_slice(dst, src);\n}\n\nstatic uint64_t //\nwuffs_base__pixel_swizzler__swap_rgbx_bgrx(wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 src) {\n size_t length4 = (dst.len < src.len ? dst.len : src.len) / 4;\n uint8_t* d = dst.ptr;\n uint8_t* s = src.ptr;\n size_t n = length4;\n while (n--) {\n uint8_t b0 = s[0];\n uint8_t b1 = s[1];\n uint8_t b2 = s[2];\n uint8_t b3 = s[3];\n d[0] = b2;\n d[1] = b1;\n d[2] = b0;\n d[3] = b3;\n s += 4;\n d += 4;\n }\n return length4 * 4;\n}\n\nvoid //\nwuffs_base__pixel_swizzler__initialize(wuffs_base__pixel_swizzler* p,\n wuffs_base__pixel_format dst_format,\n wuffs_b" + + "ase__slice_u8 dst_palette,\n wuffs_base__pixel_format src_format,\n wuffs_base__slice_u8 src_palette) {\n if (!p) {\n return;\n }\n\n // TODO: support many more formats.\n\n uint64_t (*func)(wuffs_base__slice_u8 dst, wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src) = NULL;\n\n switch (src_format) {\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL:\n switch (dst_format) {\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL:\n if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=\n 1024) {\n break;\n }\n func = wuffs_base__pixel_swizzler__copy_1_1;\n break;\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:\n if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=\n 1024) {\n break;\n }\n // TODO: implement.\n break;\n case WUFFS_BASE__PI" + + "XEL_FORMAT__RGBA_NONPREMUL:\n if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(dst_palette,\n src_palette) != 1024) {\n break;\n }\n // TODO: implement.\n break;\n default:\n break;\n }\n break;\n\n default:\n break;\n }\n\n p->private_impl.func = func;\n}\n\nuint64_t //\nwuffs_base__pixel_swizzler__swizzle_packed(wuffs_base__pixel_swizzler* p,\n wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src) {\n if (p && p->private_impl.func) {\n return (*(p->private_impl.func))(dst, dst_palette, src);\n }\n return 0;\n}\n" + "" const baseCorePrivateH = "" + @@ -137,8 +138,9 @@ const baseImagePublicH = "" + "" + "// --------\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" + "" + - "// --------\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 // TODO: should the func type take restrict pointers?\n uint64_t (*func)(wuffs_base__slice_u8 dst, wuffs_base__slice_u8 src);\n } private_impl;\n\n#ifdef __cplusplus\n inline void initialize(wuffs_base__pixel_format dst_format,\n wuffs_base__pixel_format src_format);\n inline uint64_t swizzle_packed(wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 src);\n#endif // __cplusplus\n\n} wuffs_base__pixel_swizzler;\n\n// TODO: should initialize (both the C and C++ methods) return a status?\n\nvoid //\nwuffs_base__pixel_swizzler__initialize(wuffs_base__pixel_swizzler* p,\n wuffs_base__pixel_format dst_format,\n wuffs_base__pixel_format src_format);\n\nuint64_t //\nwuffs_base__pixel_swizzler__swizzle_packed(wuffs_base__pixel_swizz" + - "ler* p,\n wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 src);\n\n#ifdef __cplusplus\n\ninline void //\nwuffs_base__pixel_swizzler::initialize(wuffs_base__pixel_format dst_format,\n wuffs_base__pixel_format src_format) {\n wuffs_base__pixel_swizzler__initialize(this, dst_format, src_format);\n}\n\nuint64_t //\nwuffs_base__pixel_swizzler::swizzle_packed(wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 src) {\n wuffs_base__pixel_swizzler__swizzle_packed(this, dst, src);\n}\n\n#endif // __cplusplus\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 // TODO: should the func type take restrict pointers?\n uint64_t (*func)(wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src);\n } private_impl;\n\n#ifdef __cplusplus\n inline void initialize(wuffs_base__pixel_format dst_format,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__pixel_format src_format,\n wuffs_base__slice_u8 src_palette);\n inline uint64_t swizzle_packed(wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src);\n#endif // __cplusplus\n\n} wuffs_base__pixel_swizzler;\n\n// TODO: should initialize (both the C and C++ methods) return a status?\n\nvoid //\nwuffs_base__pixel_swizzler__initialize(wuf" + + "fs_base__pixel_swizzler* p,\n wuffs_base__pixel_format dst_format,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__pixel_format src_format,\n wuffs_base__slice_u8 src_palette);\n\nuint64_t //\nwuffs_base__pixel_swizzler__swizzle_packed(wuffs_base__pixel_swizzler* p,\n wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src);\n\n#ifdef __cplusplus\n\ninline void //\nwuffs_base__pixel_swizzler::initialize(wuffs_base__pixel_format dst_format,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__pixel_format src_format,\n wuffs_base__slice_u8 src_palette) {\n wuffs_base__pixel_swizzler__initialize(this, dst_forma" + + "t, dst_palette,\n src_format, src_palette);\n}\n\nuint64_t //\nwuffs_base__pixel_swizzler::swizzle_packed(wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src) {\n return wuffs_base__pixel_swizzler__swizzle_packed(this, dst, dst_palette,\n src);\n}\n\n#endif // __cplusplus\n" + "" const baseIOPrivateH = "" + diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index 05d709aa..8e80eca5 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -309,8 +309,8 @@ var Funcs = []string{ // ---- pixel_swizzler - "pixel_swizzler.initialize!(dst_pixfmt u32, src_pixfmt u32)", - "pixel_swizzler.swizzle_packed!(dst slice u8, src slice u8) u64", + "pixel_swizzler.initialize!(dst_pixfmt u32, dst_palette slice u8, src_pixfmt u32, src_palette slice u8)", + "pixel_swizzler.swizzle_packed!(dst slice u8, dst_palette slice u8, src slice u8) u64", } // 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 d1a2f578..317e2d71 100644 --- a/release/c/wuffs-unsupported-snapshot.h +++ b/release/c/wuffs-unsupported-snapshot.h @@ -2119,13 +2119,18 @@ typedef struct { // compatibility or safety guarantee if you do so. struct { // TODO: should the func type take restrict pointers? - uint64_t (*func)(wuffs_base__slice_u8 dst, wuffs_base__slice_u8 src); + uint64_t (*func)(wuffs_base__slice_u8 dst, + wuffs_base__slice_u8 dst_palette, + wuffs_base__slice_u8 src); } private_impl; #ifdef __cplusplus inline void initialize(wuffs_base__pixel_format dst_format, - wuffs_base__pixel_format src_format); + wuffs_base__slice_u8 dst_palette, + wuffs_base__pixel_format src_format, + wuffs_base__slice_u8 src_palette); inline uint64_t swizzle_packed(wuffs_base__slice_u8 dst, + wuffs_base__slice_u8 dst_palette, wuffs_base__slice_u8 src); #endif // __cplusplus @@ -2136,25 +2141,33 @@ typedef struct { void // wuffs_base__pixel_swizzler__initialize(wuffs_base__pixel_swizzler* p, wuffs_base__pixel_format dst_format, - wuffs_base__pixel_format src_format); + wuffs_base__slice_u8 dst_palette, + wuffs_base__pixel_format src_format, + wuffs_base__slice_u8 src_palette); uint64_t // wuffs_base__pixel_swizzler__swizzle_packed(wuffs_base__pixel_swizzler* p, wuffs_base__slice_u8 dst, + wuffs_base__slice_u8 dst_palette, wuffs_base__slice_u8 src); #ifdef __cplusplus inline void // wuffs_base__pixel_swizzler::initialize(wuffs_base__pixel_format dst_format, - wuffs_base__pixel_format src_format) { - wuffs_base__pixel_swizzler__initialize(this, dst_format, src_format); + wuffs_base__slice_u8 dst_palette, + wuffs_base__pixel_format src_format, + wuffs_base__slice_u8 src_palette) { + wuffs_base__pixel_swizzler__initialize(this, dst_format, dst_palette, + src_format, src_palette); } uint64_t // wuffs_base__pixel_swizzler::swizzle_packed(wuffs_base__slice_u8 dst, + wuffs_base__slice_u8 dst_palette, wuffs_base__slice_u8 src) { - wuffs_base__pixel_swizzler__swizzle_packed(this, dst, src); + return wuffs_base__pixel_swizzler__swizzle_packed(this, dst, dst_palette, + src); } #endif // __cplusplus @@ -2703,6 +2716,7 @@ struct wuffs_gif__decoder__struct { uint32_t f_uncompressed_wi; uint8_t f_uncompressed[4096]; uint8_t f_palettes[2][1024]; + uint8_t f_dst_palette[1024]; wuffs_base__pixel_swizzler f_swizzler; wuffs_base__utility f_util; wuffs_lzw__decoder f_lzw; @@ -3862,30 +3876,70 @@ const char* wuffs_base__error__disabled_by_previous_error = static uint64_t // wuffs_base__pixel_swizzler__copy_1_1(wuffs_base__slice_u8 dst, + wuffs_base__slice_u8 dst_palette, wuffs_base__slice_u8 src) { return wuffs_base__slice_u8__copy_from_slice(dst, src); } +static uint64_t // +wuffs_base__pixel_swizzler__swap_rgbx_bgrx(wuffs_base__slice_u8 dst, + wuffs_base__slice_u8 src) { + size_t length4 = (dst.len < src.len ? dst.len : src.len) / 4; + uint8_t* d = dst.ptr; + uint8_t* s = src.ptr; + size_t n = length4; + while (n--) { + uint8_t b0 = s[0]; + uint8_t b1 = s[1]; + uint8_t b2 = s[2]; + uint8_t b3 = s[3]; + d[0] = b2; + d[1] = b1; + d[2] = b0; + d[3] = b3; + s += 4; + d += 4; + } + return length4 * 4; +} + void // wuffs_base__pixel_swizzler__initialize(wuffs_base__pixel_swizzler* p, wuffs_base__pixel_format dst_format, - wuffs_base__pixel_format src_format) { + wuffs_base__slice_u8 dst_palette, + wuffs_base__pixel_format src_format, + wuffs_base__slice_u8 src_palette) { if (!p) { return; } // TODO: support many more formats. - uint64_t (*func)(wuffs_base__slice_u8 dst, wuffs_base__slice_u8 src) = NULL; + uint64_t (*func)(wuffs_base__slice_u8 dst, wuffs_base__slice_u8 dst_palette, + wuffs_base__slice_u8 src) = NULL; switch (src_format) { case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL: switch (dst_format) { case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL: + if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) != + 1024) { + break; + } func = wuffs_base__pixel_swizzler__copy_1_1; break; case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL: + if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) != + 1024) { + break; + } + // TODO: implement. + break; case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL: + if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(dst_palette, + src_palette) != 1024) { + break; + } // TODO: implement. break; default: @@ -3903,9 +3957,10 @@ wuffs_base__pixel_swizzler__initialize(wuffs_base__pixel_swizzler* p, uint64_t // wuffs_base__pixel_swizzler__swizzle_packed(wuffs_base__pixel_swizzler* p, wuffs_base__slice_u8 dst, + wuffs_base__slice_u8 dst_palette, wuffs_base__slice_u8 src) { if (p && p->private_impl.func) { - return (*(p->private_impl.func))(dst, src); + return (*(p->private_impl.func))(dst, dst_palette, src); } return 0; } @@ -9050,6 +9105,7 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, uint32_t v_num_palette_entries; uint32_t v_i; uint32_t v_argb; + wuffs_base__slice_u8 v_dst_palette; uint8_t v_lw; uint64_t v_block_size; wuffs_base__io_writer v_w; @@ -9086,11 +9142,13 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, self->private_impl.c_decode_id_part1[0].v_num_palette_entries; v_i = self->private_impl.c_decode_id_part1[0].v_i; v_argb = 0; + v_dst_palette = ((wuffs_base__slice_u8){}); v_lw = 0; v_block_size = self->private_impl.c_decode_id_part1[0].v_block_size; v_w = ((wuffs_base__io_writer){}); v_z = NULL; } else { + v_dst_palette = ((wuffs_base__slice_u8){}); v_w = ((wuffs_base__io_writer){}); } switch (coro_susp_point) { @@ -9190,16 +9248,22 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, (4 * ((uint32_t)(self->private_impl.f_gc_transparent_index))) + 3)] = 0; } - wuffs_base__slice_u8__copy_from_slice( - wuffs_base__pixel_buffer__palette(a_dst), + v_dst_palette = wuffs_base__pixel_buffer__palette(a_dst); + if (((uint64_t)(v_dst_palette.len)) == 0) { + v_dst_palette = ((wuffs_base__slice_u8){ + .ptr = self->private_impl.f_dst_palette, + .len = 1024, + }); + } + wuffs_base__pixel_swizzler__initialize( + &self->private_impl.f_swizzler, + wuffs_base__pixel_buffer__pixel_format(a_dst), v_dst_palette, + 1107558408, ((wuffs_base__slice_u8){ .ptr = self->private_impl .f_palettes[self->private_impl.f_which_palette], .len = 1024, })); - wuffs_base__pixel_swizzler__initialize( - &self->private_impl.f_swizzler, - wuffs_base__pixel_buffer__pixel_format(a_dst), 1107558408); 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( @@ -9399,7 +9463,12 @@ label_0_continue:; v_dst, ((uint64_t)(self->private_impl.f_dst_x))); } v_n64 = wuffs_base__pixel_swizzler__swizzle_packed( - &self->private_impl.f_swizzler, v_dst, v_src); + &self->private_impl.f_swizzler, v_dst, + ((wuffs_base__slice_u8){ + .ptr = self->private_impl.f_dst_palette, + .len = 1024, + }), + v_src); v_n = ((uint32_t)((v_n64 & 4294967295))); v_new_ri = wuffs_base__u32__sat_add(self->private_impl.f_uncompressed_ri, v_n); diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index 37b91dd6..49287ffe 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -113,6 +113,8 @@ pub struct decoder?( // palettes[0] and palettes[1] are the Global and Local Color Table. palettes array[2] array[4 * 256] base.u8, + // dst_palette is the swizzled color table. + dst_palette array[4 * 256] base.u8, swizzler base.pixel_swizzler, util base.utility, @@ -583,11 +585,18 @@ 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 } - args.dst.palette().copy_from_slice!(s:this.palettes[this.which_palette][:]) + var dst_palette slice base.u8 = args.dst.palette() + if dst_palette.length() == 0 { + dst_palette = this.dst_palette[:] + } // TODO: a Wuffs (not just C) name for the // WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL magic pixfmt constant. - this.swizzler.initialize!(dst_pixfmt:args.dst.pixel_format(), src_pixfmt:0x42040008) + this.swizzler.initialize!( + dst_pixfmt:args.dst.pixel_format(), + dst_palette:dst_palette, + src_pixfmt:0x42040008, + src_palette: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 @@ -701,7 +710,7 @@ pri func decoder.copy_to_image_buffer!?(pb ptr base.pixel_buffer) { } else { dst = dst[this.dst_x as base.u64:] } - var n64 base.u64 = this.swizzler.swizzle_packed!(dst:dst, src:src) + var n64 base.u64 = this.swizzler.swizzle_packed!(dst:dst, dst_palette:this.dst_palette[:], src:src) n = (n64 & 0xFFFFFFFF) as base.u32 new_ri = this.uncompressed_ri ~sat+ n