diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 050aca38..e2588746 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -3626,74 +3626,12 @@ static wuffs_gif__status wuffs_gif__decoder__copy_to_image_buffer( uint32_t v_n; uint32_t v_new_ri; wuffs_base__table_u8 v_tab; - uint64_t v_i; v_dst = ((wuffs_base__slice_u8){}); v_src = ((wuffs_base__slice_u8){}); v_n = 0; v_new_ri = 0; v_tab = wuffs_base__image_buffer__plane(a_ib, 0); - if (!self->private_impl.f_interlace && - (((uint64_t)(v_tab.width)) == ((uint64_t)(v_tab.stride))) && - (self->private_impl.f_dst_x0 == 0) && - (((uint64_t)(self->private_impl.f_dst_x1)) == - ((uint64_t)(v_tab.width))) && - (((uint64_t)(self->private_impl.f_dst_y1)) <= - ((uint64_t)(v_tab.height)))) { - if (self->private_impl.f_uncompressed_ri > - self->private_impl.f_uncompressed_wi) { - status = WUFFS_GIF__ERROR_INTERNAL_ERROR_INCONSISTENT_RI_WI; - goto exit; - } - v_src = wuffs_base__slice_u8__subslice_ij( - ((wuffs_base__slice_u8){.ptr = self->private_impl.f_uncompressed, - .len = 4096}), - self->private_impl.f_uncompressed_ri, - self->private_impl.f_uncompressed_wi); - if (self->private_impl.f_dst_y >= self->private_impl.f_dst_y1) { - status = WUFFS_GIF__ERROR_TOO_MUCH_PIXEL_DATA; - goto exit; - } - v_i = 0; - v_dst = wuffs_base__table_u8__linearize(v_tab); - v_i = (((uint64_t)(self->private_impl.f_dst_y1)) * - ((uint64_t)(self->private_impl.f_dst_x1))); - if (v_i < ((uint64_t)(v_dst.len))) { - v_dst = wuffs_base__slice_u8__subslice_j(v_dst, v_i); - } - v_i = ((((uint64_t)(self->private_impl.f_dst_y)) * - ((uint64_t)(self->private_impl.f_dst_x1))) + - ((uint64_t)(self->private_impl.f_dst_x))); - if (v_i < ((uint64_t)(v_dst.len))) { - v_dst = wuffs_base__slice_u8__subslice_i(v_dst, v_i); - v_n = ((uint32_t)( - (wuffs_base__slice_u8__copy_from_slice(v_dst, v_src) & 4294967295))); - v_new_ri = - wuffs_base__u32__sat_add(self->private_impl.f_uncompressed_ri, v_n); - self->private_impl.f_uncompressed_ri = - wuffs_base__u32__min(v_new_ri, 4096); - wuffs_base__u64__sat_add_indirect(&v_i, ((uint64_t)(v_n))); - if (((uint64_t)(v_tab.width)) <= 0) { - status = WUFFS_GIF__ERROR_TOO_MUCH_PIXEL_DATA; - goto exit; - } - self->private_impl.f_dst_x = - ((uint32_t)(((v_i % ((uint64_t)(v_tab.width))) & 4294967295))); - self->private_impl.f_dst_y = - ((uint32_t)(((v_i / ((uint64_t)(v_tab.width))) & 4294967295))); - } - if (self->private_impl.f_uncompressed_ri == - self->private_impl.f_uncompressed_wi) { - self->private_impl.f_uncompressed_ri = 0; - self->private_impl.f_uncompressed_wi = 0; - } else if (self->private_impl.f_uncompressed_ri > - self->private_impl.f_uncompressed_wi) { - status = WUFFS_GIF__ERROR_INTERNAL_ERROR_INCONSISTENT_RI_WI; - goto exit; - } - status = WUFFS_GIF__STATUS_OK; - goto ok; - } label_0_continue:; while (self->private_impl.f_uncompressed_wi > self->private_impl.f_uncompressed_ri) { @@ -3767,9 +3705,6 @@ label_0_continue:; label_0_break:; self->private_impl.f_uncompressed_ri = 0; self->private_impl.f_uncompressed_wi = 0; - - goto ok; -ok: goto exit; exit: return status; diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index c77ed4dc..0f815030 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -525,57 +525,6 @@ pri func decoder.copy_to_image_buffer?(ib ptr base.image_buffer)() { var tab table base.u8 = in.ib.plane(p:0) - // As an optimization, linearize tab's rows into one big slice, in order to - // make fewer copy_from_slice calls. - // - // TODO: measure this optimization and delete it if it doesn't help. - if (not this.interlace) and (tab.width() == tab.stride()) and (this.dst_x0 == 0) and - ((this.dst_x1 as base.u64) == tab.width()) and - ((this.dst_y1 as base.u64) <= tab.height()) { - - if this.uncompressed_ri > this.uncompressed_wi { - return error "internal error: inconsistent ri/wi" - } - src = this.uncompressed[this.uncompressed_ri:this.uncompressed_wi] - - if this.dst_y >= this.dst_y1 { - return error "too much pixel data" - } - - var i base.u64 - dst = tab.linearize() - - i = ((this.dst_y1 as base.u64) * (this.dst_x1 as base.u64)) - if i < dst.length() { - dst = dst[:i] - } - - i = ((this.dst_y as base.u64) * (this.dst_x1 as base.u64)) + (this.dst_x as base.u64) - if i < dst.length() { - dst = dst[i:] - n = (dst.copy_from_slice(s:src) & 0xFFFFFFFF) as base.u32 - - new_ri = this.uncompressed_ri ~sat+ n - this.uncompressed_ri = new_ri.min(x:4096) - - i ~sat+= n as base.u64 - - if tab.width() <= 0 { - return error "too much pixel data" - } - this.dst_x = ((i % tab.width()) & 0xFFFFFFFF) as base.u32 - this.dst_y = ((i / tab.width()) & 0xFFFFFFFF) as base.u32 - } - - if this.uncompressed_ri == this.uncompressed_wi { - this.uncompressed_ri = 0 - this.uncompressed_wi = 0 - } else if this.uncompressed_ri > this.uncompressed_wi { - return error "internal error: inconsistent ri/wi" - } - return - } - while this.uncompressed_wi > this.uncompressed_ri { assert this.uncompressed_ri < this.uncompressed_wi via "a < b: b > a"() src = this.uncompressed[this.uncompressed_ri:this.uncompressed_wi]