diff --git a/cmd/wuffs-c/internal/cgen/base/base-private.h b/cmd/wuffs-c/internal/cgen/base/base-private.h index d22f2807..f0d724fd 100644 --- a/cmd/wuffs-c/internal/cgen/base/base-private.h +++ b/cmd/wuffs-c/internal/cgen/base/base-private.h @@ -283,6 +283,76 @@ static inline wuffs_base__slice_u8 wuffs_base__table_u8__row( return ((wuffs_base__slice_u8){}); } +// ---------------- Utility + +static inline wuffs_base__range_ii_u32 wuffs_base__utility__make_range_ii_u32( + wuffs_base__utility* ignored, + uint32_t min_inclusive, + uint32_t max_inclusive) { + return ((wuffs_base__range_ii_u32){ + .min_inclusive = min_inclusive, + .max_inclusive = max_inclusive, + }); +} + +static inline wuffs_base__range_ie_u32 wuffs_base__utility__make_range_ie_u32( + wuffs_base__utility* ignored, + uint32_t min_inclusive, + uint32_t max_exclusive) { + return ((wuffs_base__range_ie_u32){ + .min_inclusive = min_inclusive, + .max_exclusive = max_exclusive, + }); +} + +static inline wuffs_base__range_ii_u64 wuffs_base__utility__make_range_ii_u64( + wuffs_base__utility* ignored, + uint64_t min_inclusive, + uint64_t max_inclusive) { + return ((wuffs_base__range_ii_u64){ + .min_inclusive = min_inclusive, + .max_inclusive = max_inclusive, + }); +} + +static inline wuffs_base__range_ie_u64 wuffs_base__utility__make_range_ie_u64( + wuffs_base__utility* ignored, + uint64_t min_inclusive, + uint64_t max_exclusive) { + return ((wuffs_base__range_ie_u64){ + .min_inclusive = min_inclusive, + .max_exclusive = max_exclusive, + }); +} + +static inline wuffs_base__rect_ii_u32 wuffs_base__utility__make_rect_ii_u32( + wuffs_base__utility* ignored, + uint32_t min_inclusive_x, + uint32_t min_inclusive_y, + uint32_t max_inclusive_x, + uint32_t max_inclusive_y) { + return ((wuffs_base__rect_ii_u32){ + .min_inclusive_x = min_inclusive_x, + .min_inclusive_y = min_inclusive_y, + .max_inclusive_x = max_inclusive_x, + .max_inclusive_y = max_inclusive_y, + }); +} + +static inline wuffs_base__rect_ie_u32 wuffs_base__utility__make_rect_ie_u32( + wuffs_base__utility* ignored, + uint32_t min_inclusive_x, + uint32_t min_inclusive_y, + uint32_t max_exclusive_x, + uint32_t max_exclusive_y) { + return ((wuffs_base__rect_ie_u32){ + .min_inclusive_x = min_inclusive_x, + .min_inclusive_y = min_inclusive_y, + .max_exclusive_x = max_exclusive_x, + .max_exclusive_y = max_exclusive_y, + }); +} + // ---------------- Ranges and Rects static inline wuffs_base__empty_struct diff --git a/cmd/wuffs-c/internal/cgen/data.go b/cmd/wuffs-c/internal/cgen/data.go index f287efde..cd25d083 100644 --- a/cmd/wuffs-c/internal/cgen/data.go +++ b/cmd/wuffs-c/internal/cgen/data.go @@ -110,6 +110,10 @@ const basePrivateH = "" + "" + "// --------\n\nstatic inline wuffs_base__slice_u8 wuffs_base__table_u8__row(\n wuffs_base__table_u8 t,\n uint32_t y) {\n if (y < t.height) {\n return ((wuffs_base__slice_u8){\n .ptr = t.ptr + (t.stride * y),\n .len = t.width,\n });\n }\n return ((wuffs_base__slice_u8){});\n}\n\n" + "" + + "// ---------------- Utility\n\nstatic inline wuffs_base__range_ii_u32 wuffs_base__utility__make_range_ii_u32(\n wuffs_base__utility* ignored,\n uint32_t min_inclusive,\n uint32_t max_inclusive) {\n return ((wuffs_base__range_ii_u32){\n .min_inclusive = min_inclusive,\n .max_inclusive = max_inclusive,\n });\n}\n\nstatic inline wuffs_base__range_ie_u32 wuffs_base__utility__make_range_ie_u32(\n wuffs_base__utility* ignored,\n uint32_t min_inclusive,\n uint32_t max_exclusive) {\n return ((wuffs_base__range_ie_u32){\n .min_inclusive = min_inclusive,\n .max_exclusive = max_exclusive,\n });\n}\n\nstatic inline wuffs_base__range_ii_u64 wuffs_base__utility__make_range_ii_u64(\n wuffs_base__utility* ignored,\n uint64_t min_inclusive,\n uint64_t max_inclusive) {\n return ((wuffs_base__range_ii_u64){\n .min_inclusive = min_inclusive,\n .max_inclusive = max_inclusive,\n });\n}\n\nstatic inline wuffs_base__range_ie_u64 wuffs_base__utility__make_range_ie_u64(\n wuffs_base__utility* ignored,\n" + + " uint64_t min_inclusive,\n uint64_t max_exclusive) {\n return ((wuffs_base__range_ie_u64){\n .min_inclusive = min_inclusive,\n .max_exclusive = max_exclusive,\n });\n}\n\nstatic inline wuffs_base__rect_ii_u32 wuffs_base__utility__make_rect_ii_u32(\n wuffs_base__utility* ignored,\n uint32_t min_inclusive_x,\n uint32_t min_inclusive_y,\n uint32_t max_inclusive_x,\n uint32_t max_inclusive_y) {\n return ((wuffs_base__rect_ii_u32){\n .min_inclusive_x = min_inclusive_x,\n .min_inclusive_y = min_inclusive_y,\n .max_inclusive_x = max_inclusive_x,\n .max_inclusive_y = max_inclusive_y,\n });\n}\n\nstatic inline wuffs_base__rect_ie_u32 wuffs_base__utility__make_rect_ie_u32(\n wuffs_base__utility* ignored,\n uint32_t min_inclusive_x,\n uint32_t min_inclusive_y,\n uint32_t max_exclusive_x,\n uint32_t max_exclusive_y) {\n return ((wuffs_base__rect_ie_u32){\n .min_inclusive_x = min_inclusive_x,\n .min_inclusive_y = min_inclusive_y,\n .max_exclusive_x = max_exclusive_x,\n" + + " .max_exclusive_y = max_exclusive_y,\n });\n}\n\n" + + "" + "// ---------------- Ranges and Rects\n\nstatic inline wuffs_base__empty_struct\nwuffs_base__rect_ii_u32__set_min_inclusive_x(wuffs_base__rect_ii_u32* r,\n uint32_t x) {\n r->min_inclusive_x = x;\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct\nwuffs_base__rect_ii_u32__set_min_inclusive_y(wuffs_base__rect_ii_u32* r,\n uint32_t y) {\n r->min_inclusive_y = y;\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct\nwuffs_base__rect_ii_u32__set_max_inclusive_x(wuffs_base__rect_ii_u32* r,\n uint32_t x) {\n r->max_inclusive_x = x;\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct\nwuffs_base__rect_ii_u32__set_max_inclusive_y(wuffs_base__rect_ii_u32* r,\n uint32_t y) {\n r->max_inclusive_y = y;\n return ((wuffs_base__empty_struct){});\n}\n\n" + "" + "// --------\n\nstatic inline wuffs_base__empty_struct\nwuffs_base__rect_ie_u32__set_min_inclusive_x(wuffs_base__rect_ie_u32* r,\n uint32_t x) {\n r->min_inclusive_x = x;\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct\nwuffs_base__rect_ie_u32__set_min_inclusive_y(wuffs_base__rect_ie_u32* r,\n uint32_t y) {\n r->min_inclusive_y = y;\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct\nwuffs_base__rect_ie_u32__set_max_exclusive_x(wuffs_base__rect_ie_u32* r,\n uint32_t x) {\n r->max_exclusive_x = x;\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct\nwuffs_base__rect_ie_u32__set_max_exclusive_y(wuffs_base__rect_ie_u32* r,\n uint32_t y) {\n r->max_exclusive_y = y;\n return ((wuffs_base__empty_struct){});\n}\n\n" + diff --git a/gen/c/std/adler32.c b/gen/c/std/adler32.c index 42ff6ef6..3895ce47 100644 --- a/gen/c/std/adler32.c +++ b/gen/c/std/adler32.c @@ -1607,6 +1607,76 @@ static inline wuffs_base__slice_u8 wuffs_base__table_u8__row( return ((wuffs_base__slice_u8){}); } +// ---------------- Utility + +static inline wuffs_base__range_ii_u32 wuffs_base__utility__make_range_ii_u32( + wuffs_base__utility* ignored, + uint32_t min_inclusive, + uint32_t max_inclusive) { + return ((wuffs_base__range_ii_u32){ + .min_inclusive = min_inclusive, + .max_inclusive = max_inclusive, + }); +} + +static inline wuffs_base__range_ie_u32 wuffs_base__utility__make_range_ie_u32( + wuffs_base__utility* ignored, + uint32_t min_inclusive, + uint32_t max_exclusive) { + return ((wuffs_base__range_ie_u32){ + .min_inclusive = min_inclusive, + .max_exclusive = max_exclusive, + }); +} + +static inline wuffs_base__range_ii_u64 wuffs_base__utility__make_range_ii_u64( + wuffs_base__utility* ignored, + uint64_t min_inclusive, + uint64_t max_inclusive) { + return ((wuffs_base__range_ii_u64){ + .min_inclusive = min_inclusive, + .max_inclusive = max_inclusive, + }); +} + +static inline wuffs_base__range_ie_u64 wuffs_base__utility__make_range_ie_u64( + wuffs_base__utility* ignored, + uint64_t min_inclusive, + uint64_t max_exclusive) { + return ((wuffs_base__range_ie_u64){ + .min_inclusive = min_inclusive, + .max_exclusive = max_exclusive, + }); +} + +static inline wuffs_base__rect_ii_u32 wuffs_base__utility__make_rect_ii_u32( + wuffs_base__utility* ignored, + uint32_t min_inclusive_x, + uint32_t min_inclusive_y, + uint32_t max_inclusive_x, + uint32_t max_inclusive_y) { + return ((wuffs_base__rect_ii_u32){ + .min_inclusive_x = min_inclusive_x, + .min_inclusive_y = min_inclusive_y, + .max_inclusive_x = max_inclusive_x, + .max_inclusive_y = max_inclusive_y, + }); +} + +static inline wuffs_base__rect_ie_u32 wuffs_base__utility__make_rect_ie_u32( + wuffs_base__utility* ignored, + uint32_t min_inclusive_x, + uint32_t min_inclusive_y, + uint32_t max_exclusive_x, + uint32_t max_exclusive_y) { + return ((wuffs_base__rect_ie_u32){ + .min_inclusive_x = min_inclusive_x, + .min_inclusive_y = min_inclusive_y, + .max_exclusive_x = max_exclusive_x, + .max_exclusive_y = max_exclusive_y, + }); +} + // ---------------- Ranges and Rects static inline wuffs_base__empty_struct diff --git a/gen/c/std/crc32.c b/gen/c/std/crc32.c index 34f79233..b3901980 100644 --- a/gen/c/std/crc32.c +++ b/gen/c/std/crc32.c @@ -1607,6 +1607,76 @@ static inline wuffs_base__slice_u8 wuffs_base__table_u8__row( return ((wuffs_base__slice_u8){}); } +// ---------------- Utility + +static inline wuffs_base__range_ii_u32 wuffs_base__utility__make_range_ii_u32( + wuffs_base__utility* ignored, + uint32_t min_inclusive, + uint32_t max_inclusive) { + return ((wuffs_base__range_ii_u32){ + .min_inclusive = min_inclusive, + .max_inclusive = max_inclusive, + }); +} + +static inline wuffs_base__range_ie_u32 wuffs_base__utility__make_range_ie_u32( + wuffs_base__utility* ignored, + uint32_t min_inclusive, + uint32_t max_exclusive) { + return ((wuffs_base__range_ie_u32){ + .min_inclusive = min_inclusive, + .max_exclusive = max_exclusive, + }); +} + +static inline wuffs_base__range_ii_u64 wuffs_base__utility__make_range_ii_u64( + wuffs_base__utility* ignored, + uint64_t min_inclusive, + uint64_t max_inclusive) { + return ((wuffs_base__range_ii_u64){ + .min_inclusive = min_inclusive, + .max_inclusive = max_inclusive, + }); +} + +static inline wuffs_base__range_ie_u64 wuffs_base__utility__make_range_ie_u64( + wuffs_base__utility* ignored, + uint64_t min_inclusive, + uint64_t max_exclusive) { + return ((wuffs_base__range_ie_u64){ + .min_inclusive = min_inclusive, + .max_exclusive = max_exclusive, + }); +} + +static inline wuffs_base__rect_ii_u32 wuffs_base__utility__make_rect_ii_u32( + wuffs_base__utility* ignored, + uint32_t min_inclusive_x, + uint32_t min_inclusive_y, + uint32_t max_inclusive_x, + uint32_t max_inclusive_y) { + return ((wuffs_base__rect_ii_u32){ + .min_inclusive_x = min_inclusive_x, + .min_inclusive_y = min_inclusive_y, + .max_inclusive_x = max_inclusive_x, + .max_inclusive_y = max_inclusive_y, + }); +} + +static inline wuffs_base__rect_ie_u32 wuffs_base__utility__make_rect_ie_u32( + wuffs_base__utility* ignored, + uint32_t min_inclusive_x, + uint32_t min_inclusive_y, + uint32_t max_exclusive_x, + uint32_t max_exclusive_y) { + return ((wuffs_base__rect_ie_u32){ + .min_inclusive_x = min_inclusive_x, + .min_inclusive_y = min_inclusive_y, + .max_exclusive_x = max_exclusive_x, + .max_exclusive_y = max_exclusive_y, + }); +} + // ---------------- Ranges and Rects static inline wuffs_base__empty_struct diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index b02bb981..3c35b4b9 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -1695,6 +1695,76 @@ static inline wuffs_base__slice_u8 wuffs_base__table_u8__row( return ((wuffs_base__slice_u8){}); } +// ---------------- Utility + +static inline wuffs_base__range_ii_u32 wuffs_base__utility__make_range_ii_u32( + wuffs_base__utility* ignored, + uint32_t min_inclusive, + uint32_t max_inclusive) { + return ((wuffs_base__range_ii_u32){ + .min_inclusive = min_inclusive, + .max_inclusive = max_inclusive, + }); +} + +static inline wuffs_base__range_ie_u32 wuffs_base__utility__make_range_ie_u32( + wuffs_base__utility* ignored, + uint32_t min_inclusive, + uint32_t max_exclusive) { + return ((wuffs_base__range_ie_u32){ + .min_inclusive = min_inclusive, + .max_exclusive = max_exclusive, + }); +} + +static inline wuffs_base__range_ii_u64 wuffs_base__utility__make_range_ii_u64( + wuffs_base__utility* ignored, + uint64_t min_inclusive, + uint64_t max_inclusive) { + return ((wuffs_base__range_ii_u64){ + .min_inclusive = min_inclusive, + .max_inclusive = max_inclusive, + }); +} + +static inline wuffs_base__range_ie_u64 wuffs_base__utility__make_range_ie_u64( + wuffs_base__utility* ignored, + uint64_t min_inclusive, + uint64_t max_exclusive) { + return ((wuffs_base__range_ie_u64){ + .min_inclusive = min_inclusive, + .max_exclusive = max_exclusive, + }); +} + +static inline wuffs_base__rect_ii_u32 wuffs_base__utility__make_rect_ii_u32( + wuffs_base__utility* ignored, + uint32_t min_inclusive_x, + uint32_t min_inclusive_y, + uint32_t max_inclusive_x, + uint32_t max_inclusive_y) { + return ((wuffs_base__rect_ii_u32){ + .min_inclusive_x = min_inclusive_x, + .min_inclusive_y = min_inclusive_y, + .max_inclusive_x = max_inclusive_x, + .max_inclusive_y = max_inclusive_y, + }); +} + +static inline wuffs_base__rect_ie_u32 wuffs_base__utility__make_rect_ie_u32( + wuffs_base__utility* ignored, + uint32_t min_inclusive_x, + uint32_t min_inclusive_y, + uint32_t max_exclusive_x, + uint32_t max_exclusive_y) { + return ((wuffs_base__rect_ie_u32){ + .min_inclusive_x = min_inclusive_x, + .min_inclusive_y = min_inclusive_y, + .max_exclusive_x = max_exclusive_x, + .max_exclusive_y = max_exclusive_y, + }); +} + // ---------------- Ranges and Rects static inline wuffs_base__empty_struct diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 021a7a6a..a7776eec 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -1408,7 +1408,6 @@ typedef struct { uint8_t f_gc_transparent_index; uint8_t f_gc_disposal; uint64_t f_gc_duration; - wuffs_base__rect_ie_u32 f_frame_rect; uint32_t f_dst_x; uint32_t f_dst_y; uint32_t f_dst_x0; @@ -1471,8 +1470,6 @@ typedef struct { } c_decode_gc[1]; struct { uint32_t coro_susp_point; - uint32_t v_frame_x; - uint32_t v_frame_y; uint64_t scratch; } c_decode_id_part0[1]; struct { @@ -1808,6 +1805,76 @@ static inline wuffs_base__slice_u8 wuffs_base__table_u8__row( return ((wuffs_base__slice_u8){}); } +// ---------------- Utility + +static inline wuffs_base__range_ii_u32 wuffs_base__utility__make_range_ii_u32( + wuffs_base__utility* ignored, + uint32_t min_inclusive, + uint32_t max_inclusive) { + return ((wuffs_base__range_ii_u32){ + .min_inclusive = min_inclusive, + .max_inclusive = max_inclusive, + }); +} + +static inline wuffs_base__range_ie_u32 wuffs_base__utility__make_range_ie_u32( + wuffs_base__utility* ignored, + uint32_t min_inclusive, + uint32_t max_exclusive) { + return ((wuffs_base__range_ie_u32){ + .min_inclusive = min_inclusive, + .max_exclusive = max_exclusive, + }); +} + +static inline wuffs_base__range_ii_u64 wuffs_base__utility__make_range_ii_u64( + wuffs_base__utility* ignored, + uint64_t min_inclusive, + uint64_t max_inclusive) { + return ((wuffs_base__range_ii_u64){ + .min_inclusive = min_inclusive, + .max_inclusive = max_inclusive, + }); +} + +static inline wuffs_base__range_ie_u64 wuffs_base__utility__make_range_ie_u64( + wuffs_base__utility* ignored, + uint64_t min_inclusive, + uint64_t max_exclusive) { + return ((wuffs_base__range_ie_u64){ + .min_inclusive = min_inclusive, + .max_exclusive = max_exclusive, + }); +} + +static inline wuffs_base__rect_ii_u32 wuffs_base__utility__make_rect_ii_u32( + wuffs_base__utility* ignored, + uint32_t min_inclusive_x, + uint32_t min_inclusive_y, + uint32_t max_inclusive_x, + uint32_t max_inclusive_y) { + return ((wuffs_base__rect_ii_u32){ + .min_inclusive_x = min_inclusive_x, + .min_inclusive_y = min_inclusive_y, + .max_inclusive_x = max_inclusive_x, + .max_inclusive_y = max_inclusive_y, + }); +} + +static inline wuffs_base__rect_ie_u32 wuffs_base__utility__make_rect_ie_u32( + wuffs_base__utility* ignored, + uint32_t min_inclusive_x, + uint32_t min_inclusive_y, + uint32_t max_exclusive_x, + uint32_t max_exclusive_y) { + return ((wuffs_base__rect_ie_u32){ + .min_inclusive_x = min_inclusive_x, + .min_inclusive_y = min_inclusive_y, + .max_exclusive_x = max_exclusive_x, + .max_exclusive_y = max_exclusive_y, + }); +} + // ---------------- Ranges and Rects static inline wuffs_base__empty_struct @@ -3290,9 +3357,6 @@ static wuffs_base__status wuffs_gif__decoder__decode_id_part0( wuffs_base__io_reader a_src) { wuffs_base__status status = WUFFS_BASE__STATUS_OK; - uint32_t v_frame_x; - uint32_t v_frame_y; - uint8_t* ioptr_src = NULL; uint8_t* iobounds0orig_src = NULL; uint8_t* iobounds1_src = NULL; @@ -3312,8 +3376,6 @@ static wuffs_base__status wuffs_gif__decoder__decode_id_part0( uint32_t coro_susp_point = self->private_impl.c_decode_id_part0[0].coro_susp_point; if (coro_susp_point) { - v_frame_x = self->private_impl.c_decode_id_part0[0].v_frame_x; - v_frame_y = self->private_impl.c_decode_id_part0[0].v_frame_y; } else { } switch (coro_susp_point) { @@ -3345,7 +3407,7 @@ static wuffs_base__status wuffs_gif__decoder__decode_id_part0( *scratch |= ((uint64_t)(t_0)) << 56; } } - v_frame_x = ((uint32_t)(t_1)); + self->private_impl.f_dst_x0 = ((uint32_t)(t_1)); } { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); @@ -3373,16 +3435,8 @@ static wuffs_base__status wuffs_gif__decoder__decode_id_part0( *scratch |= ((uint64_t)(t_2)) << 56; } } - v_frame_y = ((uint32_t)(t_3)); + self->private_impl.f_dst_y0 = ((uint32_t)(t_3)); } - wuffs_base__rect_ie_u32__set_min_inclusive_x( - &self->private_impl.f_frame_rect, v_frame_x); - wuffs_base__rect_ie_u32__set_min_inclusive_y( - &self->private_impl.f_frame_rect, v_frame_y); - self->private_impl.f_dst_x = v_frame_x; - self->private_impl.f_dst_y = v_frame_y; - self->private_impl.f_dst_x0 = v_frame_x; - self->private_impl.f_dst_y0 = v_frame_y; { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); uint16_t t_5; @@ -3409,7 +3463,8 @@ static wuffs_base__status wuffs_gif__decoder__decode_id_part0( *scratch |= ((uint64_t)(t_4)) << 56; } } - v_frame_x += ((uint32_t)(t_5)); + self->private_impl.f_dst_x1 = + (self->private_impl.f_dst_x0 + ((uint32_t)(t_5))); } { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7); @@ -3437,19 +3492,16 @@ static wuffs_base__status wuffs_gif__decoder__decode_id_part0( *scratch |= ((uint64_t)(t_6)) << 56; } } - v_frame_y += ((uint32_t)(t_7)); + self->private_impl.f_dst_y1 = + (self->private_impl.f_dst_y0 + ((uint32_t)(t_7))); } - wuffs_base__rect_ie_u32__set_max_exclusive_x( - &self->private_impl.f_frame_rect, v_frame_x); - wuffs_base__rect_ie_u32__set_max_exclusive_y( - &self->private_impl.f_frame_rect, v_frame_y); - self->private_impl.f_dst_x1 = v_frame_x; - self->private_impl.f_dst_y1 = v_frame_y; + self->private_impl.f_dst_x = self->private_impl.f_dst_x0; + self->private_impl.f_dst_y = self->private_impl.f_dst_y0; if (self->private_impl.f_call_sequence == 0) { - self->private_impl.f_width = - wuffs_base__u32__max(self->private_impl.f_width, v_frame_x); - self->private_impl.f_height = - wuffs_base__u32__max(self->private_impl.f_height, v_frame_y); + self->private_impl.f_width = wuffs_base__u32__max( + self->private_impl.f_width, self->private_impl.f_dst_x1); + self->private_impl.f_height = wuffs_base__u32__max( + self->private_impl.f_height, self->private_impl.f_dst_y1); } goto ok; @@ -3461,8 +3513,6 @@ static wuffs_base__status wuffs_gif__decoder__decode_id_part0( goto suspend; suspend: self->private_impl.c_decode_id_part0[0].coro_susp_point = coro_susp_point; - self->private_impl.c_decode_id_part0[0].v_frame_x = v_frame_x; - self->private_impl.c_decode_id_part0[0].v_frame_y = v_frame_y; goto exit; exit: @@ -3750,10 +3800,14 @@ static wuffs_base__status wuffs_gif__decoder__decode_id_part1( v_palette = ((wuffs_base__slice_u8){ .ptr = self->private_impl.f_palettes[0], .len = 1024}); } - wuffs_base__image_buffer__update(a_dst, self->private_impl.f_frame_rect, - self->private_impl.f_gc_duration, true, - self->private_impl.f_gc_disposal, - v_palette); + wuffs_base__image_buffer__update( + a_dst, + wuffs_base__utility__make_rect_ie_u32( + &self->private_impl.f_util, self->private_impl.f_dst_x0, + self->private_impl.f_dst_y0, self->private_impl.f_dst_x1, + self->private_impl.f_dst_y1), + self->private_impl.f_gc_duration, true, + self->private_impl.f_gc_disposal, v_palette); self->private_impl.f_previous_use_global_palette = !(v_use_local_palette || self->private_impl.f_gc_has_transparent_index); self->private_impl.f_seen_graphic_control = false; diff --git a/gen/c/std/gzip.c b/gen/c/std/gzip.c index c91472c7..a08e7c47 100644 --- a/gen/c/std/gzip.c +++ b/gen/c/std/gzip.c @@ -1847,6 +1847,76 @@ static inline wuffs_base__slice_u8 wuffs_base__table_u8__row( return ((wuffs_base__slice_u8){}); } +// ---------------- Utility + +static inline wuffs_base__range_ii_u32 wuffs_base__utility__make_range_ii_u32( + wuffs_base__utility* ignored, + uint32_t min_inclusive, + uint32_t max_inclusive) { + return ((wuffs_base__range_ii_u32){ + .min_inclusive = min_inclusive, + .max_inclusive = max_inclusive, + }); +} + +static inline wuffs_base__range_ie_u32 wuffs_base__utility__make_range_ie_u32( + wuffs_base__utility* ignored, + uint32_t min_inclusive, + uint32_t max_exclusive) { + return ((wuffs_base__range_ie_u32){ + .min_inclusive = min_inclusive, + .max_exclusive = max_exclusive, + }); +} + +static inline wuffs_base__range_ii_u64 wuffs_base__utility__make_range_ii_u64( + wuffs_base__utility* ignored, + uint64_t min_inclusive, + uint64_t max_inclusive) { + return ((wuffs_base__range_ii_u64){ + .min_inclusive = min_inclusive, + .max_inclusive = max_inclusive, + }); +} + +static inline wuffs_base__range_ie_u64 wuffs_base__utility__make_range_ie_u64( + wuffs_base__utility* ignored, + uint64_t min_inclusive, + uint64_t max_exclusive) { + return ((wuffs_base__range_ie_u64){ + .min_inclusive = min_inclusive, + .max_exclusive = max_exclusive, + }); +} + +static inline wuffs_base__rect_ii_u32 wuffs_base__utility__make_rect_ii_u32( + wuffs_base__utility* ignored, + uint32_t min_inclusive_x, + uint32_t min_inclusive_y, + uint32_t max_inclusive_x, + uint32_t max_inclusive_y) { + return ((wuffs_base__rect_ii_u32){ + .min_inclusive_x = min_inclusive_x, + .min_inclusive_y = min_inclusive_y, + .max_inclusive_x = max_inclusive_x, + .max_inclusive_y = max_inclusive_y, + }); +} + +static inline wuffs_base__rect_ie_u32 wuffs_base__utility__make_rect_ie_u32( + wuffs_base__utility* ignored, + uint32_t min_inclusive_x, + uint32_t min_inclusive_y, + uint32_t max_exclusive_x, + uint32_t max_exclusive_y) { + return ((wuffs_base__rect_ie_u32){ + .min_inclusive_x = min_inclusive_x, + .min_inclusive_y = min_inclusive_y, + .max_exclusive_x = max_exclusive_x, + .max_exclusive_y = max_exclusive_y, + }); +} + // ---------------- Ranges and Rects static inline wuffs_base__empty_struct diff --git a/gen/c/std/lzw.c b/gen/c/std/lzw.c index b1bc1c27..cb354476 100644 --- a/gen/c/std/lzw.c +++ b/gen/c/std/lzw.c @@ -1631,6 +1631,76 @@ static inline wuffs_base__slice_u8 wuffs_base__table_u8__row( return ((wuffs_base__slice_u8){}); } +// ---------------- Utility + +static inline wuffs_base__range_ii_u32 wuffs_base__utility__make_range_ii_u32( + wuffs_base__utility* ignored, + uint32_t min_inclusive, + uint32_t max_inclusive) { + return ((wuffs_base__range_ii_u32){ + .min_inclusive = min_inclusive, + .max_inclusive = max_inclusive, + }); +} + +static inline wuffs_base__range_ie_u32 wuffs_base__utility__make_range_ie_u32( + wuffs_base__utility* ignored, + uint32_t min_inclusive, + uint32_t max_exclusive) { + return ((wuffs_base__range_ie_u32){ + .min_inclusive = min_inclusive, + .max_exclusive = max_exclusive, + }); +} + +static inline wuffs_base__range_ii_u64 wuffs_base__utility__make_range_ii_u64( + wuffs_base__utility* ignored, + uint64_t min_inclusive, + uint64_t max_inclusive) { + return ((wuffs_base__range_ii_u64){ + .min_inclusive = min_inclusive, + .max_inclusive = max_inclusive, + }); +} + +static inline wuffs_base__range_ie_u64 wuffs_base__utility__make_range_ie_u64( + wuffs_base__utility* ignored, + uint64_t min_inclusive, + uint64_t max_exclusive) { + return ((wuffs_base__range_ie_u64){ + .min_inclusive = min_inclusive, + .max_exclusive = max_exclusive, + }); +} + +static inline wuffs_base__rect_ii_u32 wuffs_base__utility__make_rect_ii_u32( + wuffs_base__utility* ignored, + uint32_t min_inclusive_x, + uint32_t min_inclusive_y, + uint32_t max_inclusive_x, + uint32_t max_inclusive_y) { + return ((wuffs_base__rect_ii_u32){ + .min_inclusive_x = min_inclusive_x, + .min_inclusive_y = min_inclusive_y, + .max_inclusive_x = max_inclusive_x, + .max_inclusive_y = max_inclusive_y, + }); +} + +static inline wuffs_base__rect_ie_u32 wuffs_base__utility__make_rect_ie_u32( + wuffs_base__utility* ignored, + uint32_t min_inclusive_x, + uint32_t min_inclusive_y, + uint32_t max_exclusive_x, + uint32_t max_exclusive_y) { + return ((wuffs_base__rect_ie_u32){ + .min_inclusive_x = min_inclusive_x, + .min_inclusive_y = min_inclusive_y, + .max_exclusive_x = max_exclusive_x, + .max_exclusive_y = max_exclusive_y, + }); +} + // ---------------- Ranges and Rects static inline wuffs_base__empty_struct diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index 0642a60a..cbf77cab 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -1845,6 +1845,76 @@ static inline wuffs_base__slice_u8 wuffs_base__table_u8__row( return ((wuffs_base__slice_u8){}); } +// ---------------- Utility + +static inline wuffs_base__range_ii_u32 wuffs_base__utility__make_range_ii_u32( + wuffs_base__utility* ignored, + uint32_t min_inclusive, + uint32_t max_inclusive) { + return ((wuffs_base__range_ii_u32){ + .min_inclusive = min_inclusive, + .max_inclusive = max_inclusive, + }); +} + +static inline wuffs_base__range_ie_u32 wuffs_base__utility__make_range_ie_u32( + wuffs_base__utility* ignored, + uint32_t min_inclusive, + uint32_t max_exclusive) { + return ((wuffs_base__range_ie_u32){ + .min_inclusive = min_inclusive, + .max_exclusive = max_exclusive, + }); +} + +static inline wuffs_base__range_ii_u64 wuffs_base__utility__make_range_ii_u64( + wuffs_base__utility* ignored, + uint64_t min_inclusive, + uint64_t max_inclusive) { + return ((wuffs_base__range_ii_u64){ + .min_inclusive = min_inclusive, + .max_inclusive = max_inclusive, + }); +} + +static inline wuffs_base__range_ie_u64 wuffs_base__utility__make_range_ie_u64( + wuffs_base__utility* ignored, + uint64_t min_inclusive, + uint64_t max_exclusive) { + return ((wuffs_base__range_ie_u64){ + .min_inclusive = min_inclusive, + .max_exclusive = max_exclusive, + }); +} + +static inline wuffs_base__rect_ii_u32 wuffs_base__utility__make_rect_ii_u32( + wuffs_base__utility* ignored, + uint32_t min_inclusive_x, + uint32_t min_inclusive_y, + uint32_t max_inclusive_x, + uint32_t max_inclusive_y) { + return ((wuffs_base__rect_ii_u32){ + .min_inclusive_x = min_inclusive_x, + .min_inclusive_y = min_inclusive_y, + .max_inclusive_x = max_inclusive_x, + .max_inclusive_y = max_inclusive_y, + }); +} + +static inline wuffs_base__rect_ie_u32 wuffs_base__utility__make_rect_ie_u32( + wuffs_base__utility* ignored, + uint32_t min_inclusive_x, + uint32_t min_inclusive_y, + uint32_t max_exclusive_x, + uint32_t max_exclusive_y) { + return ((wuffs_base__rect_ie_u32){ + .min_inclusive_x = min_inclusive_x, + .min_inclusive_y = min_inclusive_y, + .max_exclusive_x = max_exclusive_x, + .max_exclusive_y = max_exclusive_y, + }); +} + // ---------------- Ranges and Rects static inline wuffs_base__empty_struct diff --git a/gen/h/std/gif.h b/gen/h/std/gif.h index 9a1701a3..f853d1f0 100644 --- a/gen/h/std/gif.h +++ b/gen/h/std/gif.h @@ -1408,7 +1408,6 @@ typedef struct { uint8_t f_gc_transparent_index; uint8_t f_gc_disposal; uint64_t f_gc_duration; - wuffs_base__rect_ie_u32 f_frame_rect; uint32_t f_dst_x; uint32_t f_dst_y; uint32_t f_dst_x0; @@ -1471,8 +1470,6 @@ typedef struct { } c_decode_gc[1]; struct { uint32_t coro_susp_point; - uint32_t v_frame_x; - uint32_t v_frame_y; uint64_t scratch; } c_decode_id_part0[1]; struct { diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index 98470df0..43954d34 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -81,6 +81,10 @@ var Types = []string{ "bool", "utility", + "range_ii_u32", + "range_ie_u32", + "range_ii_u64", + "range_ie_u64", "rect_ie_u32", "rect_ii_u32", @@ -112,6 +116,17 @@ var Funcs = []string{ "u64.max(x u64)(ret u64)", "u64.min(x u64)(ret u64)", + // ---- utility + + "utility.make_range_ii_u32(min_inclusive u32, max_inclusive u32)(ret range_ii_u32)", + "utility.make_range_ie_u32(min_inclusive u32, max_exclusive u32)(ret range_ie_u32)", + "utility.make_range_ii_u64(min_inclusive u64, max_inclusive u64)(ret range_ii_u64)", + "utility.make_range_ie_u64(min_inclusive u64, max_exclusive u64)(ret range_ie_u64)", + "utility.make_rect_ii_u32(min_inclusive_x u32, min_inclusive_y u32," + + "max_inclusive_x u32, max_inclusive_y u32)(ret rect_ii_u32)", + "utility.make_rect_ie_u32(min_inclusive_x u32, min_inclusive_y u32," + + "max_exclusive_x u32, max_exclusive_y u32)(ret rect_ie_u32)", + // ---- rect_ie_u32 "rect_ie_u32.set_min_inclusive_x!(x u32)()", diff --git a/lang/check/resolve.go b/lang/check/resolve.go index 465a7218..ce72e986 100644 --- a/lang/check/resolve.go +++ b/lang/check/resolve.go @@ -49,8 +49,12 @@ var ( typeExprBool = a.NewTypeExpr(0, t.IDBase, t.IDBool, nil, nil, nil) typeExprUtility = a.NewTypeExpr(0, t.IDBase, t.IDUtility, nil, nil, nil) - typeExprRectIEU32 = a.NewTypeExpr(0, t.IDBase, t.IDRectIEU32, nil, nil, nil) - typeExprRectIIU32 = a.NewTypeExpr(0, t.IDBase, t.IDRectIIU32, nil, nil, nil) + typeExprRangeIEU32 = a.NewTypeExpr(0, t.IDBase, t.IDRangeIEU32, nil, nil, nil) + typeExprRangeIIU32 = a.NewTypeExpr(0, t.IDBase, t.IDRangeIIU32, nil, nil, nil) + typeExprRangeIEU64 = a.NewTypeExpr(0, t.IDBase, t.IDRangeIEU64, nil, nil, nil) + typeExprRangeIIU64 = a.NewTypeExpr(0, t.IDBase, t.IDRangeIIU64, nil, nil, nil) + typeExprRectIEU32 = a.NewTypeExpr(0, t.IDBase, t.IDRectIEU32, nil, nil, nil) + typeExprRectIIU32 = a.NewTypeExpr(0, t.IDBase, t.IDRectIIU32, nil, nil, nil) typeExprImageBuffer = a.NewTypeExpr(0, t.IDBase, t.IDImageBuffer, nil, nil, nil) typeExprImageConfig = a.NewTypeExpr(0, t.IDBase, t.IDImageConfig, nil, nil, nil) @@ -75,8 +79,12 @@ var builtInTypeMap = typeMap{ t.IDBool: typeExprBool, t.IDUtility: typeExprUtility, - t.IDRectIEU32: typeExprRectIEU32, - t.IDRectIIU32: typeExprRectIIU32, + t.IDRangeIEU32: typeExprRangeIEU32, + t.IDRangeIIU32: typeExprRangeIIU32, + t.IDRangeIEU64: typeExprRangeIEU64, + t.IDRangeIIU64: typeExprRangeIIU64, + t.IDRectIEU32: typeExprRectIEU32, + t.IDRectIIU32: typeExprRectIIU32, t.IDImageBuffer: typeExprImageBuffer, t.IDImageConfig: typeExprImageConfig, diff --git a/lang/token/list.go b/lang/token/list.go index e4f37f84..20a986b8 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -399,8 +399,12 @@ const ( IDBool = ID(0x101) IDUtility = ID(0x102) - IDRectIEU32 = ID(0x108) - IDRectIIU32 = ID(0x109) + IDRangeIEU32 = ID(0x108) + IDRangeIIU32 = ID(0x109) + IDRangeIEU64 = ID(0x10A) + IDRangeIIU64 = ID(0x10B) + IDRectIEU32 = ID(0x10C) + IDRectIIU32 = ID(0x10D) IDImageBuffer = ID(0x110) IDImageConfig = ID(0x111) @@ -627,8 +631,12 @@ var builtInsByID = [nBuiltInIDs]string{ IDBool: "bool", IDUtility: "utility", - IDRectIEU32: "rect_ie_u32", - IDRectIIU32: "rect_ii_u32", + IDRangeIEU32: "range_ie_u32", + IDRangeIIU32: "range_ii_u32", + IDRangeIEU64: "range_ie_u64", + IDRangeIIU64: "range_ii_u64", + IDRectIEU32: "rect_ie_u32", + IDRectIIU32: "rect_ii_u32", IDImageBuffer: "image_buffer", IDImageConfig: "image_config", diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index d7a09709..ad9ab267 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -79,12 +79,9 @@ pub struct decoder?( // There are 7056000 flicks per centisecond. gc_duration base.u64[..0xFFFF * 7056000], - frame_rect base.rect_ie_u32, - // The dst_etc fields are the output cursor during copy_to_image_buffer. dst_x base.u32, dst_y base.u32, - // TODO: these are just frame_rect fields. dst_x0 base.u32, dst_y0 base.u32, dst_x1 base.u32, @@ -384,21 +381,12 @@ pri func decoder.decode_gc?(src base.io_reader)() { // overall image's width and height also requires decoding the first frame's // bounds (but doesn't require decoding the first frame's pixels). pri func decoder.decode_id_part0?(src base.io_reader)() { - var frame_x base.u32 = in.src.read_u16le?() as base.u32 - var frame_y base.u32 = in.src.read_u16le?() as base.u32 - this.frame_rect.set_min_inclusive_x!(x:frame_x) - this.frame_rect.set_min_inclusive_y!(y:frame_y) - this.dst_x = frame_x - this.dst_y = frame_y - this.dst_x0 = frame_x - this.dst_y0 = frame_y - - frame_x ~mod+= in.src.read_u16le?() as base.u32 - frame_y ~mod+= in.src.read_u16le?() as base.u32 - this.frame_rect.set_max_exclusive_x!(x:frame_x) - this.frame_rect.set_max_exclusive_y!(y:frame_y) - this.dst_x1 = frame_x - this.dst_y1 = frame_y + this.dst_x0 = in.src.read_u16le?() as base.u32 + this.dst_y0 = in.src.read_u16le?() as base.u32 + this.dst_x1 = this.dst_x0 ~mod+ (in.src.read_u16le?() as base.u32) + this.dst_y1 = this.dst_y0 ~mod+ (in.src.read_u16le?() as base.u32) + this.dst_x = this.dst_x0 + this.dst_y = this.dst_y0 // Set the image's overall width and height to be the maximum of the // nominal image width and height (given in the Logical Screen Descriptor) @@ -406,8 +394,8 @@ pri func decoder.decode_id_part0?(src base.io_reader)() { // test/data/artificial/gif-frame-out-of-bounds.gif.make-artificial.txt for // more discussion. if this.call_sequence == 0 { - this.width = this.width.max(x:frame_x) - this.height = this.height.max(x:frame_y) + this.width = this.width.max(x:this.dst_x1) + this.height = this.height.max(x:this.dst_y1) } } @@ -540,8 +528,12 @@ pri func decoder.decode_id_part1?(dst ptr base.image_buffer, src base.io_reader) // Both this frame and the previous one used the global palette. No // palette update is necessary. } - in.dst.update!(dirty_rect:this.frame_rect, duration:this.gc_duration, - blend:true, disposal:this.gc_disposal, palette:palette) + in.dst.update!(dirty_rect:this.util.make_rect_ie_u32( + min_inclusive_x:this.dst_x0, + min_inclusive_y:this.dst_y0, + max_exclusive_x:this.dst_x1, + max_exclusive_y:this.dst_y1), + duration:this.gc_duration, blend:true, disposal:this.gc_disposal, palette:palette) this.previous_use_global_palette = not (use_local_palette or this.gc_has_transparent_index) @@ -572,7 +564,7 @@ pri func decoder.copy_to_image_buffer?(ib ptr base.image_buffer)() { return error "too much pixel data" } - // First, copy from src to that part of this.frame_rect that is inside + // First, copy from src to that part of the frame rect that is inside // in.ib's bounds. dst = tab.row(y:this.dst_y) @@ -607,7 +599,7 @@ pri func decoder.copy_to_image_buffer?(ib ptr base.image_buffer)() { return error "internal error: inconsistent ri/wi" } - // Second, skip over src for that part of this.frame_rect that is + // Second, skip over src for that part of the frame rect that is // outside in.ib's bounds. This second step should be infrequent. // Set n to the number of pixels (i.e. the number of bytes) to skip.