From 59b2ddf37fbc3eeaa0dc7b3bb858e7e376cf4aef Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 28 Sep 2019 15:00:04 +1000 Subject: [PATCH] Clamp std/gif dirty rect to the image height --- release/c/wuffs-unsupported-snapshot.c | 38 +++++++++++--------------- std/gif/decode_gif.wuffs | 32 ++++++---------------- 2 files changed, 25 insertions(+), 45 deletions(-) diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 24a46ecc..4dd0e55b 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -3503,7 +3503,7 @@ struct wuffs_gif__decoder__struct { uint32_t f_frame_rect_y1; uint32_t f_dst_x; uint32_t f_dst_y; - wuffs_base__range_ie_u32 f_dirty_y; + uint32_t f_dirty_max_excl_y; uint64_t f_compressed_ri; uint64_t f_compressed_wi; wuffs_base__pixel_swizzler f_swizzler; @@ -9123,10 +9123,12 @@ wuffs_gif__decoder__frame_dirty_rect(const wuffs_gif__decoder* self) { return wuffs_base__utility__make_rect_ie_u32( wuffs_base__u32__min(self->private_impl.f_frame_rect_x0, self->private_impl.f_width), - wuffs_base__range_ie_u32__get_min_incl(&self->private_impl.f_dirty_y), + wuffs_base__u32__min(self->private_impl.f_frame_rect_y0, + self->private_impl.f_height), wuffs_base__u32__min(self->private_impl.f_frame_rect_x1, self->private_impl.f_width), - wuffs_base__range_ie_u32__get_max_excl(&self->private_impl.f_dirty_y)); + wuffs_base__u32__min(self->private_impl.f_dirty_max_excl_y, + self->private_impl.f_height)); } // -------- func gif.decoder.workbuf_len @@ -9223,8 +9225,7 @@ wuffs_gif__decoder__decode_frame_config(wuffs_gif__decoder* self, WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; self->private_impl.f_ignore_metadata = true; - (memset(&self->private_impl.f_dirty_y, 0, sizeof(wuffs_base__range_ie_u32)), - wuffs_base__make_empty_struct()); + self->private_impl.f_dirty_max_excl_y = 0; if (!self->private_impl.f_end_of_data) { if (self->private_impl.f_call_sequence == 0) { if (a_src) { @@ -11152,11 +11153,9 @@ label_0_continue:; wuffs_base__u64__sat_add_indirect(&v_src_ri, v_n); wuffs_base__u32__sat_add_indirect(&self->private_impl.f_dst_x, ((uint32_t)((v_n & 4294967295)))); - self->private_impl.f_dirty_y = wuffs_base__range_ie_u32__unite( - &self->private_impl.f_dirty_y, - wuffs_base__utility__make_range_ie_u32( - self->private_impl.f_dst_y, - wuffs_base__u32__sat_add(self->private_impl.f_dst_y, 1))); + self->private_impl.f_dirty_max_excl_y = wuffs_base__u32__max( + self->private_impl.f_dirty_max_excl_y, + wuffs_base__u32__sat_add(self->private_impl.f_dst_y, 1)); } if (self->private_impl.f_frame_rect_x1 <= self->private_impl.f_dst_x) { self->private_impl.f_dst_x = self->private_impl.f_frame_rect_x0; @@ -11179,18 +11178,13 @@ label_0_continue:; v_replicate_src); v_replicate_count -= 1; } - v_replicate_count = - (((uint32_t)( - wuffs_gif__interlace_count[self->private_impl.f_interlace])) + - 1); - v_replicate_count = wuffs_base__u32__sat_add( - v_replicate_count, self->private_impl.f_dst_y); - v_replicate_count = wuffs_base__u32__min( - v_replicate_count, self->private_impl.f_frame_rect_y1); - self->private_impl.f_dirty_y = wuffs_base__range_ie_u32__unite( - &self->private_impl.f_dirty_y, - wuffs_base__utility__make_range_ie_u32(self->private_impl.f_dst_y, - v_replicate_count)); + self->private_impl.f_dirty_max_excl_y = wuffs_base__u32__max( + self->private_impl.f_dirty_max_excl_y, + wuffs_base__u32__sat_add( + self->private_impl.f_dst_y, + (((uint32_t)(wuffs_gif__interlace_count[self->private_impl + .f_interlace])) + + 1))); } wuffs_base__u32__sat_add_indirect( &self->private_impl.f_dst_y, diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index 2d78b821..be2064f3 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -210,9 +210,9 @@ pub struct decoder?( frame_rect_y1 base.u32, // The dst_etc fields are the output cursor during copy_to_image_buffer. - dst_x base.u32, - dst_y base.u32, - dirty_y base.range_ie_u32, + dst_x base.u32, + dst_y base.u32, + dirty_max_excl_y base.u32, // Indexes into the compressed array, defined below. compressed_ri base.u64, @@ -370,19 +370,11 @@ pub func decoder.num_decoded_frames() base.u64 { pub func decoder.frame_dirty_rect() base.rect_ie_u32 { // The "foo.min(a:this.width_or_height)" calls clip the nominal frame_rect // to the image_rect. - // - // TODO: explicitly intersect this with the frame_rect (in the y - // direction)? In theory, that should be unnecessary, and could hide bugs, - // but it'd be a cheap way to ensure that the dirty_rect is inside the - // frame_rect. - // - // Note that this method is pure, so it cannot set a sticky error bit if - // the dirty_rect is too big. return this.util.make_rect_ie_u32( min_incl_x:this.frame_rect_x0.min(a:this.width), - min_incl_y:this.dirty_y.get_min_incl(), + min_incl_y:this.frame_rect_y0.min(a:this.height), max_excl_x:this.frame_rect_x1.min(a:this.width), - max_excl_y:this.dirty_y.get_max_excl()) + max_excl_y:this.dirty_max_excl_y.min(a:this.height)) } pub func decoder.workbuf_len() base.range_ii_u64 { @@ -411,7 +403,7 @@ pub func decoder.decode_frame_config?(dst nptr base.frame_config, src base.io_re var flags base.u8 this.ignore_metadata = true - this.dirty_y.reset!() + this.dirty_max_excl_y = 0 if not this.end_of_data { if this.call_sequence == 0 { @@ -1157,9 +1149,7 @@ pri func decoder.copy_to_image_buffer!(pb ptr base.pixel_buffer, src slice base. src_ri ~sat+= n this.dst_x ~sat+= (n & 0xFFFFFFFF) as base.u32 - this.dirty_y = this.dirty_y.unite(r:this.util.make_range_ie_u32( - min_incl:this.dst_y, - max_excl:this.dst_y ~sat+ 1)) + this.dirty_max_excl_y = this.dirty_max_excl_y.max(a:this.dst_y ~sat+ 1) } if this.frame_rect_x1 <= this.dst_x { @@ -1188,12 +1178,8 @@ pri func decoder.copy_to_image_buffer!(pb ptr base.pixel_buffer, src slice base. replicate_count -= 1 } - replicate_count = (interlace_count[this.interlace] as base.u32) + 1 - replicate_count = replicate_count ~sat+ this.dst_y - replicate_count = replicate_count.min(a:this.frame_rect_y1) - this.dirty_y = this.dirty_y.unite(r:this.util.make_range_ie_u32( - min_incl:this.dst_y, - max_excl:replicate_count)) + this.dirty_max_excl_y = this.dirty_max_excl_y.max( + a:this.dst_y ~sat+ ((interlace_count[this.interlace] as base.u32) + 1)) } this.dst_y ~sat+= interlace_delta[this.interlace] as base.u32