diff --git a/cmd/wuffs-c/internal/cgen/base-header.h b/cmd/wuffs-c/internal/cgen/base-header.h index 99404df3..dc58cd41 100644 --- a/cmd/wuffs-c/internal/cgen/base-header.h +++ b/cmd/wuffs-c/internal/cgen/base-header.h @@ -253,6 +253,15 @@ static inline bool wuffs_base__range_ii_u32__is_empty( return r.min_inclusive > r.max_inclusive; } +static inline bool wuffs_base__range_ii_u32__equals( + wuffs_base__range_ii_u32 r, + wuffs_base__range_ii_u32 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_inclusive == s.max_inclusive) || + (wuffs_base__range_ii_u32__is_empty(r) && + wuffs_base__range_ii_u32__is_empty(s)); +} + static inline bool wuffs_base__range_ii_u32__contains( wuffs_base__range_ii_u32 r, uint32_t x) { @@ -293,6 +302,15 @@ static inline bool wuffs_base__range_ie_u32__is_empty( return r.min_inclusive >= r.max_exclusive; } +static inline bool wuffs_base__range_ie_u32__equals( + wuffs_base__range_ie_u32 r, + wuffs_base__range_ie_u32 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_exclusive == s.max_exclusive) || + (wuffs_base__range_ie_u32__is_empty(r) && + wuffs_base__range_ie_u32__is_empty(s)); +} + static inline bool wuffs_base__range_ie_u32__contains( wuffs_base__range_ie_u32 r, uint32_t x) { @@ -338,6 +356,15 @@ static inline bool wuffs_base__range_ii_u64__is_empty( return r.min_inclusive > r.max_inclusive; } +static inline bool wuffs_base__range_ii_u64__equals( + wuffs_base__range_ii_u64 r, + wuffs_base__range_ii_u64 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_inclusive == s.max_inclusive) || + (wuffs_base__range_ii_u64__is_empty(r) && + wuffs_base__range_ii_u64__is_empty(s)); +} + static inline bool wuffs_base__range_ii_u64__contains( wuffs_base__range_ii_u64 r, uint64_t x) { @@ -378,6 +405,15 @@ static inline bool wuffs_base__range_ie_u64__is_empty( return r.min_inclusive >= r.max_exclusive; } +static inline bool wuffs_base__range_ie_u64__equals( + wuffs_base__range_ie_u64 r, + wuffs_base__range_ie_u64 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_exclusive == s.max_exclusive) || + (wuffs_base__range_ie_u64__is_empty(r) && + wuffs_base__range_ie_u64__is_empty(s)); +} + static inline bool wuffs_base__range_ie_u64__contains( wuffs_base__range_ie_u64 r, uint64_t x) { @@ -435,6 +471,16 @@ static inline bool wuffs_base__rect_ii_u32__is_empty( (r.min_inclusive_y > r.max_inclusive_y); } +static inline bool wuffs_base__rect_ii_u32__equals(wuffs_base__rect_ii_u32 r, + wuffs_base__rect_ii_u32 s) { + return (r.min_inclusive_x == s.min_inclusive_x && + r.min_inclusive_y == s.min_inclusive_y && + r.max_inclusive_x == s.max_inclusive_x && + r.max_inclusive_y == s.max_inclusive_y) || + (wuffs_base__rect_ii_u32__is_empty(r) && + wuffs_base__rect_ii_u32__is_empty(s)); +} + static inline bool wuffs_base__rect_ii_u32__contains(wuffs_base__rect_ii_u32 r, uint32_t x, uint32_t y) { @@ -501,6 +547,16 @@ static inline bool wuffs_base__rect_ie_u32__is_empty( (r.min_inclusive_y >= r.max_exclusive_y); } +static inline bool wuffs_base__rect_ie_u32__equals(wuffs_base__rect_ie_u32 r, + wuffs_base__rect_ie_u32 s) { + return (r.min_inclusive_x == s.min_inclusive_x && + r.min_inclusive_y == s.min_inclusive_y && + r.max_exclusive_x == s.max_exclusive_x && + r.max_exclusive_y == s.max_exclusive_y) || + (wuffs_base__rect_ie_u32__is_empty(r) && + wuffs_base__rect_ie_u32__is_empty(s)); +} + static inline bool wuffs_base__rect_ie_u32__contains(wuffs_base__rect_ie_u32 r, uint32_t x, uint32_t y) { @@ -1027,17 +1083,16 @@ static inline void wuffs_base__image_buffer__update( bool dirty_palette, wuffs_base__rect_ie_u32 dirty_rect, wuffs_base__flicks duration, - uint8_t* palette_ptr, - size_t palette_len) { + wuffs_base__slice_u8 palette) { if (!b) { return; } b->private_impl.dirty_palette = dirty_palette; b->private_impl.dirty_rect = dirty_rect; b->private_impl.duration = duration; - if (palette_ptr) { - memmove(b->private_impl.palette, palette_ptr, - palette_len <= 1024 ? palette_len : 1024); + if (palette.ptr) { + memmove(b->private_impl.palette, palette.ptr, + palette.len <= 1024 ? palette.len : 1024); } } diff --git a/cmd/wuffs-c/internal/cgen/data.go b/cmd/wuffs-c/internal/cgen/data.go index fd31db5f..633eb2a6 100644 --- a/cmd/wuffs-c/internal/cgen/data.go +++ b/cmd/wuffs-c/internal/cgen/data.go @@ -34,24 +34,26 @@ const baseHeader = "" + "" + "// ---------------- Ranges and Rects\n\n// Ranges are either inclusive (\"range_ii\") or exclusive (\"range_ie\") on the\n// high end. Both the \"ii\" and \"ie\" flavors are useful in practice.\n//\n// The \"ei\" and \"ee\" flavors also exist in theory, but aren't widely used. In\n// Wuffs, the low end is always inclusive.\n//\n// The \"ii\" (closed interval) flavor is useful when refining e.g. \"the set of\n// all uint32_t values\" to a contiguous subset: \"uint32_t values in the closed\n// interval [M, N]\", for uint32_t values M and N. An unrefined type (in other\n// words, the set of all uint32_t values) is not representable in the \"ie\"\n// flavor because if N equals ((1<<32) - 1) then (N + 1) will overflow.\n//\n// On the other hand, the \"ie\" (half-open interval) flavor is recommended by\n// Dijkstra's \"Why numbering should start at zero\" at\n// http://www.cs.utexas.edu/users/EWD/ewd08xx/EWD831.PDF and a further\n// discussion of motivating rationale is at\n// https://www.quora.com/Why-are-Python-ranges-half-open-exclusive-instead-of-close" + "d-inclusive\n//\n// For example, with \"ie\", the number of elements in \"uint32_t values in the\n// half-open interval [M, N)\" is equal to max(0, N-M). Furthermore, that number\n// of elements (in one dimension, a length, in two dimensions, a width or\n// height) is itself representable as a uint32_t without overflow, again for\n// uint32_t values M and N. In the contrasting \"ii\" flavor, the length of the\n// closed interval [0, (1<<32) - 1] is 1<<32, which cannot be represented as a\n// uint32_t. In Wuffs, because of this potential overflow, the \"ie\" flavor has\n// length / width / height methods, but the \"ii\" flavor does not.\n//\n// It is valid for min > max (for range_ii) or for min >= max (for range_ie),\n// in which case the range is empty. There are multiple representations of an\n// empty range.\n\ntypedef struct {\n uint32_t min_inclusive;\n uint32_t max_inclusive;\n} wuffs_base__range_ii_u32;\n\nstatic inline bool wuffs_base__range_ii_u32__is_empty(\n wuffs_base__range_ii_u32 r) {\n return r.min_inclusive > r.max_inc" + - "lusive;\n}\n\nstatic inline bool wuffs_base__range_ii_u32__contains(\n wuffs_base__range_ii_u32 r,\n uint32_t x) {\n return (r.min_inclusive <= x) && (x <= r.max_inclusive);\n}\n\nstatic inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32__intersection(\n wuffs_base__range_ii_u32 r,\n wuffs_base__range_ii_u32 s) {\n r.min_inclusive = wuffs_base__u32__max(r.min_inclusive, s.min_inclusive);\n r.max_inclusive = wuffs_base__u32__min(r.max_inclusive, s.max_inclusive);\n return r;\n}\n\nstatic inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32__union(\n wuffs_base__range_ii_u32 r,\n wuffs_base__range_ii_u32 s) {\n if (wuffs_base__range_ii_u32__is_empty(r)) {\n return s;\n }\n if (wuffs_base__range_ii_u32__is_empty(s)) {\n return r;\n }\n r.min_inclusive = wuffs_base__u32__min(r.min_inclusive, s.min_inclusive);\n r.max_inclusive = wuffs_base__u32__max(r.max_inclusive, s.max_inclusive);\n return r;\n}\n\n" + + "lusive;\n}\n\nstatic inline bool wuffs_base__range_ii_u32__equals(\n wuffs_base__range_ii_u32 r,\n wuffs_base__range_ii_u32 s) {\n return (r.min_inclusive == s.min_inclusive &&\n r.max_inclusive == s.max_inclusive) ||\n (wuffs_base__range_ii_u32__is_empty(r) &&\n wuffs_base__range_ii_u32__is_empty(s));\n}\n\nstatic inline bool wuffs_base__range_ii_u32__contains(\n wuffs_base__range_ii_u32 r,\n uint32_t x) {\n return (r.min_inclusive <= x) && (x <= r.max_inclusive);\n}\n\nstatic inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32__intersection(\n wuffs_base__range_ii_u32 r,\n wuffs_base__range_ii_u32 s) {\n r.min_inclusive = wuffs_base__u32__max(r.min_inclusive, s.min_inclusive);\n r.max_inclusive = wuffs_base__u32__min(r.max_inclusive, s.max_inclusive);\n return r;\n}\n\nstatic inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32__union(\n wuffs_base__range_ii_u32 r,\n wuffs_base__range_ii_u32 s) {\n if (wuffs_base__range_ii_u32__is_empty(r)) {\n return s;\n }\n if (wuffs" + + "_base__range_ii_u32__is_empty(s)) {\n return r;\n }\n r.min_inclusive = wuffs_base__u32__min(r.min_inclusive, s.min_inclusive);\n r.max_inclusive = wuffs_base__u32__max(r.max_inclusive, s.max_inclusive);\n return r;\n}\n\n" + "" + - "// --------\n\ntypedef struct {\n uint32_t min_inclusive;\n uint32_t max_exclusive;\n} wuffs_base__range_ie_u32;\n\nstatic inline bool wuffs_base__range_ie_u32__is_empty(\n wuffs_base__range_ie_u32 r) {\n return r.min_inclusive >= r.max_exclusive;\n}\n\nstatic inline bool wuffs_base__range_ie_u32__contains(\n wuffs_base__range_ie_u32 r,\n uint32_t x) {\n return (r.min_inclusive <= x) && (x < r.max_exclusive);\n}\n\nstatic inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32__intersection(\n wuffs_base__range_ie_u32 r,\n wuffs_base__range_ie_u32 s) {\n r.min_inclusive = wuffs_base__u32__max(r.min_inclusive, s.min_inclusive);\n r.max_exclusive = wuffs_base__u32__min(r.max_exclusive, s.max_exclusive);\n return r;\n}\n\nstatic inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32__union(\n wuffs_base__range_ie_u32 r,\n wuffs_base__range_ie_u32 s) {\n if (wuffs_base__range_ie_u32__is_empty(r)) {\n return s;\n }\n if (wuffs_base__range_ie_u32__is_empty(s)) {\n return r;\n }\n r.min_inclusive = wuffs_base" + - "__u32__min(r.min_inclusive, s.min_inclusive);\n r.max_exclusive = wuffs_base__u32__max(r.max_exclusive, s.max_exclusive);\n return r;\n}\n\nstatic inline uint32_t wuffs_base__range_ie_u32__length(\n wuffs_base__range_ie_u32 r) {\n return wuffs_base__u32__sat_sub(r.max_exclusive, r.min_inclusive);\n}\n\n" + + "// --------\n\ntypedef struct {\n uint32_t min_inclusive;\n uint32_t max_exclusive;\n} wuffs_base__range_ie_u32;\n\nstatic inline bool wuffs_base__range_ie_u32__is_empty(\n wuffs_base__range_ie_u32 r) {\n return r.min_inclusive >= r.max_exclusive;\n}\n\nstatic inline bool wuffs_base__range_ie_u32__equals(\n wuffs_base__range_ie_u32 r,\n wuffs_base__range_ie_u32 s) {\n return (r.min_inclusive == s.min_inclusive &&\n r.max_exclusive == s.max_exclusive) ||\n (wuffs_base__range_ie_u32__is_empty(r) &&\n wuffs_base__range_ie_u32__is_empty(s));\n}\n\nstatic inline bool wuffs_base__range_ie_u32__contains(\n wuffs_base__range_ie_u32 r,\n uint32_t x) {\n return (r.min_inclusive <= x) && (x < r.max_exclusive);\n}\n\nstatic inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32__intersection(\n wuffs_base__range_ie_u32 r,\n wuffs_base__range_ie_u32 s) {\n r.min_inclusive = wuffs_base__u32__max(r.min_inclusive, s.min_inclusive);\n r.max_exclusive = wuffs_base__u32__min(r.max_exclusive, s.max_exclu" + + "sive);\n return r;\n}\n\nstatic inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32__union(\n wuffs_base__range_ie_u32 r,\n wuffs_base__range_ie_u32 s) {\n if (wuffs_base__range_ie_u32__is_empty(r)) {\n return s;\n }\n if (wuffs_base__range_ie_u32__is_empty(s)) {\n return r;\n }\n r.min_inclusive = wuffs_base__u32__min(r.min_inclusive, s.min_inclusive);\n r.max_exclusive = wuffs_base__u32__max(r.max_exclusive, s.max_exclusive);\n return r;\n}\n\nstatic inline uint32_t wuffs_base__range_ie_u32__length(\n wuffs_base__range_ie_u32 r) {\n return wuffs_base__u32__sat_sub(r.max_exclusive, r.min_inclusive);\n}\n\n" + "" + - "// --------\n\ntypedef struct {\n uint64_t min_inclusive;\n uint64_t max_inclusive;\n} wuffs_base__range_ii_u64;\n\nstatic inline bool wuffs_base__range_ii_u64__is_empty(\n wuffs_base__range_ii_u64 r) {\n return r.min_inclusive > r.max_inclusive;\n}\n\nstatic inline bool wuffs_base__range_ii_u64__contains(\n wuffs_base__range_ii_u64 r,\n uint64_t x) {\n return (r.min_inclusive <= x) && (x <= r.max_inclusive);\n}\n\nstatic inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64__intersection(\n wuffs_base__range_ii_u64 r,\n wuffs_base__range_ii_u64 s) {\n r.min_inclusive = wuffs_base__u64__max(r.min_inclusive, s.min_inclusive);\n r.max_inclusive = wuffs_base__u64__min(r.max_inclusive, s.max_inclusive);\n return r;\n}\n\nstatic inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64__union(\n wuffs_base__range_ii_u64 r,\n wuffs_base__range_ii_u64 s) {\n if (wuffs_base__range_ii_u64__is_empty(r)) {\n return s;\n }\n if (wuffs_base__range_ii_u64__is_empty(s)) {\n return r;\n }\n r.min_inclusive = wuffs_base" + - "__u64__min(r.min_inclusive, s.min_inclusive);\n r.max_inclusive = wuffs_base__u64__max(r.max_inclusive, s.max_inclusive);\n return r;\n}\n\n" + + "// --------\n\ntypedef struct {\n uint64_t min_inclusive;\n uint64_t max_inclusive;\n} wuffs_base__range_ii_u64;\n\nstatic inline bool wuffs_base__range_ii_u64__is_empty(\n wuffs_base__range_ii_u64 r) {\n return r.min_inclusive > r.max_inclusive;\n}\n\nstatic inline bool wuffs_base__range_ii_u64__equals(\n wuffs_base__range_ii_u64 r,\n wuffs_base__range_ii_u64 s) {\n return (r.min_inclusive == s.min_inclusive &&\n r.max_inclusive == s.max_inclusive) ||\n (wuffs_base__range_ii_u64__is_empty(r) &&\n wuffs_base__range_ii_u64__is_empty(s));\n}\n\nstatic inline bool wuffs_base__range_ii_u64__contains(\n wuffs_base__range_ii_u64 r,\n uint64_t x) {\n return (r.min_inclusive <= x) && (x <= r.max_inclusive);\n}\n\nstatic inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64__intersection(\n wuffs_base__range_ii_u64 r,\n wuffs_base__range_ii_u64 s) {\n r.min_inclusive = wuffs_base__u64__max(r.min_inclusive, s.min_inclusive);\n r.max_inclusive = wuffs_base__u64__min(r.max_inclusive, s.max_inclu" + + "sive);\n return r;\n}\n\nstatic inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64__union(\n wuffs_base__range_ii_u64 r,\n wuffs_base__range_ii_u64 s) {\n if (wuffs_base__range_ii_u64__is_empty(r)) {\n return s;\n }\n if (wuffs_base__range_ii_u64__is_empty(s)) {\n return r;\n }\n r.min_inclusive = wuffs_base__u64__min(r.min_inclusive, s.min_inclusive);\n r.max_inclusive = wuffs_base__u64__max(r.max_inclusive, s.max_inclusive);\n return r;\n}\n\n" + "" + - "// --------\n\ntypedef struct {\n uint64_t min_inclusive;\n uint64_t max_exclusive;\n} wuffs_base__range_ie_u64;\n\nstatic inline bool wuffs_base__range_ie_u64__is_empty(\n wuffs_base__range_ie_u64 r) {\n return r.min_inclusive >= r.max_exclusive;\n}\n\nstatic inline bool wuffs_base__range_ie_u64__contains(\n wuffs_base__range_ie_u64 r,\n uint64_t x) {\n return (r.min_inclusive <= x) && (x < r.max_exclusive);\n}\n\nstatic inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64__intersection(\n wuffs_base__range_ie_u64 r,\n wuffs_base__range_ie_u64 s) {\n r.min_inclusive = wuffs_base__u64__max(r.min_inclusive, s.min_inclusive);\n r.max_exclusive = wuffs_base__u64__min(r.max_exclusive, s.max_exclusive);\n return r;\n}\n\nstatic inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64__union(\n wuffs_base__range_ie_u64 r,\n wuffs_base__range_ie_u64 s) {\n if (wuffs_base__range_ie_u64__is_empty(r)) {\n return s;\n }\n if (wuffs_base__range_ie_u64__is_empty(s)) {\n return r;\n }\n r.min_inclusive = wuffs_base" + - "__u64__min(r.min_inclusive, s.min_inclusive);\n r.max_exclusive = wuffs_base__u64__max(r.max_exclusive, s.max_exclusive);\n return r;\n}\n\nstatic inline uint64_t wuffs_base__range_ie_u64__length(\n wuffs_base__range_ie_u64 r) {\n return wuffs_base__u64__sat_sub(r.max_exclusive, r.min_inclusive);\n}\n\n" + + "// --------\n\ntypedef struct {\n uint64_t min_inclusive;\n uint64_t max_exclusive;\n} wuffs_base__range_ie_u64;\n\nstatic inline bool wuffs_base__range_ie_u64__is_empty(\n wuffs_base__range_ie_u64 r) {\n return r.min_inclusive >= r.max_exclusive;\n}\n\nstatic inline bool wuffs_base__range_ie_u64__equals(\n wuffs_base__range_ie_u64 r,\n wuffs_base__range_ie_u64 s) {\n return (r.min_inclusive == s.min_inclusive &&\n r.max_exclusive == s.max_exclusive) ||\n (wuffs_base__range_ie_u64__is_empty(r) &&\n wuffs_base__range_ie_u64__is_empty(s));\n}\n\nstatic inline bool wuffs_base__range_ie_u64__contains(\n wuffs_base__range_ie_u64 r,\n uint64_t x) {\n return (r.min_inclusive <= x) && (x < r.max_exclusive);\n}\n\nstatic inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64__intersection(\n wuffs_base__range_ie_u64 r,\n wuffs_base__range_ie_u64 s) {\n r.min_inclusive = wuffs_base__u64__max(r.min_inclusive, s.min_inclusive);\n r.max_exclusive = wuffs_base__u64__min(r.max_exclusive, s.max_exclu" + + "sive);\n return r;\n}\n\nstatic inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64__union(\n wuffs_base__range_ie_u64 r,\n wuffs_base__range_ie_u64 s) {\n if (wuffs_base__range_ie_u64__is_empty(r)) {\n return s;\n }\n if (wuffs_base__range_ie_u64__is_empty(s)) {\n return r;\n }\n r.min_inclusive = wuffs_base__u64__min(r.min_inclusive, s.min_inclusive);\n r.max_exclusive = wuffs_base__u64__max(r.max_exclusive, s.max_exclusive);\n return r;\n}\n\nstatic inline uint64_t wuffs_base__range_ie_u64__length(\n wuffs_base__range_ie_u64 r) {\n return wuffs_base__u64__sat_sub(r.max_exclusive, r.min_inclusive);\n}\n\n" + "" + - "// --------\n\n// wuffs_base__rect_ii_u32 is a rectangle (a 2-dimensional range) on the\n// integer grid. The \"ii\" means that the bounds are inclusive on the low end\n// and inclusive on the high end. It contains all points (x, y) such that\n// ((min_inclusive_x <= x) && (x <= max_inclusive_x)) and likewise for y.\n//\n// It is valid for min > max, in which case the rectangle is empty. There are\n// multiple representations of an empty rectangle.\n//\n// The X and Y axes increase right and down.\ntypedef struct {\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} wuffs_base__rect_ii_u32;\n\nstatic inline bool wuffs_base__rect_ii_u32__is_empty(\n wuffs_base__rect_ii_u32 r) {\n return (r.min_inclusive_x > r.max_inclusive_x) ||\n (r.min_inclusive_y > r.max_inclusive_y);\n}\n\nstatic inline bool wuffs_base__rect_ii_u32__contains(wuffs_base__rect_ii_u32 r,\n uint32_t x,\n " + - " uint32_t y) {\n return (r.min_inclusive_x <= x) && (x <= r.max_inclusive_x) &&\n (r.min_inclusive_y <= y) && (y <= r.max_inclusive_y);\n}\n\nstatic inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__intersection(\n wuffs_base__rect_ii_u32 r,\n wuffs_base__rect_ii_u32 s) {\n r.min_inclusive_x =\n wuffs_base__u32__max(r.min_inclusive_x, s.min_inclusive_x);\n r.min_inclusive_y =\n wuffs_base__u32__max(r.min_inclusive_y, s.min_inclusive_y);\n r.max_inclusive_x =\n wuffs_base__u32__min(r.max_inclusive_x, s.max_inclusive_x);\n r.max_inclusive_y =\n wuffs_base__u32__min(r.max_inclusive_y, s.max_inclusive_y);\n return r;\n}\n\nstatic inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union(\n wuffs_base__rect_ii_u32 r,\n wuffs_base__rect_ii_u32 s) {\n if (wuffs_base__rect_ii_u32__is_empty(r)) {\n return s;\n }\n if (wuffs_base__rect_ii_u32__is_empty(s)) {\n return r;\n }\n r.min_inclusive_x =\n wuffs_base__u32__min(r.min_inclusive_x, s.min_inclusive_x);\n r.min" + - "_inclusive_y =\n wuffs_base__u32__min(r.min_inclusive_y, s.min_inclusive_y);\n r.max_inclusive_x =\n wuffs_base__u32__max(r.max_inclusive_x, s.max_inclusive_x);\n r.max_inclusive_y =\n wuffs_base__u32__max(r.max_inclusive_y, s.max_inclusive_y);\n return r;\n}\n\n" + + "// --------\n\n// wuffs_base__rect_ii_u32 is a rectangle (a 2-dimensional range) on the\n// integer grid. The \"ii\" means that the bounds are inclusive on the low end\n// and inclusive on the high end. It contains all points (x, y) such that\n// ((min_inclusive_x <= x) && (x <= max_inclusive_x)) and likewise for y.\n//\n// It is valid for min > max, in which case the rectangle is empty. There are\n// multiple representations of an empty rectangle.\n//\n// The X and Y axes increase right and down.\ntypedef struct {\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} wuffs_base__rect_ii_u32;\n\nstatic inline bool wuffs_base__rect_ii_u32__is_empty(\n wuffs_base__rect_ii_u32 r) {\n return (r.min_inclusive_x > r.max_inclusive_x) ||\n (r.min_inclusive_y > r.max_inclusive_y);\n}\n\nstatic inline bool wuffs_base__rect_ii_u32__equals(wuffs_base__rect_ii_u32 r,\n wuffs_base__rect_ii_u32 s) {\n return (r.min_inclusive_" + + "x == s.min_inclusive_x &&\n r.min_inclusive_y == s.min_inclusive_y &&\n r.max_inclusive_x == s.max_inclusive_x &&\n r.max_inclusive_y == s.max_inclusive_y) ||\n (wuffs_base__rect_ii_u32__is_empty(r) &&\n wuffs_base__rect_ii_u32__is_empty(s));\n}\n\nstatic inline bool wuffs_base__rect_ii_u32__contains(wuffs_base__rect_ii_u32 r,\n uint32_t x,\n uint32_t y) {\n return (r.min_inclusive_x <= x) && (x <= r.max_inclusive_x) &&\n (r.min_inclusive_y <= y) && (y <= r.max_inclusive_y);\n}\n\nstatic inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__intersection(\n wuffs_base__rect_ii_u32 r,\n wuffs_base__rect_ii_u32 s) {\n r.min_inclusive_x =\n wuffs_base__u32__max(r.min_inclusive_x, s.min_inclusive_x);\n r.min_inclusive_y =\n wuffs_base__u32__max(r.min_inclusive_y, s.min_inclusive_y);\n r.max_inclusive_x =\n wuffs_base__u32__min(r.max_inclusive_x, s.max_inclu" + + "sive_x);\n r.max_inclusive_y =\n wuffs_base__u32__min(r.max_inclusive_y, s.max_inclusive_y);\n return r;\n}\n\nstatic inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union(\n wuffs_base__rect_ii_u32 r,\n wuffs_base__rect_ii_u32 s) {\n if (wuffs_base__rect_ii_u32__is_empty(r)) {\n return s;\n }\n if (wuffs_base__rect_ii_u32__is_empty(s)) {\n return r;\n }\n r.min_inclusive_x =\n wuffs_base__u32__min(r.min_inclusive_x, s.min_inclusive_x);\n r.min_inclusive_y =\n wuffs_base__u32__min(r.min_inclusive_y, s.min_inclusive_y);\n r.max_inclusive_x =\n wuffs_base__u32__max(r.max_inclusive_x, s.max_inclusive_x);\n r.max_inclusive_y =\n wuffs_base__u32__max(r.max_inclusive_y, s.max_inclusive_y);\n return r;\n}\n\n" + "" + - "// --------\n\n// wuffs_base__rect_ie_u32 is a rectangle (a 2-dimensional range) on the\n// integer grid. The \"ie\" means that the bounds are inclusive on the low end\n// and exclusive on the high end. It contains all points (x, y) such that\n// ((min_inclusive_x <= x) && (x < max_exclusive_x)) and likewise for y.\n//\n// It is valid for min >= max, in which case the rectangle is empty. There are\n// multiple representations of an empty rectangle, including a value with all\n// fields zero.\n//\n// The X and Y axes increase right and down.\ntypedef struct {\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} wuffs_base__rect_ie_u32;\n\nstatic inline bool wuffs_base__rect_ie_u32__is_empty(\n wuffs_base__rect_ie_u32 r) {\n return (r.min_inclusive_x >= r.max_exclusive_x) ||\n (r.min_inclusive_y >= r.max_exclusive_y);\n}\n\nstatic inline bool wuffs_base__rect_ie_u32__contains(wuffs_base__rect_ie_u32 r,\n uint32" + - "_t x,\n uint32_t y) {\n return (r.min_inclusive_x <= x) && (x < r.max_exclusive_x) &&\n (r.min_inclusive_y <= y) && (y < r.max_exclusive_y);\n}\n\nstatic inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32__intersection(\n wuffs_base__rect_ie_u32 r,\n wuffs_base__rect_ie_u32 s) {\n r.min_inclusive_x =\n wuffs_base__u32__max(r.min_inclusive_x, s.min_inclusive_x);\n r.min_inclusive_y =\n wuffs_base__u32__max(r.min_inclusive_y, s.min_inclusive_y);\n r.max_exclusive_x =\n wuffs_base__u32__min(r.max_exclusive_x, s.max_exclusive_x);\n r.max_exclusive_y =\n wuffs_base__u32__min(r.max_exclusive_y, s.max_exclusive_y);\n return r;\n}\n\nstatic inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32__union(\n wuffs_base__rect_ie_u32 r,\n wuffs_base__rect_ie_u32 s) {\n if (wuffs_base__rect_ie_u32__is_empty(r)) {\n return s;\n }\n if (wuffs_base__rect_ie_u32__is_empty(s)) {\n return r;\n }\n r.min_inclusive_x =\n wuffs_base__u32__min(r.m" + - "in_inclusive_x, s.min_inclusive_x);\n r.min_inclusive_y =\n wuffs_base__u32__min(r.min_inclusive_y, s.min_inclusive_y);\n r.max_exclusive_x =\n wuffs_base__u32__max(r.max_exclusive_x, s.max_exclusive_x);\n r.max_exclusive_y =\n wuffs_base__u32__max(r.max_exclusive_y, s.max_exclusive_y);\n return r;\n}\n\nstatic inline uint32_t wuffs_base__rect_ie_u32__width(\n wuffs_base__rect_ie_u32 r) {\n return wuffs_base__u32__sat_sub(r.max_exclusive_x, r.min_inclusive_x);\n}\n\nstatic inline uint32_t wuffs_base__rect_ie_u32__height(\n wuffs_base__rect_ie_u32 r) {\n return wuffs_base__u32__sat_sub(r.max_exclusive_y, r.min_inclusive_y);\n}\n\n" + + "// --------\n\n// wuffs_base__rect_ie_u32 is a rectangle (a 2-dimensional range) on the\n// integer grid. The \"ie\" means that the bounds are inclusive on the low end\n// and exclusive on the high end. It contains all points (x, y) such that\n// ((min_inclusive_x <= x) && (x < max_exclusive_x)) and likewise for y.\n//\n// It is valid for min >= max, in which case the rectangle is empty. There are\n// multiple representations of an empty rectangle, including a value with all\n// fields zero.\n//\n// The X and Y axes increase right and down.\ntypedef struct {\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} wuffs_base__rect_ie_u32;\n\nstatic inline bool wuffs_base__rect_ie_u32__is_empty(\n wuffs_base__rect_ie_u32 r) {\n return (r.min_inclusive_x >= r.max_exclusive_x) ||\n (r.min_inclusive_y >= r.max_exclusive_y);\n}\n\nstatic inline bool wuffs_base__rect_ie_u32__equals(wuffs_base__rect_ie_u32 r,\n wuffs_base" + + "__rect_ie_u32 s) {\n return (r.min_inclusive_x == s.min_inclusive_x &&\n r.min_inclusive_y == s.min_inclusive_y &&\n r.max_exclusive_x == s.max_exclusive_x &&\n r.max_exclusive_y == s.max_exclusive_y) ||\n (wuffs_base__rect_ie_u32__is_empty(r) &&\n wuffs_base__rect_ie_u32__is_empty(s));\n}\n\nstatic inline bool wuffs_base__rect_ie_u32__contains(wuffs_base__rect_ie_u32 r,\n uint32_t x,\n uint32_t y) {\n return (r.min_inclusive_x <= x) && (x < r.max_exclusive_x) &&\n (r.min_inclusive_y <= y) && (y < r.max_exclusive_y);\n}\n\nstatic inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32__intersection(\n wuffs_base__rect_ie_u32 r,\n wuffs_base__rect_ie_u32 s) {\n r.min_inclusive_x =\n wuffs_base__u32__max(r.min_inclusive_x, s.min_inclusive_x);\n r.min_inclusive_y =\n wuffs_base__u32__max(r.min_inclusive_y, s.min_inclusive_y);\n r.max_exclusive_x =\n wuffs_ba" + + "se__u32__min(r.max_exclusive_x, s.max_exclusive_x);\n r.max_exclusive_y =\n wuffs_base__u32__min(r.max_exclusive_y, s.max_exclusive_y);\n return r;\n}\n\nstatic inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32__union(\n wuffs_base__rect_ie_u32 r,\n wuffs_base__rect_ie_u32 s) {\n if (wuffs_base__rect_ie_u32__is_empty(r)) {\n return s;\n }\n if (wuffs_base__rect_ie_u32__is_empty(s)) {\n return r;\n }\n r.min_inclusive_x =\n wuffs_base__u32__min(r.min_inclusive_x, s.min_inclusive_x);\n r.min_inclusive_y =\n wuffs_base__u32__min(r.min_inclusive_y, s.min_inclusive_y);\n r.max_exclusive_x =\n wuffs_base__u32__max(r.max_exclusive_x, s.max_exclusive_x);\n r.max_exclusive_y =\n wuffs_base__u32__max(r.max_exclusive_y, s.max_exclusive_y);\n return r;\n}\n\nstatic inline uint32_t wuffs_base__rect_ie_u32__width(\n wuffs_base__rect_ie_u32 r) {\n return wuffs_base__u32__sat_sub(r.max_exclusive_x, r.min_inclusive_x);\n}\n\nstatic inline uint32_t wuffs_base__rect_ie_u32__height(\n wuffs_base__rect" + + "_ie_u32 r) {\n return wuffs_base__u32__sat_sub(r.max_exclusive_y, r.min_inclusive_y);\n}\n\n" + "" + "// ---------------- I/O\n\n// wuffs_base__io_buffer is a 1-dimensional buffer (a pointer and length), plus\n// additional indexes into that buffer, plus an opened / closed flag.\n//\n// A value with all fields NULL or zero is a valid, empty buffer.\ntypedef struct {\n uint8_t* ptr; // Pointer.\n size_t len; // Length.\n size_t wi; // Write index. Invariant: wi <= len.\n size_t ri; // Read index. Invariant: ri <= wi.\n bool closed; // No further writes are expected.\n} wuffs_base__io_buffer;\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 wuffs_base__io_buffer* buf;\n // The bounds values are typically NULL, when created by the Wuffs public\n // API. NULL means that the callee substitutes the implicit bounds derived\n // from buf.\n uint8_t* bounds[2];\n } private_impl;\n} wuffs_base__io_reader;\n\ntypedef struct {\n // Do not access the private_impl's fields directly. There is no API/A" + "BI\n // compatibility or safety guarantee if you do so.\n struct {\n wuffs_base__io_buffer* buf;\n // The bounds values are typically NULL, when created by the Wuffs public\n // API. NULL means that the callee substitutes the implicit bounds derived\n // from buf.\n uint8_t* bounds[2];\n } private_impl;\n} wuffs_base__io_writer;\n\nstatic inline wuffs_base__slice_u8 wuffs_base__io_buffer__readable(\n wuffs_base__io_buffer* buf) {\n if (buf) {\n return ((wuffs_base__slice_u8){\n .ptr = buf->ptr + buf->ri,\n .len = buf->wi - buf->ri,\n });\n }\n return ((wuffs_base__slice_u8){});\n}\n\nstatic inline wuffs_base__io_reader wuffs_base__io_buffer__reader(\n wuffs_base__io_buffer* buf) {\n wuffs_base__io_reader ret = ((wuffs_base__io_reader){});\n ret.private_impl.buf = buf;\n return ret;\n}\n\nstatic inline wuffs_base__slice_u8 wuffs_base__io_buffer__writable(\n wuffs_base__io_buffer* buf) {\n if (buf) {\n return ((wuffs_base__slice_u8){\n .ptr = buf->ptr + buf->wi,\n .len = buf" + @@ -77,10 +79,10 @@ const baseHeader = "" + " wuffs_base__image_config* c) {\n return c ? c->private_impl.num_loops : 0;\n}\n\n// TODO: this is the right API for planar (not packed) pixbufs? Should it allow\n// decoding into a color model different from the format's intrinsic one? For\n// example, decoding a JPEG image straight to RGBA instead of to YCbCr?\nstatic inline size_t wuffs_base__image_config__pixbuf_size(\n wuffs_base__image_config* c) {\n if (c) {\n uint64_t wh =\n ((uint64_t)c->private_impl.width) * ((uint64_t)c->private_impl.height);\n // TODO: handle things other than 1 byte per pixel.\n return (size_t)wh;\n }\n return 0;\n}\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 wuffs_base__image_config config;\n uint32_t loop_count; // 0-based count of the current loop.\n wuffs_base__pixel_buffer pixbuf;\n // TODO: color spaces.\n bool dirty_palette;\n wuffs_base__rect_ie_u32 dirty_rect;\n wuffs_base__flicks duration;\n uint8_t palette[1024];\n } private_impl;\n} wuffs_base__image_buffer;\n\nstatic inline void wuffs_base__image_buffer__set_from_pixbuf(\n wuffs_base__image_buffer* b,\n wuffs_base__image_config config,\n wuffs_base__pixel_buffer pixbuf) {\n if (!b) {\n return;\n }\n *b = ((wuffs_base__image_buffer){});\n b->private_impl.config = config;\n b->private_impl.pixbuf = pixbuf;\n}\n\n// TODO: Should this function return bool? An error type?\nstatic inline void wuffs_base__image_buffer__set_from_slice(\n wuffs_base__image_buffer* b,\n wuffs_base__image_config config,\n wuffs_base__sli" + - "ce_u8 pixbuf_memory) {\n if (!b) {\n return;\n }\n *b = ((wuffs_base__image_buffer){});\n // TODO: don't assume 1 byte per pixel. Don't assume packed.\n uint64_t wh = ((uint64_t)config.private_impl.width) *\n ((uint64_t)config.private_impl.height);\n if (wh > pixbuf_memory.len) {\n return;\n }\n b->private_impl.config = config;\n wuffs_base__table_u8* tab = &b->private_impl.pixbuf.planes[0];\n tab->ptr = pixbuf_memory.ptr;\n tab->width = config.private_impl.width;\n tab->height = config.private_impl.height;\n tab->stride = config.private_impl.width;\n}\n\nstatic inline void wuffs_base__image_buffer__update(\n wuffs_base__image_buffer* b,\n bool dirty_palette,\n wuffs_base__rect_ie_u32 dirty_rect,\n wuffs_base__flicks duration,\n uint8_t* palette_ptr,\n size_t palette_len) {\n if (!b) {\n return;\n }\n b->private_impl.dirty_palette = dirty_palette;\n b->private_impl.dirty_rect = dirty_rect;\n b->private_impl.duration = duration;\n if (palette_ptr) {\n memmove(b->private_impl.pale" + - "tte, palette_ptr,\n palette_len <= 1024 ? palette_len : 1024);\n }\n}\n\n// wuffs_base__image_buffer__loop returns whether the image decoder should loop\n// back to the beginning of the animation, assuming that we've reached the end\n// of the encoded stream. If so, it increments b's count of the animation loops\n// played so far.\nstatic inline bool wuffs_base__image_buffer__loop(wuffs_base__image_buffer* b) {\n if (!b) {\n return false;\n }\n uint32_t n = b->private_impl.config.private_impl.num_loops;\n if (n == 0) {\n return true;\n }\n if (b->private_impl.loop_count < n - 1) {\n b->private_impl.loop_count++;\n return true;\n }\n return false;\n}\n\n// wuffs_base__image_buffer__dirty_palette returns whether this frame's palette\n// differs from the previous frame. It is conservative and may return false\n// positives (but never false negatives).\nstatic inline bool wuffs_base__image_buffer__dirty_palette(\n wuffs_base__image_buffer* b) {\n return b && b->private_impl.dirty_palette;\n}\n\n// wuffs_base_" + - "_image_buffer__dirty_rect returns an upper bound for what part of\n// this frame's pixels differs from the previous frame.\nstatic inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__dirty_rect(\n wuffs_base__image_buffer* b) {\n return b ? b->private_impl.dirty_rect : ((wuffs_base__rect_ie_u32){0});\n}\n\n// wuffs_base__image_buffer__duration returns the amount of time to display\n// this frame. Zero means to display forever - a still (non-animated) image.\nstatic inline wuffs_base__flicks wuffs_base__image_buffer__duration(\n wuffs_base__image_buffer* b) {\n return b ? b->private_impl.duration : 0;\n}\n\n// wuffs_base__image_buffer__palette returns the palette that the pixel data\n// can index. The backing array is inside b and has length 1024.\nstatic inline uint8_t* wuffs_base__image_buffer__palette(\n wuffs_base__image_buffer* b) {\n return b ? b->private_impl.palette : NULL;\n}\n\nstatic inline wuffs_base__table_u8 wuffs_base__image_buffer__plane(\n wuffs_base__image_buffer* b,\n uint32_t p) {\n return " + - "(b && (p < WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX))\n ? b->private_impl.pixbuf.planes[p]\n : ((wuffs_base__table_u8){});\n}\n\n#endif // WUFFS_BASE_HEADER_H\n" + + "ce_u8 pixbuf_memory) {\n if (!b) {\n return;\n }\n *b = ((wuffs_base__image_buffer){});\n // TODO: don't assume 1 byte per pixel. Don't assume packed.\n uint64_t wh = ((uint64_t)config.private_impl.width) *\n ((uint64_t)config.private_impl.height);\n if (wh > pixbuf_memory.len) {\n return;\n }\n b->private_impl.config = config;\n wuffs_base__table_u8* tab = &b->private_impl.pixbuf.planes[0];\n tab->ptr = pixbuf_memory.ptr;\n tab->width = config.private_impl.width;\n tab->height = config.private_impl.height;\n tab->stride = config.private_impl.width;\n}\n\nstatic inline void wuffs_base__image_buffer__update(\n wuffs_base__image_buffer* b,\n bool dirty_palette,\n wuffs_base__rect_ie_u32 dirty_rect,\n wuffs_base__flicks duration,\n wuffs_base__slice_u8 palette) {\n if (!b) {\n return;\n }\n b->private_impl.dirty_palette = dirty_palette;\n b->private_impl.dirty_rect = dirty_rect;\n b->private_impl.duration = duration;\n if (palette.ptr) {\n memmove(b->private_impl.palette, palette.ptr" + + ",\n palette.len <= 1024 ? palette.len : 1024);\n }\n}\n\n// wuffs_base__image_buffer__loop returns whether the image decoder should loop\n// back to the beginning of the animation, assuming that we've reached the end\n// of the encoded stream. If so, it increments b's count of the animation loops\n// played so far.\nstatic inline bool wuffs_base__image_buffer__loop(wuffs_base__image_buffer* b) {\n if (!b) {\n return false;\n }\n uint32_t n = b->private_impl.config.private_impl.num_loops;\n if (n == 0) {\n return true;\n }\n if (b->private_impl.loop_count < n - 1) {\n b->private_impl.loop_count++;\n return true;\n }\n return false;\n}\n\n// wuffs_base__image_buffer__dirty_palette returns whether this frame's palette\n// differs from the previous frame. It is conservative and may return false\n// positives (but never false negatives).\nstatic inline bool wuffs_base__image_buffer__dirty_palette(\n wuffs_base__image_buffer* b) {\n return b && b->private_impl.dirty_palette;\n}\n\n// wuffs_base__image_buffer__d" + + "irty_rect returns an upper bound for what part of\n// this frame's pixels differs from the previous frame.\nstatic inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__dirty_rect(\n wuffs_base__image_buffer* b) {\n return b ? b->private_impl.dirty_rect : ((wuffs_base__rect_ie_u32){0});\n}\n\n// wuffs_base__image_buffer__duration returns the amount of time to display\n// this frame. Zero means to display forever - a still (non-animated) image.\nstatic inline wuffs_base__flicks wuffs_base__image_buffer__duration(\n wuffs_base__image_buffer* b) {\n return b ? b->private_impl.duration : 0;\n}\n\n// wuffs_base__image_buffer__palette returns the palette that the pixel data\n// can index. The backing array is inside b and has length 1024.\nstatic inline uint8_t* wuffs_base__image_buffer__palette(\n wuffs_base__image_buffer* b) {\n return b ? b->private_impl.palette : NULL;\n}\n\nstatic inline wuffs_base__table_u8 wuffs_base__image_buffer__plane(\n wuffs_base__image_buffer* b,\n uint32_t p) {\n return (b && (p < WUFFS" + + "_BASE__PIXEL_FORMAT__NUM_PLANES_MAX))\n ? b->private_impl.pixbuf.planes[p]\n : ((wuffs_base__table_u8){});\n}\n\n#endif // WUFFS_BASE_HEADER_H\n" + "" const baseImpl = "" + diff --git a/gen/c/std/adler32.c b/gen/c/std/adler32.c index a20c965a..c3a3db2a 100644 --- a/gen/c/std/adler32.c +++ b/gen/c/std/adler32.c @@ -256,6 +256,15 @@ static inline bool wuffs_base__range_ii_u32__is_empty( return r.min_inclusive > r.max_inclusive; } +static inline bool wuffs_base__range_ii_u32__equals( + wuffs_base__range_ii_u32 r, + wuffs_base__range_ii_u32 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_inclusive == s.max_inclusive) || + (wuffs_base__range_ii_u32__is_empty(r) && + wuffs_base__range_ii_u32__is_empty(s)); +} + static inline bool wuffs_base__range_ii_u32__contains( wuffs_base__range_ii_u32 r, uint32_t x) { @@ -296,6 +305,15 @@ static inline bool wuffs_base__range_ie_u32__is_empty( return r.min_inclusive >= r.max_exclusive; } +static inline bool wuffs_base__range_ie_u32__equals( + wuffs_base__range_ie_u32 r, + wuffs_base__range_ie_u32 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_exclusive == s.max_exclusive) || + (wuffs_base__range_ie_u32__is_empty(r) && + wuffs_base__range_ie_u32__is_empty(s)); +} + static inline bool wuffs_base__range_ie_u32__contains( wuffs_base__range_ie_u32 r, uint32_t x) { @@ -341,6 +359,15 @@ static inline bool wuffs_base__range_ii_u64__is_empty( return r.min_inclusive > r.max_inclusive; } +static inline bool wuffs_base__range_ii_u64__equals( + wuffs_base__range_ii_u64 r, + wuffs_base__range_ii_u64 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_inclusive == s.max_inclusive) || + (wuffs_base__range_ii_u64__is_empty(r) && + wuffs_base__range_ii_u64__is_empty(s)); +} + static inline bool wuffs_base__range_ii_u64__contains( wuffs_base__range_ii_u64 r, uint64_t x) { @@ -381,6 +408,15 @@ static inline bool wuffs_base__range_ie_u64__is_empty( return r.min_inclusive >= r.max_exclusive; } +static inline bool wuffs_base__range_ie_u64__equals( + wuffs_base__range_ie_u64 r, + wuffs_base__range_ie_u64 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_exclusive == s.max_exclusive) || + (wuffs_base__range_ie_u64__is_empty(r) && + wuffs_base__range_ie_u64__is_empty(s)); +} + static inline bool wuffs_base__range_ie_u64__contains( wuffs_base__range_ie_u64 r, uint64_t x) { @@ -438,6 +474,16 @@ static inline bool wuffs_base__rect_ii_u32__is_empty( (r.min_inclusive_y > r.max_inclusive_y); } +static inline bool wuffs_base__rect_ii_u32__equals(wuffs_base__rect_ii_u32 r, + wuffs_base__rect_ii_u32 s) { + return (r.min_inclusive_x == s.min_inclusive_x && + r.min_inclusive_y == s.min_inclusive_y && + r.max_inclusive_x == s.max_inclusive_x && + r.max_inclusive_y == s.max_inclusive_y) || + (wuffs_base__rect_ii_u32__is_empty(r) && + wuffs_base__rect_ii_u32__is_empty(s)); +} + static inline bool wuffs_base__rect_ii_u32__contains(wuffs_base__rect_ii_u32 r, uint32_t x, uint32_t y) { @@ -504,6 +550,16 @@ static inline bool wuffs_base__rect_ie_u32__is_empty( (r.min_inclusive_y >= r.max_exclusive_y); } +static inline bool wuffs_base__rect_ie_u32__equals(wuffs_base__rect_ie_u32 r, + wuffs_base__rect_ie_u32 s) { + return (r.min_inclusive_x == s.min_inclusive_x && + r.min_inclusive_y == s.min_inclusive_y && + r.max_exclusive_x == s.max_exclusive_x && + r.max_exclusive_y == s.max_exclusive_y) || + (wuffs_base__rect_ie_u32__is_empty(r) && + wuffs_base__rect_ie_u32__is_empty(s)); +} + static inline bool wuffs_base__rect_ie_u32__contains(wuffs_base__rect_ie_u32 r, uint32_t x, uint32_t y) { @@ -1030,17 +1086,16 @@ static inline void wuffs_base__image_buffer__update( bool dirty_palette, wuffs_base__rect_ie_u32 dirty_rect, wuffs_base__flicks duration, - uint8_t* palette_ptr, - size_t palette_len) { + wuffs_base__slice_u8 palette) { if (!b) { return; } b->private_impl.dirty_palette = dirty_palette; b->private_impl.dirty_rect = dirty_rect; b->private_impl.duration = duration; - if (palette_ptr) { - memmove(b->private_impl.palette, palette_ptr, - palette_len <= 1024 ? palette_len : 1024); + if (palette.ptr) { + memmove(b->private_impl.palette, palette.ptr, + palette.len <= 1024 ? palette.len : 1024); } } diff --git a/gen/c/std/crc32.c b/gen/c/std/crc32.c index 3d145cf7..3ba9bbfb 100644 --- a/gen/c/std/crc32.c +++ b/gen/c/std/crc32.c @@ -256,6 +256,15 @@ static inline bool wuffs_base__range_ii_u32__is_empty( return r.min_inclusive > r.max_inclusive; } +static inline bool wuffs_base__range_ii_u32__equals( + wuffs_base__range_ii_u32 r, + wuffs_base__range_ii_u32 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_inclusive == s.max_inclusive) || + (wuffs_base__range_ii_u32__is_empty(r) && + wuffs_base__range_ii_u32__is_empty(s)); +} + static inline bool wuffs_base__range_ii_u32__contains( wuffs_base__range_ii_u32 r, uint32_t x) { @@ -296,6 +305,15 @@ static inline bool wuffs_base__range_ie_u32__is_empty( return r.min_inclusive >= r.max_exclusive; } +static inline bool wuffs_base__range_ie_u32__equals( + wuffs_base__range_ie_u32 r, + wuffs_base__range_ie_u32 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_exclusive == s.max_exclusive) || + (wuffs_base__range_ie_u32__is_empty(r) && + wuffs_base__range_ie_u32__is_empty(s)); +} + static inline bool wuffs_base__range_ie_u32__contains( wuffs_base__range_ie_u32 r, uint32_t x) { @@ -341,6 +359,15 @@ static inline bool wuffs_base__range_ii_u64__is_empty( return r.min_inclusive > r.max_inclusive; } +static inline bool wuffs_base__range_ii_u64__equals( + wuffs_base__range_ii_u64 r, + wuffs_base__range_ii_u64 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_inclusive == s.max_inclusive) || + (wuffs_base__range_ii_u64__is_empty(r) && + wuffs_base__range_ii_u64__is_empty(s)); +} + static inline bool wuffs_base__range_ii_u64__contains( wuffs_base__range_ii_u64 r, uint64_t x) { @@ -381,6 +408,15 @@ static inline bool wuffs_base__range_ie_u64__is_empty( return r.min_inclusive >= r.max_exclusive; } +static inline bool wuffs_base__range_ie_u64__equals( + wuffs_base__range_ie_u64 r, + wuffs_base__range_ie_u64 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_exclusive == s.max_exclusive) || + (wuffs_base__range_ie_u64__is_empty(r) && + wuffs_base__range_ie_u64__is_empty(s)); +} + static inline bool wuffs_base__range_ie_u64__contains( wuffs_base__range_ie_u64 r, uint64_t x) { @@ -438,6 +474,16 @@ static inline bool wuffs_base__rect_ii_u32__is_empty( (r.min_inclusive_y > r.max_inclusive_y); } +static inline bool wuffs_base__rect_ii_u32__equals(wuffs_base__rect_ii_u32 r, + wuffs_base__rect_ii_u32 s) { + return (r.min_inclusive_x == s.min_inclusive_x && + r.min_inclusive_y == s.min_inclusive_y && + r.max_inclusive_x == s.max_inclusive_x && + r.max_inclusive_y == s.max_inclusive_y) || + (wuffs_base__rect_ii_u32__is_empty(r) && + wuffs_base__rect_ii_u32__is_empty(s)); +} + static inline bool wuffs_base__rect_ii_u32__contains(wuffs_base__rect_ii_u32 r, uint32_t x, uint32_t y) { @@ -504,6 +550,16 @@ static inline bool wuffs_base__rect_ie_u32__is_empty( (r.min_inclusive_y >= r.max_exclusive_y); } +static inline bool wuffs_base__rect_ie_u32__equals(wuffs_base__rect_ie_u32 r, + wuffs_base__rect_ie_u32 s) { + return (r.min_inclusive_x == s.min_inclusive_x && + r.min_inclusive_y == s.min_inclusive_y && + r.max_exclusive_x == s.max_exclusive_x && + r.max_exclusive_y == s.max_exclusive_y) || + (wuffs_base__rect_ie_u32__is_empty(r) && + wuffs_base__rect_ie_u32__is_empty(s)); +} + static inline bool wuffs_base__rect_ie_u32__contains(wuffs_base__rect_ie_u32 r, uint32_t x, uint32_t y) { @@ -1030,17 +1086,16 @@ static inline void wuffs_base__image_buffer__update( bool dirty_palette, wuffs_base__rect_ie_u32 dirty_rect, wuffs_base__flicks duration, - uint8_t* palette_ptr, - size_t palette_len) { + wuffs_base__slice_u8 palette) { if (!b) { return; } b->private_impl.dirty_palette = dirty_palette; b->private_impl.dirty_rect = dirty_rect; b->private_impl.duration = duration; - if (palette_ptr) { - memmove(b->private_impl.palette, palette_ptr, - palette_len <= 1024 ? palette_len : 1024); + if (palette.ptr) { + memmove(b->private_impl.palette, palette.ptr, + palette.len <= 1024 ? palette.len : 1024); } } diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index 5c5f5b28..fd5d1a80 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -256,6 +256,15 @@ static inline bool wuffs_base__range_ii_u32__is_empty( return r.min_inclusive > r.max_inclusive; } +static inline bool wuffs_base__range_ii_u32__equals( + wuffs_base__range_ii_u32 r, + wuffs_base__range_ii_u32 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_inclusive == s.max_inclusive) || + (wuffs_base__range_ii_u32__is_empty(r) && + wuffs_base__range_ii_u32__is_empty(s)); +} + static inline bool wuffs_base__range_ii_u32__contains( wuffs_base__range_ii_u32 r, uint32_t x) { @@ -296,6 +305,15 @@ static inline bool wuffs_base__range_ie_u32__is_empty( return r.min_inclusive >= r.max_exclusive; } +static inline bool wuffs_base__range_ie_u32__equals( + wuffs_base__range_ie_u32 r, + wuffs_base__range_ie_u32 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_exclusive == s.max_exclusive) || + (wuffs_base__range_ie_u32__is_empty(r) && + wuffs_base__range_ie_u32__is_empty(s)); +} + static inline bool wuffs_base__range_ie_u32__contains( wuffs_base__range_ie_u32 r, uint32_t x) { @@ -341,6 +359,15 @@ static inline bool wuffs_base__range_ii_u64__is_empty( return r.min_inclusive > r.max_inclusive; } +static inline bool wuffs_base__range_ii_u64__equals( + wuffs_base__range_ii_u64 r, + wuffs_base__range_ii_u64 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_inclusive == s.max_inclusive) || + (wuffs_base__range_ii_u64__is_empty(r) && + wuffs_base__range_ii_u64__is_empty(s)); +} + static inline bool wuffs_base__range_ii_u64__contains( wuffs_base__range_ii_u64 r, uint64_t x) { @@ -381,6 +408,15 @@ static inline bool wuffs_base__range_ie_u64__is_empty( return r.min_inclusive >= r.max_exclusive; } +static inline bool wuffs_base__range_ie_u64__equals( + wuffs_base__range_ie_u64 r, + wuffs_base__range_ie_u64 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_exclusive == s.max_exclusive) || + (wuffs_base__range_ie_u64__is_empty(r) && + wuffs_base__range_ie_u64__is_empty(s)); +} + static inline bool wuffs_base__range_ie_u64__contains( wuffs_base__range_ie_u64 r, uint64_t x) { @@ -438,6 +474,16 @@ static inline bool wuffs_base__rect_ii_u32__is_empty( (r.min_inclusive_y > r.max_inclusive_y); } +static inline bool wuffs_base__rect_ii_u32__equals(wuffs_base__rect_ii_u32 r, + wuffs_base__rect_ii_u32 s) { + return (r.min_inclusive_x == s.min_inclusive_x && + r.min_inclusive_y == s.min_inclusive_y && + r.max_inclusive_x == s.max_inclusive_x && + r.max_inclusive_y == s.max_inclusive_y) || + (wuffs_base__rect_ii_u32__is_empty(r) && + wuffs_base__rect_ii_u32__is_empty(s)); +} + static inline bool wuffs_base__rect_ii_u32__contains(wuffs_base__rect_ii_u32 r, uint32_t x, uint32_t y) { @@ -504,6 +550,16 @@ static inline bool wuffs_base__rect_ie_u32__is_empty( (r.min_inclusive_y >= r.max_exclusive_y); } +static inline bool wuffs_base__rect_ie_u32__equals(wuffs_base__rect_ie_u32 r, + wuffs_base__rect_ie_u32 s) { + return (r.min_inclusive_x == s.min_inclusive_x && + r.min_inclusive_y == s.min_inclusive_y && + r.max_exclusive_x == s.max_exclusive_x && + r.max_exclusive_y == s.max_exclusive_y) || + (wuffs_base__rect_ie_u32__is_empty(r) && + wuffs_base__rect_ie_u32__is_empty(s)); +} + static inline bool wuffs_base__rect_ie_u32__contains(wuffs_base__rect_ie_u32 r, uint32_t x, uint32_t y) { @@ -1030,17 +1086,16 @@ static inline void wuffs_base__image_buffer__update( bool dirty_palette, wuffs_base__rect_ie_u32 dirty_rect, wuffs_base__flicks duration, - uint8_t* palette_ptr, - size_t palette_len) { + wuffs_base__slice_u8 palette) { if (!b) { return; } b->private_impl.dirty_palette = dirty_palette; b->private_impl.dirty_rect = dirty_rect; b->private_impl.duration = duration; - if (palette_ptr) { - memmove(b->private_impl.palette, palette_ptr, - palette_len <= 1024 ? palette_len : 1024); + if (palette.ptr) { + memmove(b->private_impl.palette, palette.ptr, + palette.len <= 1024 ? palette.len : 1024); } } diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index b8f340b9..1539a8a7 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -256,6 +256,15 @@ static inline bool wuffs_base__range_ii_u32__is_empty( return r.min_inclusive > r.max_inclusive; } +static inline bool wuffs_base__range_ii_u32__equals( + wuffs_base__range_ii_u32 r, + wuffs_base__range_ii_u32 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_inclusive == s.max_inclusive) || + (wuffs_base__range_ii_u32__is_empty(r) && + wuffs_base__range_ii_u32__is_empty(s)); +} + static inline bool wuffs_base__range_ii_u32__contains( wuffs_base__range_ii_u32 r, uint32_t x) { @@ -296,6 +305,15 @@ static inline bool wuffs_base__range_ie_u32__is_empty( return r.min_inclusive >= r.max_exclusive; } +static inline bool wuffs_base__range_ie_u32__equals( + wuffs_base__range_ie_u32 r, + wuffs_base__range_ie_u32 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_exclusive == s.max_exclusive) || + (wuffs_base__range_ie_u32__is_empty(r) && + wuffs_base__range_ie_u32__is_empty(s)); +} + static inline bool wuffs_base__range_ie_u32__contains( wuffs_base__range_ie_u32 r, uint32_t x) { @@ -341,6 +359,15 @@ static inline bool wuffs_base__range_ii_u64__is_empty( return r.min_inclusive > r.max_inclusive; } +static inline bool wuffs_base__range_ii_u64__equals( + wuffs_base__range_ii_u64 r, + wuffs_base__range_ii_u64 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_inclusive == s.max_inclusive) || + (wuffs_base__range_ii_u64__is_empty(r) && + wuffs_base__range_ii_u64__is_empty(s)); +} + static inline bool wuffs_base__range_ii_u64__contains( wuffs_base__range_ii_u64 r, uint64_t x) { @@ -381,6 +408,15 @@ static inline bool wuffs_base__range_ie_u64__is_empty( return r.min_inclusive >= r.max_exclusive; } +static inline bool wuffs_base__range_ie_u64__equals( + wuffs_base__range_ie_u64 r, + wuffs_base__range_ie_u64 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_exclusive == s.max_exclusive) || + (wuffs_base__range_ie_u64__is_empty(r) && + wuffs_base__range_ie_u64__is_empty(s)); +} + static inline bool wuffs_base__range_ie_u64__contains( wuffs_base__range_ie_u64 r, uint64_t x) { @@ -438,6 +474,16 @@ static inline bool wuffs_base__rect_ii_u32__is_empty( (r.min_inclusive_y > r.max_inclusive_y); } +static inline bool wuffs_base__rect_ii_u32__equals(wuffs_base__rect_ii_u32 r, + wuffs_base__rect_ii_u32 s) { + return (r.min_inclusive_x == s.min_inclusive_x && + r.min_inclusive_y == s.min_inclusive_y && + r.max_inclusive_x == s.max_inclusive_x && + r.max_inclusive_y == s.max_inclusive_y) || + (wuffs_base__rect_ii_u32__is_empty(r) && + wuffs_base__rect_ii_u32__is_empty(s)); +} + static inline bool wuffs_base__rect_ii_u32__contains(wuffs_base__rect_ii_u32 r, uint32_t x, uint32_t y) { @@ -504,6 +550,16 @@ static inline bool wuffs_base__rect_ie_u32__is_empty( (r.min_inclusive_y >= r.max_exclusive_y); } +static inline bool wuffs_base__rect_ie_u32__equals(wuffs_base__rect_ie_u32 r, + wuffs_base__rect_ie_u32 s) { + return (r.min_inclusive_x == s.min_inclusive_x && + r.min_inclusive_y == s.min_inclusive_y && + r.max_exclusive_x == s.max_exclusive_x && + r.max_exclusive_y == s.max_exclusive_y) || + (wuffs_base__rect_ie_u32__is_empty(r) && + wuffs_base__rect_ie_u32__is_empty(s)); +} + static inline bool wuffs_base__rect_ie_u32__contains(wuffs_base__rect_ie_u32 r, uint32_t x, uint32_t y) { @@ -1030,17 +1086,16 @@ static inline void wuffs_base__image_buffer__update( bool dirty_palette, wuffs_base__rect_ie_u32 dirty_rect, wuffs_base__flicks duration, - uint8_t* palette_ptr, - size_t palette_len) { + wuffs_base__slice_u8 palette) { if (!b) { return; } b->private_impl.dirty_palette = dirty_palette; b->private_impl.dirty_rect = dirty_rect; b->private_impl.duration = duration; - if (palette_ptr) { - memmove(b->private_impl.palette, palette_ptr, - palette_len <= 1024 ? palette_len : 1024); + if (palette.ptr) { + memmove(b->private_impl.palette, palette.ptr, + palette.len <= 1024 ? palette.len : 1024); } } @@ -1270,6 +1325,7 @@ typedef struct { wuffs_gif__status v_z; bool v_write_to_ib_instead_of_w; uint64_t v_n_copied; + uint32_t v_p; } c_decode_id_part1[1]; } private_impl; } wuffs_gif__decoder; @@ -3055,6 +3111,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id_part1( uint64_t v_n_copied; wuffs_base__table_u8 v_tab; wuffs_base__slice_u8 v_pixel_data; + uint32_t v_p; uint8_t* ioptr_dst = NULL; uint8_t* iobounds0orig_dst = NULL; @@ -3107,6 +3164,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id_part1( 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_p = self->private_impl.c_decode_id_part1[0].v_p; } else { v_w = ((wuffs_base__io_writer){}); v_write_to_ib_instead_of_w = false; @@ -3286,6 +3344,14 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id_part1( label_1_break:; } label_0_break:; + v_p = 0; + if (self->private_impl.f_have_lct) { + v_p = 1; + } + wuffs_base__image_buffer__update( + a_ib, true, self->private_impl.f_frame_rect, 0, + ((wuffs_base__slice_u8){.ptr = self->private_impl.f_palettes[v_p], + .len = 1024})); goto ok; ok: @@ -3306,6 +3372,7 @@ suspend: self->private_impl.c_decode_id_part1[0].v_write_to_ib_instead_of_w = v_write_to_ib_instead_of_w; self->private_impl.c_decode_id_part1[0].v_n_copied = v_n_copied; + self->private_impl.c_decode_id_part1[0].v_p = v_p; goto exit; exit: diff --git a/gen/c/std/gzip.c b/gen/c/std/gzip.c index c4ca11e3..dee4163d 100644 --- a/gen/c/std/gzip.c +++ b/gen/c/std/gzip.c @@ -256,6 +256,15 @@ static inline bool wuffs_base__range_ii_u32__is_empty( return r.min_inclusive > r.max_inclusive; } +static inline bool wuffs_base__range_ii_u32__equals( + wuffs_base__range_ii_u32 r, + wuffs_base__range_ii_u32 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_inclusive == s.max_inclusive) || + (wuffs_base__range_ii_u32__is_empty(r) && + wuffs_base__range_ii_u32__is_empty(s)); +} + static inline bool wuffs_base__range_ii_u32__contains( wuffs_base__range_ii_u32 r, uint32_t x) { @@ -296,6 +305,15 @@ static inline bool wuffs_base__range_ie_u32__is_empty( return r.min_inclusive >= r.max_exclusive; } +static inline bool wuffs_base__range_ie_u32__equals( + wuffs_base__range_ie_u32 r, + wuffs_base__range_ie_u32 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_exclusive == s.max_exclusive) || + (wuffs_base__range_ie_u32__is_empty(r) && + wuffs_base__range_ie_u32__is_empty(s)); +} + static inline bool wuffs_base__range_ie_u32__contains( wuffs_base__range_ie_u32 r, uint32_t x) { @@ -341,6 +359,15 @@ static inline bool wuffs_base__range_ii_u64__is_empty( return r.min_inclusive > r.max_inclusive; } +static inline bool wuffs_base__range_ii_u64__equals( + wuffs_base__range_ii_u64 r, + wuffs_base__range_ii_u64 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_inclusive == s.max_inclusive) || + (wuffs_base__range_ii_u64__is_empty(r) && + wuffs_base__range_ii_u64__is_empty(s)); +} + static inline bool wuffs_base__range_ii_u64__contains( wuffs_base__range_ii_u64 r, uint64_t x) { @@ -381,6 +408,15 @@ static inline bool wuffs_base__range_ie_u64__is_empty( return r.min_inclusive >= r.max_exclusive; } +static inline bool wuffs_base__range_ie_u64__equals( + wuffs_base__range_ie_u64 r, + wuffs_base__range_ie_u64 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_exclusive == s.max_exclusive) || + (wuffs_base__range_ie_u64__is_empty(r) && + wuffs_base__range_ie_u64__is_empty(s)); +} + static inline bool wuffs_base__range_ie_u64__contains( wuffs_base__range_ie_u64 r, uint64_t x) { @@ -438,6 +474,16 @@ static inline bool wuffs_base__rect_ii_u32__is_empty( (r.min_inclusive_y > r.max_inclusive_y); } +static inline bool wuffs_base__rect_ii_u32__equals(wuffs_base__rect_ii_u32 r, + wuffs_base__rect_ii_u32 s) { + return (r.min_inclusive_x == s.min_inclusive_x && + r.min_inclusive_y == s.min_inclusive_y && + r.max_inclusive_x == s.max_inclusive_x && + r.max_inclusive_y == s.max_inclusive_y) || + (wuffs_base__rect_ii_u32__is_empty(r) && + wuffs_base__rect_ii_u32__is_empty(s)); +} + static inline bool wuffs_base__rect_ii_u32__contains(wuffs_base__rect_ii_u32 r, uint32_t x, uint32_t y) { @@ -504,6 +550,16 @@ static inline bool wuffs_base__rect_ie_u32__is_empty( (r.min_inclusive_y >= r.max_exclusive_y); } +static inline bool wuffs_base__rect_ie_u32__equals(wuffs_base__rect_ie_u32 r, + wuffs_base__rect_ie_u32 s) { + return (r.min_inclusive_x == s.min_inclusive_x && + r.min_inclusive_y == s.min_inclusive_y && + r.max_exclusive_x == s.max_exclusive_x && + r.max_exclusive_y == s.max_exclusive_y) || + (wuffs_base__rect_ie_u32__is_empty(r) && + wuffs_base__rect_ie_u32__is_empty(s)); +} + static inline bool wuffs_base__rect_ie_u32__contains(wuffs_base__rect_ie_u32 r, uint32_t x, uint32_t y) { @@ -1030,17 +1086,16 @@ static inline void wuffs_base__image_buffer__update( bool dirty_palette, wuffs_base__rect_ie_u32 dirty_rect, wuffs_base__flicks duration, - uint8_t* palette_ptr, - size_t palette_len) { + wuffs_base__slice_u8 palette) { if (!b) { return; } b->private_impl.dirty_palette = dirty_palette; b->private_impl.dirty_rect = dirty_rect; b->private_impl.duration = duration; - if (palette_ptr) { - memmove(b->private_impl.palette, palette_ptr, - palette_len <= 1024 ? palette_len : 1024); + if (palette.ptr) { + memmove(b->private_impl.palette, palette.ptr, + palette.len <= 1024 ? palette.len : 1024); } } diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index c0effd63..ffd1c301 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -256,6 +256,15 @@ static inline bool wuffs_base__range_ii_u32__is_empty( return r.min_inclusive > r.max_inclusive; } +static inline bool wuffs_base__range_ii_u32__equals( + wuffs_base__range_ii_u32 r, + wuffs_base__range_ii_u32 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_inclusive == s.max_inclusive) || + (wuffs_base__range_ii_u32__is_empty(r) && + wuffs_base__range_ii_u32__is_empty(s)); +} + static inline bool wuffs_base__range_ii_u32__contains( wuffs_base__range_ii_u32 r, uint32_t x) { @@ -296,6 +305,15 @@ static inline bool wuffs_base__range_ie_u32__is_empty( return r.min_inclusive >= r.max_exclusive; } +static inline bool wuffs_base__range_ie_u32__equals( + wuffs_base__range_ie_u32 r, + wuffs_base__range_ie_u32 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_exclusive == s.max_exclusive) || + (wuffs_base__range_ie_u32__is_empty(r) && + wuffs_base__range_ie_u32__is_empty(s)); +} + static inline bool wuffs_base__range_ie_u32__contains( wuffs_base__range_ie_u32 r, uint32_t x) { @@ -341,6 +359,15 @@ static inline bool wuffs_base__range_ii_u64__is_empty( return r.min_inclusive > r.max_inclusive; } +static inline bool wuffs_base__range_ii_u64__equals( + wuffs_base__range_ii_u64 r, + wuffs_base__range_ii_u64 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_inclusive == s.max_inclusive) || + (wuffs_base__range_ii_u64__is_empty(r) && + wuffs_base__range_ii_u64__is_empty(s)); +} + static inline bool wuffs_base__range_ii_u64__contains( wuffs_base__range_ii_u64 r, uint64_t x) { @@ -381,6 +408,15 @@ static inline bool wuffs_base__range_ie_u64__is_empty( return r.min_inclusive >= r.max_exclusive; } +static inline bool wuffs_base__range_ie_u64__equals( + wuffs_base__range_ie_u64 r, + wuffs_base__range_ie_u64 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_exclusive == s.max_exclusive) || + (wuffs_base__range_ie_u64__is_empty(r) && + wuffs_base__range_ie_u64__is_empty(s)); +} + static inline bool wuffs_base__range_ie_u64__contains( wuffs_base__range_ie_u64 r, uint64_t x) { @@ -438,6 +474,16 @@ static inline bool wuffs_base__rect_ii_u32__is_empty( (r.min_inclusive_y > r.max_inclusive_y); } +static inline bool wuffs_base__rect_ii_u32__equals(wuffs_base__rect_ii_u32 r, + wuffs_base__rect_ii_u32 s) { + return (r.min_inclusive_x == s.min_inclusive_x && + r.min_inclusive_y == s.min_inclusive_y && + r.max_inclusive_x == s.max_inclusive_x && + r.max_inclusive_y == s.max_inclusive_y) || + (wuffs_base__rect_ii_u32__is_empty(r) && + wuffs_base__rect_ii_u32__is_empty(s)); +} + static inline bool wuffs_base__rect_ii_u32__contains(wuffs_base__rect_ii_u32 r, uint32_t x, uint32_t y) { @@ -504,6 +550,16 @@ static inline bool wuffs_base__rect_ie_u32__is_empty( (r.min_inclusive_y >= r.max_exclusive_y); } +static inline bool wuffs_base__rect_ie_u32__equals(wuffs_base__rect_ie_u32 r, + wuffs_base__rect_ie_u32 s) { + return (r.min_inclusive_x == s.min_inclusive_x && + r.min_inclusive_y == s.min_inclusive_y && + r.max_exclusive_x == s.max_exclusive_x && + r.max_exclusive_y == s.max_exclusive_y) || + (wuffs_base__rect_ie_u32__is_empty(r) && + wuffs_base__rect_ie_u32__is_empty(s)); +} + static inline bool wuffs_base__rect_ie_u32__contains(wuffs_base__rect_ie_u32 r, uint32_t x, uint32_t y) { @@ -1030,17 +1086,16 @@ static inline void wuffs_base__image_buffer__update( bool dirty_palette, wuffs_base__rect_ie_u32 dirty_rect, wuffs_base__flicks duration, - uint8_t* palette_ptr, - size_t palette_len) { + wuffs_base__slice_u8 palette) { if (!b) { return; } b->private_impl.dirty_palette = dirty_palette; b->private_impl.dirty_rect = dirty_rect; b->private_impl.duration = duration; - if (palette_ptr) { - memmove(b->private_impl.palette, palette_ptr, - palette_len <= 1024 ? palette_len : 1024); + if (palette.ptr) { + memmove(b->private_impl.palette, palette.ptr, + palette.len <= 1024 ? palette.len : 1024); } } diff --git a/gen/h/std/adler32.h b/gen/h/std/adler32.h index 0aae3ee0..327fdd4b 100644 --- a/gen/h/std/adler32.h +++ b/gen/h/std/adler32.h @@ -256,6 +256,15 @@ static inline bool wuffs_base__range_ii_u32__is_empty( return r.min_inclusive > r.max_inclusive; } +static inline bool wuffs_base__range_ii_u32__equals( + wuffs_base__range_ii_u32 r, + wuffs_base__range_ii_u32 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_inclusive == s.max_inclusive) || + (wuffs_base__range_ii_u32__is_empty(r) && + wuffs_base__range_ii_u32__is_empty(s)); +} + static inline bool wuffs_base__range_ii_u32__contains( wuffs_base__range_ii_u32 r, uint32_t x) { @@ -296,6 +305,15 @@ static inline bool wuffs_base__range_ie_u32__is_empty( return r.min_inclusive >= r.max_exclusive; } +static inline bool wuffs_base__range_ie_u32__equals( + wuffs_base__range_ie_u32 r, + wuffs_base__range_ie_u32 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_exclusive == s.max_exclusive) || + (wuffs_base__range_ie_u32__is_empty(r) && + wuffs_base__range_ie_u32__is_empty(s)); +} + static inline bool wuffs_base__range_ie_u32__contains( wuffs_base__range_ie_u32 r, uint32_t x) { @@ -341,6 +359,15 @@ static inline bool wuffs_base__range_ii_u64__is_empty( return r.min_inclusive > r.max_inclusive; } +static inline bool wuffs_base__range_ii_u64__equals( + wuffs_base__range_ii_u64 r, + wuffs_base__range_ii_u64 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_inclusive == s.max_inclusive) || + (wuffs_base__range_ii_u64__is_empty(r) && + wuffs_base__range_ii_u64__is_empty(s)); +} + static inline bool wuffs_base__range_ii_u64__contains( wuffs_base__range_ii_u64 r, uint64_t x) { @@ -381,6 +408,15 @@ static inline bool wuffs_base__range_ie_u64__is_empty( return r.min_inclusive >= r.max_exclusive; } +static inline bool wuffs_base__range_ie_u64__equals( + wuffs_base__range_ie_u64 r, + wuffs_base__range_ie_u64 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_exclusive == s.max_exclusive) || + (wuffs_base__range_ie_u64__is_empty(r) && + wuffs_base__range_ie_u64__is_empty(s)); +} + static inline bool wuffs_base__range_ie_u64__contains( wuffs_base__range_ie_u64 r, uint64_t x) { @@ -438,6 +474,16 @@ static inline bool wuffs_base__rect_ii_u32__is_empty( (r.min_inclusive_y > r.max_inclusive_y); } +static inline bool wuffs_base__rect_ii_u32__equals(wuffs_base__rect_ii_u32 r, + wuffs_base__rect_ii_u32 s) { + return (r.min_inclusive_x == s.min_inclusive_x && + r.min_inclusive_y == s.min_inclusive_y && + r.max_inclusive_x == s.max_inclusive_x && + r.max_inclusive_y == s.max_inclusive_y) || + (wuffs_base__rect_ii_u32__is_empty(r) && + wuffs_base__rect_ii_u32__is_empty(s)); +} + static inline bool wuffs_base__rect_ii_u32__contains(wuffs_base__rect_ii_u32 r, uint32_t x, uint32_t y) { @@ -504,6 +550,16 @@ static inline bool wuffs_base__rect_ie_u32__is_empty( (r.min_inclusive_y >= r.max_exclusive_y); } +static inline bool wuffs_base__rect_ie_u32__equals(wuffs_base__rect_ie_u32 r, + wuffs_base__rect_ie_u32 s) { + return (r.min_inclusive_x == s.min_inclusive_x && + r.min_inclusive_y == s.min_inclusive_y && + r.max_exclusive_x == s.max_exclusive_x && + r.max_exclusive_y == s.max_exclusive_y) || + (wuffs_base__rect_ie_u32__is_empty(r) && + wuffs_base__rect_ie_u32__is_empty(s)); +} + static inline bool wuffs_base__rect_ie_u32__contains(wuffs_base__rect_ie_u32 r, uint32_t x, uint32_t y) { @@ -1030,17 +1086,16 @@ static inline void wuffs_base__image_buffer__update( bool dirty_palette, wuffs_base__rect_ie_u32 dirty_rect, wuffs_base__flicks duration, - uint8_t* palette_ptr, - size_t palette_len) { + wuffs_base__slice_u8 palette) { if (!b) { return; } b->private_impl.dirty_palette = dirty_palette; b->private_impl.dirty_rect = dirty_rect; b->private_impl.duration = duration; - if (palette_ptr) { - memmove(b->private_impl.palette, palette_ptr, - palette_len <= 1024 ? palette_len : 1024); + if (palette.ptr) { + memmove(b->private_impl.palette, palette.ptr, + palette.len <= 1024 ? palette.len : 1024); } } diff --git a/gen/h/std/crc32.h b/gen/h/std/crc32.h index a6d50b64..cb47b89e 100644 --- a/gen/h/std/crc32.h +++ b/gen/h/std/crc32.h @@ -256,6 +256,15 @@ static inline bool wuffs_base__range_ii_u32__is_empty( return r.min_inclusive > r.max_inclusive; } +static inline bool wuffs_base__range_ii_u32__equals( + wuffs_base__range_ii_u32 r, + wuffs_base__range_ii_u32 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_inclusive == s.max_inclusive) || + (wuffs_base__range_ii_u32__is_empty(r) && + wuffs_base__range_ii_u32__is_empty(s)); +} + static inline bool wuffs_base__range_ii_u32__contains( wuffs_base__range_ii_u32 r, uint32_t x) { @@ -296,6 +305,15 @@ static inline bool wuffs_base__range_ie_u32__is_empty( return r.min_inclusive >= r.max_exclusive; } +static inline bool wuffs_base__range_ie_u32__equals( + wuffs_base__range_ie_u32 r, + wuffs_base__range_ie_u32 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_exclusive == s.max_exclusive) || + (wuffs_base__range_ie_u32__is_empty(r) && + wuffs_base__range_ie_u32__is_empty(s)); +} + static inline bool wuffs_base__range_ie_u32__contains( wuffs_base__range_ie_u32 r, uint32_t x) { @@ -341,6 +359,15 @@ static inline bool wuffs_base__range_ii_u64__is_empty( return r.min_inclusive > r.max_inclusive; } +static inline bool wuffs_base__range_ii_u64__equals( + wuffs_base__range_ii_u64 r, + wuffs_base__range_ii_u64 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_inclusive == s.max_inclusive) || + (wuffs_base__range_ii_u64__is_empty(r) && + wuffs_base__range_ii_u64__is_empty(s)); +} + static inline bool wuffs_base__range_ii_u64__contains( wuffs_base__range_ii_u64 r, uint64_t x) { @@ -381,6 +408,15 @@ static inline bool wuffs_base__range_ie_u64__is_empty( return r.min_inclusive >= r.max_exclusive; } +static inline bool wuffs_base__range_ie_u64__equals( + wuffs_base__range_ie_u64 r, + wuffs_base__range_ie_u64 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_exclusive == s.max_exclusive) || + (wuffs_base__range_ie_u64__is_empty(r) && + wuffs_base__range_ie_u64__is_empty(s)); +} + static inline bool wuffs_base__range_ie_u64__contains( wuffs_base__range_ie_u64 r, uint64_t x) { @@ -438,6 +474,16 @@ static inline bool wuffs_base__rect_ii_u32__is_empty( (r.min_inclusive_y > r.max_inclusive_y); } +static inline bool wuffs_base__rect_ii_u32__equals(wuffs_base__rect_ii_u32 r, + wuffs_base__rect_ii_u32 s) { + return (r.min_inclusive_x == s.min_inclusive_x && + r.min_inclusive_y == s.min_inclusive_y && + r.max_inclusive_x == s.max_inclusive_x && + r.max_inclusive_y == s.max_inclusive_y) || + (wuffs_base__rect_ii_u32__is_empty(r) && + wuffs_base__rect_ii_u32__is_empty(s)); +} + static inline bool wuffs_base__rect_ii_u32__contains(wuffs_base__rect_ii_u32 r, uint32_t x, uint32_t y) { @@ -504,6 +550,16 @@ static inline bool wuffs_base__rect_ie_u32__is_empty( (r.min_inclusive_y >= r.max_exclusive_y); } +static inline bool wuffs_base__rect_ie_u32__equals(wuffs_base__rect_ie_u32 r, + wuffs_base__rect_ie_u32 s) { + return (r.min_inclusive_x == s.min_inclusive_x && + r.min_inclusive_y == s.min_inclusive_y && + r.max_exclusive_x == s.max_exclusive_x && + r.max_exclusive_y == s.max_exclusive_y) || + (wuffs_base__rect_ie_u32__is_empty(r) && + wuffs_base__rect_ie_u32__is_empty(s)); +} + static inline bool wuffs_base__rect_ie_u32__contains(wuffs_base__rect_ie_u32 r, uint32_t x, uint32_t y) { @@ -1030,17 +1086,16 @@ static inline void wuffs_base__image_buffer__update( bool dirty_palette, wuffs_base__rect_ie_u32 dirty_rect, wuffs_base__flicks duration, - uint8_t* palette_ptr, - size_t palette_len) { + wuffs_base__slice_u8 palette) { if (!b) { return; } b->private_impl.dirty_palette = dirty_palette; b->private_impl.dirty_rect = dirty_rect; b->private_impl.duration = duration; - if (palette_ptr) { - memmove(b->private_impl.palette, palette_ptr, - palette_len <= 1024 ? palette_len : 1024); + if (palette.ptr) { + memmove(b->private_impl.palette, palette.ptr, + palette.len <= 1024 ? palette.len : 1024); } } diff --git a/gen/h/std/deflate.h b/gen/h/std/deflate.h index f116b9cc..3c36bc23 100644 --- a/gen/h/std/deflate.h +++ b/gen/h/std/deflate.h @@ -256,6 +256,15 @@ static inline bool wuffs_base__range_ii_u32__is_empty( return r.min_inclusive > r.max_inclusive; } +static inline bool wuffs_base__range_ii_u32__equals( + wuffs_base__range_ii_u32 r, + wuffs_base__range_ii_u32 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_inclusive == s.max_inclusive) || + (wuffs_base__range_ii_u32__is_empty(r) && + wuffs_base__range_ii_u32__is_empty(s)); +} + static inline bool wuffs_base__range_ii_u32__contains( wuffs_base__range_ii_u32 r, uint32_t x) { @@ -296,6 +305,15 @@ static inline bool wuffs_base__range_ie_u32__is_empty( return r.min_inclusive >= r.max_exclusive; } +static inline bool wuffs_base__range_ie_u32__equals( + wuffs_base__range_ie_u32 r, + wuffs_base__range_ie_u32 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_exclusive == s.max_exclusive) || + (wuffs_base__range_ie_u32__is_empty(r) && + wuffs_base__range_ie_u32__is_empty(s)); +} + static inline bool wuffs_base__range_ie_u32__contains( wuffs_base__range_ie_u32 r, uint32_t x) { @@ -341,6 +359,15 @@ static inline bool wuffs_base__range_ii_u64__is_empty( return r.min_inclusive > r.max_inclusive; } +static inline bool wuffs_base__range_ii_u64__equals( + wuffs_base__range_ii_u64 r, + wuffs_base__range_ii_u64 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_inclusive == s.max_inclusive) || + (wuffs_base__range_ii_u64__is_empty(r) && + wuffs_base__range_ii_u64__is_empty(s)); +} + static inline bool wuffs_base__range_ii_u64__contains( wuffs_base__range_ii_u64 r, uint64_t x) { @@ -381,6 +408,15 @@ static inline bool wuffs_base__range_ie_u64__is_empty( return r.min_inclusive >= r.max_exclusive; } +static inline bool wuffs_base__range_ie_u64__equals( + wuffs_base__range_ie_u64 r, + wuffs_base__range_ie_u64 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_exclusive == s.max_exclusive) || + (wuffs_base__range_ie_u64__is_empty(r) && + wuffs_base__range_ie_u64__is_empty(s)); +} + static inline bool wuffs_base__range_ie_u64__contains( wuffs_base__range_ie_u64 r, uint64_t x) { @@ -438,6 +474,16 @@ static inline bool wuffs_base__rect_ii_u32__is_empty( (r.min_inclusive_y > r.max_inclusive_y); } +static inline bool wuffs_base__rect_ii_u32__equals(wuffs_base__rect_ii_u32 r, + wuffs_base__rect_ii_u32 s) { + return (r.min_inclusive_x == s.min_inclusive_x && + r.min_inclusive_y == s.min_inclusive_y && + r.max_inclusive_x == s.max_inclusive_x && + r.max_inclusive_y == s.max_inclusive_y) || + (wuffs_base__rect_ii_u32__is_empty(r) && + wuffs_base__rect_ii_u32__is_empty(s)); +} + static inline bool wuffs_base__rect_ii_u32__contains(wuffs_base__rect_ii_u32 r, uint32_t x, uint32_t y) { @@ -504,6 +550,16 @@ static inline bool wuffs_base__rect_ie_u32__is_empty( (r.min_inclusive_y >= r.max_exclusive_y); } +static inline bool wuffs_base__rect_ie_u32__equals(wuffs_base__rect_ie_u32 r, + wuffs_base__rect_ie_u32 s) { + return (r.min_inclusive_x == s.min_inclusive_x && + r.min_inclusive_y == s.min_inclusive_y && + r.max_exclusive_x == s.max_exclusive_x && + r.max_exclusive_y == s.max_exclusive_y) || + (wuffs_base__rect_ie_u32__is_empty(r) && + wuffs_base__rect_ie_u32__is_empty(s)); +} + static inline bool wuffs_base__rect_ie_u32__contains(wuffs_base__rect_ie_u32 r, uint32_t x, uint32_t y) { @@ -1030,17 +1086,16 @@ static inline void wuffs_base__image_buffer__update( bool dirty_palette, wuffs_base__rect_ie_u32 dirty_rect, wuffs_base__flicks duration, - uint8_t* palette_ptr, - size_t palette_len) { + wuffs_base__slice_u8 palette) { if (!b) { return; } b->private_impl.dirty_palette = dirty_palette; b->private_impl.dirty_rect = dirty_rect; b->private_impl.duration = duration; - if (palette_ptr) { - memmove(b->private_impl.palette, palette_ptr, - palette_len <= 1024 ? palette_len : 1024); + if (palette.ptr) { + memmove(b->private_impl.palette, palette.ptr, + palette.len <= 1024 ? palette.len : 1024); } } diff --git a/gen/h/std/gif.h b/gen/h/std/gif.h index 5b8a327a..a96a0a00 100644 --- a/gen/h/std/gif.h +++ b/gen/h/std/gif.h @@ -256,6 +256,15 @@ static inline bool wuffs_base__range_ii_u32__is_empty( return r.min_inclusive > r.max_inclusive; } +static inline bool wuffs_base__range_ii_u32__equals( + wuffs_base__range_ii_u32 r, + wuffs_base__range_ii_u32 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_inclusive == s.max_inclusive) || + (wuffs_base__range_ii_u32__is_empty(r) && + wuffs_base__range_ii_u32__is_empty(s)); +} + static inline bool wuffs_base__range_ii_u32__contains( wuffs_base__range_ii_u32 r, uint32_t x) { @@ -296,6 +305,15 @@ static inline bool wuffs_base__range_ie_u32__is_empty( return r.min_inclusive >= r.max_exclusive; } +static inline bool wuffs_base__range_ie_u32__equals( + wuffs_base__range_ie_u32 r, + wuffs_base__range_ie_u32 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_exclusive == s.max_exclusive) || + (wuffs_base__range_ie_u32__is_empty(r) && + wuffs_base__range_ie_u32__is_empty(s)); +} + static inline bool wuffs_base__range_ie_u32__contains( wuffs_base__range_ie_u32 r, uint32_t x) { @@ -341,6 +359,15 @@ static inline bool wuffs_base__range_ii_u64__is_empty( return r.min_inclusive > r.max_inclusive; } +static inline bool wuffs_base__range_ii_u64__equals( + wuffs_base__range_ii_u64 r, + wuffs_base__range_ii_u64 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_inclusive == s.max_inclusive) || + (wuffs_base__range_ii_u64__is_empty(r) && + wuffs_base__range_ii_u64__is_empty(s)); +} + static inline bool wuffs_base__range_ii_u64__contains( wuffs_base__range_ii_u64 r, uint64_t x) { @@ -381,6 +408,15 @@ static inline bool wuffs_base__range_ie_u64__is_empty( return r.min_inclusive >= r.max_exclusive; } +static inline bool wuffs_base__range_ie_u64__equals( + wuffs_base__range_ie_u64 r, + wuffs_base__range_ie_u64 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_exclusive == s.max_exclusive) || + (wuffs_base__range_ie_u64__is_empty(r) && + wuffs_base__range_ie_u64__is_empty(s)); +} + static inline bool wuffs_base__range_ie_u64__contains( wuffs_base__range_ie_u64 r, uint64_t x) { @@ -438,6 +474,16 @@ static inline bool wuffs_base__rect_ii_u32__is_empty( (r.min_inclusive_y > r.max_inclusive_y); } +static inline bool wuffs_base__rect_ii_u32__equals(wuffs_base__rect_ii_u32 r, + wuffs_base__rect_ii_u32 s) { + return (r.min_inclusive_x == s.min_inclusive_x && + r.min_inclusive_y == s.min_inclusive_y && + r.max_inclusive_x == s.max_inclusive_x && + r.max_inclusive_y == s.max_inclusive_y) || + (wuffs_base__rect_ii_u32__is_empty(r) && + wuffs_base__rect_ii_u32__is_empty(s)); +} + static inline bool wuffs_base__rect_ii_u32__contains(wuffs_base__rect_ii_u32 r, uint32_t x, uint32_t y) { @@ -504,6 +550,16 @@ static inline bool wuffs_base__rect_ie_u32__is_empty( (r.min_inclusive_y >= r.max_exclusive_y); } +static inline bool wuffs_base__rect_ie_u32__equals(wuffs_base__rect_ie_u32 r, + wuffs_base__rect_ie_u32 s) { + return (r.min_inclusive_x == s.min_inclusive_x && + r.min_inclusive_y == s.min_inclusive_y && + r.max_exclusive_x == s.max_exclusive_x && + r.max_exclusive_y == s.max_exclusive_y) || + (wuffs_base__rect_ie_u32__is_empty(r) && + wuffs_base__rect_ie_u32__is_empty(s)); +} + static inline bool wuffs_base__rect_ie_u32__contains(wuffs_base__rect_ie_u32 r, uint32_t x, uint32_t y) { @@ -1030,17 +1086,16 @@ static inline void wuffs_base__image_buffer__update( bool dirty_palette, wuffs_base__rect_ie_u32 dirty_rect, wuffs_base__flicks duration, - uint8_t* palette_ptr, - size_t palette_len) { + wuffs_base__slice_u8 palette) { if (!b) { return; } b->private_impl.dirty_palette = dirty_palette; b->private_impl.dirty_rect = dirty_rect; b->private_impl.duration = duration; - if (palette_ptr) { - memmove(b->private_impl.palette, palette_ptr, - palette_len <= 1024 ? palette_len : 1024); + if (palette.ptr) { + memmove(b->private_impl.palette, palette.ptr, + palette.len <= 1024 ? palette.len : 1024); } } @@ -1270,6 +1325,7 @@ typedef struct { wuffs_gif__status v_z; bool v_write_to_ib_instead_of_w; uint64_t v_n_copied; + uint32_t v_p; } c_decode_id_part1[1]; } private_impl; } wuffs_gif__decoder; diff --git a/gen/h/std/gzip.h b/gen/h/std/gzip.h index cc1bf772..ce7cf7da 100644 --- a/gen/h/std/gzip.h +++ b/gen/h/std/gzip.h @@ -256,6 +256,15 @@ static inline bool wuffs_base__range_ii_u32__is_empty( return r.min_inclusive > r.max_inclusive; } +static inline bool wuffs_base__range_ii_u32__equals( + wuffs_base__range_ii_u32 r, + wuffs_base__range_ii_u32 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_inclusive == s.max_inclusive) || + (wuffs_base__range_ii_u32__is_empty(r) && + wuffs_base__range_ii_u32__is_empty(s)); +} + static inline bool wuffs_base__range_ii_u32__contains( wuffs_base__range_ii_u32 r, uint32_t x) { @@ -296,6 +305,15 @@ static inline bool wuffs_base__range_ie_u32__is_empty( return r.min_inclusive >= r.max_exclusive; } +static inline bool wuffs_base__range_ie_u32__equals( + wuffs_base__range_ie_u32 r, + wuffs_base__range_ie_u32 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_exclusive == s.max_exclusive) || + (wuffs_base__range_ie_u32__is_empty(r) && + wuffs_base__range_ie_u32__is_empty(s)); +} + static inline bool wuffs_base__range_ie_u32__contains( wuffs_base__range_ie_u32 r, uint32_t x) { @@ -341,6 +359,15 @@ static inline bool wuffs_base__range_ii_u64__is_empty( return r.min_inclusive > r.max_inclusive; } +static inline bool wuffs_base__range_ii_u64__equals( + wuffs_base__range_ii_u64 r, + wuffs_base__range_ii_u64 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_inclusive == s.max_inclusive) || + (wuffs_base__range_ii_u64__is_empty(r) && + wuffs_base__range_ii_u64__is_empty(s)); +} + static inline bool wuffs_base__range_ii_u64__contains( wuffs_base__range_ii_u64 r, uint64_t x) { @@ -381,6 +408,15 @@ static inline bool wuffs_base__range_ie_u64__is_empty( return r.min_inclusive >= r.max_exclusive; } +static inline bool wuffs_base__range_ie_u64__equals( + wuffs_base__range_ie_u64 r, + wuffs_base__range_ie_u64 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_exclusive == s.max_exclusive) || + (wuffs_base__range_ie_u64__is_empty(r) && + wuffs_base__range_ie_u64__is_empty(s)); +} + static inline bool wuffs_base__range_ie_u64__contains( wuffs_base__range_ie_u64 r, uint64_t x) { @@ -438,6 +474,16 @@ static inline bool wuffs_base__rect_ii_u32__is_empty( (r.min_inclusive_y > r.max_inclusive_y); } +static inline bool wuffs_base__rect_ii_u32__equals(wuffs_base__rect_ii_u32 r, + wuffs_base__rect_ii_u32 s) { + return (r.min_inclusive_x == s.min_inclusive_x && + r.min_inclusive_y == s.min_inclusive_y && + r.max_inclusive_x == s.max_inclusive_x && + r.max_inclusive_y == s.max_inclusive_y) || + (wuffs_base__rect_ii_u32__is_empty(r) && + wuffs_base__rect_ii_u32__is_empty(s)); +} + static inline bool wuffs_base__rect_ii_u32__contains(wuffs_base__rect_ii_u32 r, uint32_t x, uint32_t y) { @@ -504,6 +550,16 @@ static inline bool wuffs_base__rect_ie_u32__is_empty( (r.min_inclusive_y >= r.max_exclusive_y); } +static inline bool wuffs_base__rect_ie_u32__equals(wuffs_base__rect_ie_u32 r, + wuffs_base__rect_ie_u32 s) { + return (r.min_inclusive_x == s.min_inclusive_x && + r.min_inclusive_y == s.min_inclusive_y && + r.max_exclusive_x == s.max_exclusive_x && + r.max_exclusive_y == s.max_exclusive_y) || + (wuffs_base__rect_ie_u32__is_empty(r) && + wuffs_base__rect_ie_u32__is_empty(s)); +} + static inline bool wuffs_base__rect_ie_u32__contains(wuffs_base__rect_ie_u32 r, uint32_t x, uint32_t y) { @@ -1030,17 +1086,16 @@ static inline void wuffs_base__image_buffer__update( bool dirty_palette, wuffs_base__rect_ie_u32 dirty_rect, wuffs_base__flicks duration, - uint8_t* palette_ptr, - size_t palette_len) { + wuffs_base__slice_u8 palette) { if (!b) { return; } b->private_impl.dirty_palette = dirty_palette; b->private_impl.dirty_rect = dirty_rect; b->private_impl.duration = duration; - if (palette_ptr) { - memmove(b->private_impl.palette, palette_ptr, - palette_len <= 1024 ? palette_len : 1024); + if (palette.ptr) { + memmove(b->private_impl.palette, palette.ptr, + palette.len <= 1024 ? palette.len : 1024); } } diff --git a/gen/h/std/zlib.h b/gen/h/std/zlib.h index 5e04dc46..ef49558b 100644 --- a/gen/h/std/zlib.h +++ b/gen/h/std/zlib.h @@ -256,6 +256,15 @@ static inline bool wuffs_base__range_ii_u32__is_empty( return r.min_inclusive > r.max_inclusive; } +static inline bool wuffs_base__range_ii_u32__equals( + wuffs_base__range_ii_u32 r, + wuffs_base__range_ii_u32 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_inclusive == s.max_inclusive) || + (wuffs_base__range_ii_u32__is_empty(r) && + wuffs_base__range_ii_u32__is_empty(s)); +} + static inline bool wuffs_base__range_ii_u32__contains( wuffs_base__range_ii_u32 r, uint32_t x) { @@ -296,6 +305,15 @@ static inline bool wuffs_base__range_ie_u32__is_empty( return r.min_inclusive >= r.max_exclusive; } +static inline bool wuffs_base__range_ie_u32__equals( + wuffs_base__range_ie_u32 r, + wuffs_base__range_ie_u32 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_exclusive == s.max_exclusive) || + (wuffs_base__range_ie_u32__is_empty(r) && + wuffs_base__range_ie_u32__is_empty(s)); +} + static inline bool wuffs_base__range_ie_u32__contains( wuffs_base__range_ie_u32 r, uint32_t x) { @@ -341,6 +359,15 @@ static inline bool wuffs_base__range_ii_u64__is_empty( return r.min_inclusive > r.max_inclusive; } +static inline bool wuffs_base__range_ii_u64__equals( + wuffs_base__range_ii_u64 r, + wuffs_base__range_ii_u64 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_inclusive == s.max_inclusive) || + (wuffs_base__range_ii_u64__is_empty(r) && + wuffs_base__range_ii_u64__is_empty(s)); +} + static inline bool wuffs_base__range_ii_u64__contains( wuffs_base__range_ii_u64 r, uint64_t x) { @@ -381,6 +408,15 @@ static inline bool wuffs_base__range_ie_u64__is_empty( return r.min_inclusive >= r.max_exclusive; } +static inline bool wuffs_base__range_ie_u64__equals( + wuffs_base__range_ie_u64 r, + wuffs_base__range_ie_u64 s) { + return (r.min_inclusive == s.min_inclusive && + r.max_exclusive == s.max_exclusive) || + (wuffs_base__range_ie_u64__is_empty(r) && + wuffs_base__range_ie_u64__is_empty(s)); +} + static inline bool wuffs_base__range_ie_u64__contains( wuffs_base__range_ie_u64 r, uint64_t x) { @@ -438,6 +474,16 @@ static inline bool wuffs_base__rect_ii_u32__is_empty( (r.min_inclusive_y > r.max_inclusive_y); } +static inline bool wuffs_base__rect_ii_u32__equals(wuffs_base__rect_ii_u32 r, + wuffs_base__rect_ii_u32 s) { + return (r.min_inclusive_x == s.min_inclusive_x && + r.min_inclusive_y == s.min_inclusive_y && + r.max_inclusive_x == s.max_inclusive_x && + r.max_inclusive_y == s.max_inclusive_y) || + (wuffs_base__rect_ii_u32__is_empty(r) && + wuffs_base__rect_ii_u32__is_empty(s)); +} + static inline bool wuffs_base__rect_ii_u32__contains(wuffs_base__rect_ii_u32 r, uint32_t x, uint32_t y) { @@ -504,6 +550,16 @@ static inline bool wuffs_base__rect_ie_u32__is_empty( (r.min_inclusive_y >= r.max_exclusive_y); } +static inline bool wuffs_base__rect_ie_u32__equals(wuffs_base__rect_ie_u32 r, + wuffs_base__rect_ie_u32 s) { + return (r.min_inclusive_x == s.min_inclusive_x && + r.min_inclusive_y == s.min_inclusive_y && + r.max_exclusive_x == s.max_exclusive_x && + r.max_exclusive_y == s.max_exclusive_y) || + (wuffs_base__rect_ie_u32__is_empty(r) && + wuffs_base__rect_ie_u32__is_empty(s)); +} + static inline bool wuffs_base__rect_ie_u32__contains(wuffs_base__rect_ie_u32 r, uint32_t x, uint32_t y) { @@ -1030,17 +1086,16 @@ static inline void wuffs_base__image_buffer__update( bool dirty_palette, wuffs_base__rect_ie_u32 dirty_rect, wuffs_base__flicks duration, - uint8_t* palette_ptr, - size_t palette_len) { + wuffs_base__slice_u8 palette) { if (!b) { return; } b->private_impl.dirty_palette = dirty_palette; b->private_impl.dirty_rect = dirty_rect; b->private_impl.duration = duration; - if (palette_ptr) { - memmove(b->private_impl.palette, palette_ptr, - palette_len <= 1024 ? palette_len : 1024); + if (palette.ptr) { + memmove(b->private_impl.palette, palette.ptr, + palette.len <= 1024 ? palette.len : 1024); } } diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index c57d95b1..dd05e52a 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -121,6 +121,7 @@ var Funcs = []string{ // ---- image_buffer "image_buffer.plane(p u32[..3])(ret table u8)", + "image_buffer.update!(dirty_palette bool, dirty_rect rect_ie_u32, duration u64, palette slice u8)()", // ---- image_config diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index 6c2b38a6..0022e89c 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -430,4 +430,13 @@ pri func decoder.decode_id_part1?(ib ptr base.image_buffer, dst base.io_writer, yield z } } + + // TODO: have a builtin btoi or "b as base.u32"? + // TODO: p's type should be base.u32[..1] + var p base.u32 = 0 + if this.have_lct { + p = 1 + } + // TODO: dirty_palette isn't always true; duration isn't always 0. + in.ib.update!(dirty_palette:true, dirty_rect:this.frame_rect, duration:0, palette:this.palettes[p][:]) } diff --git a/test/c/std/gif.c b/test/c/std/gif.c index b07f8d4b..7b4a58d2 100644 --- a/test/c/std/gif.c +++ b/test/c/std/gif.c @@ -569,9 +569,11 @@ void test_wuffs_gif_call_sequence() { } } -bool do_test_wuffs_gif_decode_animated(const char* filename, - uint32_t want_num_loops, - uint32_t want_num_frames) { +bool do_test_wuffs_gif_decode_animated( + const char* filename, + uint32_t want_num_loops, + uint32_t want_num_frames, + wuffs_base__rect_ie_u32* want_dirty_rects) { wuffs_base__io_buffer got = {.ptr = global_got_buffer, .len = BUFFER_SIZE}; wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE}; @@ -614,12 +616,20 @@ bool do_test_wuffs_gif_decode_animated(const char* filename, wuffs_gif__status__string(status)); return false; } - // TODO: check that the frame top/left/width/height is: - // - 0, 0,64,48 for frame #0 - // - 15,31,37, 9 for frame #1 - // - 15, 0,49,40 for frame #2 - // - 15, 0,49,40 for frame #3 - // for "animated-red-blue.gif". + + if (want_dirty_rects) { + wuffs_base__rect_ie_u32 got = wuffs_base__image_buffer__dirty_rect(&ib); + wuffs_base__rect_ie_u32 want = want_dirty_rects[i]; + if (!wuffs_base__rect_ie_u32__equals(got, want)) { + FAIL("decode_frame #%" PRIu32 ": dirty_rect: got (%" PRIu32 ", %" PRIu32 + ")-(%" PRIu32 ", %" PRIu32 "), want (%" PRIu32 ", %" PRIu32 + ")-(%" PRIu32 ", %" PRIu32 ")", + i, got.min_inclusive_x, got.min_inclusive_y, got.max_exclusive_x, + got.max_exclusive_y, want.min_inclusive_x, want.min_inclusive_y, + want.max_exclusive_x, want.max_exclusive_y); + return false; + } + } } // There should be no more frames. @@ -639,23 +649,29 @@ bool do_test_wuffs_gif_decode_animated(const char* filename, void test_wuffs_gif_decode_animated_big() { CHECK_FOCUS(__func__); do_test_wuffs_gif_decode_animated("../../data/gifplayer-muybridge.gif", 0, - 380); + 380, NULL); } void test_wuffs_gif_decode_animated_medium() { CHECK_FOCUS(__func__); - do_test_wuffs_gif_decode_animated("../../data/muybridge.gif", 0, 15); + do_test_wuffs_gif_decode_animated("../../data/muybridge.gif", 0, 15, NULL); } void test_wuffs_gif_decode_animated_small() { CHECK_FOCUS(__func__); - do_test_wuffs_gif_decode_animated("../../data/animated-red-blue.gif", - // animated-red-blue.gif's num_loops should - // be 3. The value explicitly in the wire - // format is 0x0002, but that value means - // "repeat 2 times after the first play", so - // the total number of loops is 3. - 3, 4); + // animated-red-blue.gif's num_loops should be 3. The value explicitly in the + // wire format is 0x0002, but that value means "repeat 2 times after the + // first play", so the total number of loops is 3. + const uint32_t want_num_loops = 3; + wuffs_base__rect_ie_u32 want_rects[4] = { + make_rect_ie_u32(0, 0, 64, 48), + make_rect_ie_u32(15, 31, 52, 40), + make_rect_ie_u32(15, 0, 64, 40), + make_rect_ie_u32(15, 0, 64, 40), + }; + do_test_wuffs_gif_decode_animated( + "../../data/animated-red-blue.gif", want_num_loops, + WUFFS_TESTLIB_ARRAY_SIZE(want_rects), want_rects); } void test_wuffs_gif_decode_frame_out_of_bounds() { diff --git a/test/c/testlib/testlib.c b/test/c/testlib/testlib.c index 835a888c..b48d8e6f 100644 --- a/test/c/testlib/testlib.c +++ b/test/c/testlib/testlib.c @@ -287,9 +287,21 @@ int test_main(int argc, char** argv, proc* tests, proc* benches) { return 0; } -// WUFFS_BASE_HEADER_H is where wuffs_base__io_buffer is defined. +// WUFFS_BASE_HEADER_H is where wuffs_base__foo_bar are defined. #ifdef WUFFS_BASE_HEADER_H +wuffs_base__rect_ie_u32 make_rect_ie_u32(uint32_t x0, + uint32_t y0, + uint32_t x1, + uint32_t y1) { + wuffs_base__rect_ie_u32 ret; + ret.min_inclusive_x = x0; + ret.min_inclusive_y = y0; + ret.max_exclusive_x = x1; + ret.max_exclusive_y = y1; + return ret; +} + void set_reader_limit(wuffs_base__io_reader* o, uint64_t limit) { if (o && o->private_impl.buf) { uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->ri;