From ae0de1d35aa344e5b059a1f912d807d436025eda Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 25 May 2018 17:07:16 +1000 Subject: [PATCH] Factor out a std/gif copy_to_image_buffer func --- gen/c/std/gif.c | 33 +++++++++++++++++++++------------ std/gif/decode_gif.wuffs | 24 ++++++++++++++---------- 2 files changed, 35 insertions(+), 22 deletions(-) diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 330aabf2..89e7e3c2 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -2004,6 +2004,10 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id_part1( wuffs_base__io_writer a_dst, wuffs_base__io_reader a_src); +static void wuffs_gif__decoder__copy_to_image_buffer( + wuffs_gif__decoder* self, + wuffs_base__image_buffer* a_ib); + static void wuffs_gif__lzw_decoder__set_literal_width( wuffs_gif__lzw_decoder* self, uint32_t a_lw); @@ -3286,8 +3290,6 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id_part1( bool v_write_to_ib_instead_of_w; wuffs_base__slice_u8 v_pass_through; uint64_t v_n_copied; - wuffs_base__table_u8 v_tab; - wuffs_base__slice_u8 v_pixel_data; wuffs_base__slice_u8 v_palette; uint8_t* ioptr_dst = NULL; @@ -3341,16 +3343,12 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id_part1( self->private_impl.c_decode_id_part1[0].v_write_to_ib_instead_of_w; v_pass_through = ((wuffs_base__slice_u8){}); v_n_copied = self->private_impl.c_decode_id_part1[0].v_n_copied; - v_tab = ((wuffs_base__table_u8){}); - v_pixel_data = ((wuffs_base__slice_u8){}); v_palette = ((wuffs_base__slice_u8){}); } else { v_use_local_palette = false; v_w = ((wuffs_base__io_writer){}); v_write_to_ib_instead_of_w = false; v_pass_through = ((wuffs_base__slice_u8){}); - v_tab = ((wuffs_base__table_u8){}); - v_pixel_data = ((wuffs_base__slice_u8){}); v_palette = ((wuffs_base__slice_u8){}); } switch (coro_susp_point) { @@ -3503,12 +3501,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id_part1( } label_2_break:; } else { - v_tab = wuffs_base__image_buffer__plane(a_ib, 0); - if (((uint64_t)(v_tab.width)) == ((uint64_t)(v_tab.stride))) { - v_pixel_data = wuffs_base__table_u8__linearize(v_tab); - if (((uint64_t)(v_pixel_data.len)) == 0) { - } - } + wuffs_gif__decoder__copy_to_image_buffer(self, a_ib); } if (v_z == WUFFS_GIF__SUSPENSION_SHORT_WRITE) { goto label_1_continue; @@ -3585,6 +3578,22 @@ short_read_src: goto suspend; } +// -------- func decoder.copy_to_image_buffer + +static void wuffs_gif__decoder__copy_to_image_buffer( + wuffs_gif__decoder* self, + wuffs_base__image_buffer* a_ib) { + wuffs_base__table_u8 v_tab; + wuffs_base__slice_u8 v_pixel_data; + + v_tab = wuffs_base__image_buffer__plane(a_ib, 0); + if (((uint64_t)(v_tab.width)) == ((uint64_t)(v_tab.stride))) { + v_pixel_data = wuffs_base__table_u8__linearize(v_tab); + if (((uint64_t)(v_pixel_data.len)) == 0) { + } + } +} + // -------- func lzw_decoder.set_literal_width static void wuffs_gif__lzw_decoder__set_literal_width( diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index 4a0c636f..8d420c6b 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -433,16 +433,7 @@ pri func decoder.decode_id_part1?(ib ptr base.image_buffer, dst base.io_writer, } } else { - // TODO: don't assume a packed pixel format. - var tab table base.u8 = in.ib.plane(p:0) - if tab.width() == tab.stride() { - var pixel_data slice base.u8 = tab.linearize() - if pixel_data.length() == 0 { - // TODO. - } - } else { - // TODO. - } + this.copy_to_image_buffer(ib:in.ib) } if z == suspension "short write" { @@ -481,3 +472,16 @@ pri func decoder.decode_id_part1?(ib ptr base.image_buffer, dst base.io_writer, this.gc_disposal = 0 this.gc_duration = 0 } + +pri func decoder.copy_to_image_buffer(ib ptr base.image_buffer)() { + // TODO: don't assume a packed pixel format. + var tab table base.u8 = in.ib.plane(p:0) + if tab.width() == tab.stride() { + var pixel_data slice base.u8 = tab.linearize() + if pixel_data.length() == 0 { + // TODO. + } + } else { + // TODO. + } +}