From 2b40bb446b7f4549dc9bf5f08761234ffb46968d Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 30 Jun 2018 20:53:37 +1000 Subject: [PATCH] Add some more C++ convenience methods --- cmd/wuffs-c/internal/cgen/base/base-public.h | 424 ++++++++++++++++++- cmd/wuffs-c/internal/cgen/data.go | 62 +-- gen/c/base.c | 424 ++++++++++++++++++- gen/c/std/adler32.c | 424 ++++++++++++++++++- gen/c/std/crc32.c | 424 ++++++++++++++++++- gen/c/std/deflate.c | 424 ++++++++++++++++++- gen/c/std/gif.c | 424 ++++++++++++++++++- gen/c/std/gzip.c | 424 ++++++++++++++++++- gen/c/std/lzw.c | 424 ++++++++++++++++++- gen/c/std/zlib.c | 424 ++++++++++++++++++- gen/h/std/adler32.h | 424 ++++++++++++++++++- gen/h/std/crc32.h | 424 ++++++++++++++++++- gen/h/std/deflate.h | 424 ++++++++++++++++++- gen/h/std/gif.h | 424 ++++++++++++++++++- gen/h/std/gzip.h | 424 ++++++++++++++++++- gen/h/std/lzw.h | 424 ++++++++++++++++++- gen/h/std/zlib.h | 424 ++++++++++++++++++- 17 files changed, 6725 insertions(+), 121 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/base/base-public.h b/cmd/wuffs-c/internal/cgen/base/base-public.h index d2e43f05..66b5d2fa 100644 --- a/cmd/wuffs-c/internal/cgen/base/base-public.h +++ b/cmd/wuffs-c/internal/cgen/base/base-public.h @@ -310,9 +310,20 @@ typedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64; // in which case the range is empty. There are multiple representations of an // empty range. -typedef struct { +typedef struct wuffs_base__range_ii_u32__struct { uint32_t min_incl; uint32_t max_incl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ii_u32__struct s); + inline bool contains(uint32_t x); + inline wuffs_base__range_ii_u32__struct intersection( + wuffs_base__range_ii_u32__struct s); + inline wuffs_base__range_ii_u32__struct unionz( + wuffs_base__range_ii_u32__struct s); +#endif // __cplusplus + } wuffs_base__range_ii_u32; static inline bool wuffs_base__range_ii_u32__is_empty( @@ -358,11 +369,49 @@ static inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__range_ii_u32::is_empty() { + return wuffs_base__range_ii_u32__is_empty(this); +} + +inline bool wuffs_base__range_ii_u32::equals(wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__equals(this, s); +} + +inline bool wuffs_base__range_ii_u32::contains(uint32_t x) { + return wuffs_base__range_ii_u32__contains(this, x); +} + +inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::intersection( + wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__intersection(this, s); +} + +inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::unionz( + wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__union(this, s); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ie_u32__struct { uint32_t min_incl; uint32_t max_excl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ie_u32__struct s); + inline bool contains(uint32_t x); + inline wuffs_base__range_ie_u32__struct intersection( + wuffs_base__range_ie_u32__struct s); + inline wuffs_base__range_ie_u32__struct unionz( + wuffs_base__range_ie_u32__struct s); + inline uint32_t length(); +#endif // __cplusplus + } wuffs_base__range_ie_u32; static inline bool wuffs_base__range_ie_u32__is_empty( @@ -413,11 +462,52 @@ static inline uint32_t wuffs_base__range_ie_u32__length( return wuffs_base__u32__sat_sub(r->max_excl, r->min_incl); } +#ifdef __cplusplus + +inline bool wuffs_base__range_ie_u32::is_empty() { + return wuffs_base__range_ie_u32__is_empty(this); +} + +inline bool wuffs_base__range_ie_u32::equals(wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__equals(this, s); +} + +inline bool wuffs_base__range_ie_u32::contains(uint32_t x) { + return wuffs_base__range_ie_u32__contains(this, x); +} + +inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::intersection( + wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__intersection(this, s); +} + +inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::unionz( + wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__union(this, s); +} + +inline uint32_t wuffs_base__range_ie_u32::length() { + return wuffs_base__range_ie_u32__length(this); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ii_u64__struct { uint64_t min_incl; uint64_t max_incl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ii_u64__struct s); + inline bool contains(uint64_t x); + inline wuffs_base__range_ii_u64__struct intersection( + wuffs_base__range_ii_u64__struct s); + inline wuffs_base__range_ii_u64__struct unionz( + wuffs_base__range_ii_u64__struct s); +#endif // __cplusplus + } wuffs_base__range_ii_u64; static inline bool wuffs_base__range_ii_u64__is_empty( @@ -463,11 +553,49 @@ static inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__range_ii_u64::is_empty() { + return wuffs_base__range_ii_u64__is_empty(this); +} + +inline bool wuffs_base__range_ii_u64::equals(wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__equals(this, s); +} + +inline bool wuffs_base__range_ii_u64::contains(uint64_t x) { + return wuffs_base__range_ii_u64__contains(this, x); +} + +inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::intersection( + wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__intersection(this, s); +} + +inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::unionz( + wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__union(this, s); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ie_u64__struct { uint64_t min_incl; uint64_t max_excl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ie_u64__struct s); + inline bool contains(uint64_t x); + inline wuffs_base__range_ie_u64__struct intersection( + wuffs_base__range_ie_u64__struct s); + inline wuffs_base__range_ie_u64__struct unionz( + wuffs_base__range_ie_u64__struct s); + inline uint64_t length(); +#endif // __cplusplus + } wuffs_base__range_ie_u64; static inline bool wuffs_base__range_ie_u64__is_empty( @@ -518,6 +646,36 @@ static inline uint64_t wuffs_base__range_ie_u64__length( return wuffs_base__u64__sat_sub(r->max_excl, r->min_incl); } +#ifdef __cplusplus + +inline bool wuffs_base__range_ie_u64::is_empty() { + return wuffs_base__range_ie_u64__is_empty(this); +} + +inline bool wuffs_base__range_ie_u64::equals(wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__equals(this, s); +} + +inline bool wuffs_base__range_ie_u64::contains(uint64_t x) { + return wuffs_base__range_ie_u64__contains(this, x); +} + +inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::intersection( + wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__intersection(this, s); +} + +inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::unionz( + wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__union(this, s); +} + +inline uint64_t wuffs_base__range_ie_u64::length() { + return wuffs_base__range_ie_u64__length(this); +} + +#endif // __cplusplus + // -------- // wuffs_base__rect_ii_u32 is a rectangle (a 2-dimensional range) on the @@ -529,11 +687,22 @@ static inline uint64_t wuffs_base__range_ie_u64__length( // multiple representations of an empty rectangle. // // The X and Y axes increase right and down. -typedef struct { +typedef struct wuffs_base__rect_ii_u32__struct { uint32_t min_incl_x; uint32_t min_incl_y; uint32_t max_incl_x; uint32_t max_incl_y; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__rect_ii_u32__struct s); + inline bool contains(uint32_t x, uint32_t y); + inline wuffs_base__rect_ii_u32__struct intersection( + wuffs_base__rect_ii_u32__struct s); + inline wuffs_base__rect_ii_u32__struct unionz( + wuffs_base__rect_ii_u32__struct s); +#endif // __cplusplus + } wuffs_base__rect_ii_u32; static inline bool wuffs_base__rect_ii_u32__is_empty( @@ -584,6 +753,32 @@ static inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__rect_ii_u32::is_empty() { + return wuffs_base__rect_ii_u32__is_empty(this); +} + +inline bool wuffs_base__rect_ii_u32::equals(wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__equals(this, s); +} + +inline bool wuffs_base__rect_ii_u32::contains(uint32_t x, uint32_t y) { + return wuffs_base__rect_ii_u32__contains(this, x, y); +} + +inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::intersection( + wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__intersection(this, s); +} + +inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::unionz( + wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__union(this, s); +} + +#endif // __cplusplus + // -------- // wuffs_base__rect_ie_u32 is a rectangle (a 2-dimensional range) on the @@ -596,11 +791,24 @@ static inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union( // fields zero. // // The X and Y axes increase right and down. -typedef struct { +typedef struct wuffs_base__rect_ie_u32__struct { uint32_t min_incl_x; uint32_t min_incl_y; uint32_t max_excl_x; uint32_t max_excl_y; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__rect_ie_u32__struct s); + inline bool contains(uint32_t x, uint32_t y); + inline wuffs_base__rect_ie_u32__struct intersection( + wuffs_base__rect_ie_u32__struct s); + inline wuffs_base__rect_ie_u32__struct unionz( + wuffs_base__rect_ie_u32__struct s); + inline uint32_t width(); + inline uint32_t height(); +#endif // __cplusplus + } wuffs_base__rect_ie_u32; static inline bool wuffs_base__rect_ie_u32__is_empty( @@ -661,6 +869,40 @@ static inline uint32_t wuffs_base__rect_ie_u32__height( return wuffs_base__u32__sat_sub(r->max_excl_y, r->min_incl_y); } +#ifdef __cplusplus + +inline bool wuffs_base__rect_ie_u32::is_empty() { + return wuffs_base__rect_ie_u32__is_empty(this); +} + +inline bool wuffs_base__rect_ie_u32::equals(wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__equals(this, s); +} + +inline bool wuffs_base__rect_ie_u32::contains(uint32_t x, uint32_t y) { + return wuffs_base__rect_ie_u32__contains(this, x, y); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::intersection( + wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__intersection(this, s); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::unionz( + wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__union(this, s); +} + +inline uint32_t wuffs_base__rect_ie_u32::width() { + return wuffs_base__rect_ie_u32__width(this); +} + +inline uint32_t wuffs_base__rect_ie_u32::height() { + return wuffs_base__rect_ie_u32__height(this); +} + +#endif // __cplusplus + // ---------------- I/O struct wuffs_base__io_buffer__struct; @@ -1026,6 +1268,26 @@ typedef struct { uint32_t num_loops; bool first_frame_is_opaque; } private_impl; + +#ifdef __cplusplus + inline void initialize(wuffs_base__pixel_format pixfmt, + wuffs_base__pixel_subsampling pixsub, + uint32_t width, + uint32_t height, + uint32_t num_loops, + bool first_frame_is_opaque); + inline void invalidate(); + inline bool is_valid(); + inline wuffs_base__pixel_format pixel_format(); + inline wuffs_base__pixel_subsampling pixel_subsampling(); + inline wuffs_base__rect_ie_u32 bounds(); + inline uint32_t width(); + inline uint32_t height(); + inline uint32_t num_loops(); + inline uint32_t first_frame_is_opaque(); + inline size_t pixbuf_size(); +#endif // __cplusplus + } wuffs_base__image_config; // TODO: Should this function return bool? An error type? @@ -1123,6 +1385,62 @@ static inline size_t wuffs_base__image_config__pixbuf_size( return 0; } +#ifdef __cplusplus + +inline void wuffs_base__image_config::initialize( + wuffs_base__pixel_format pixfmt, + wuffs_base__pixel_subsampling pixsub, + uint32_t width, + uint32_t height, + uint32_t num_loops, + bool first_frame_is_opaque) { + wuffs_base__image_config__initialize(this, pixfmt, pixsub, width, height, + num_loops, first_frame_is_opaque); +} + +inline void wuffs_base__image_config::invalidate() { + wuffs_base__image_config__invalidate(this); +} + +inline bool wuffs_base__image_config::is_valid() { + return wuffs_base__image_config__is_valid(this); +} + +inline wuffs_base__pixel_format wuffs_base__image_config::pixel_format() { + return wuffs_base__image_config__pixel_format(this); +} + +inline wuffs_base__pixel_subsampling +wuffs_base__image_config::pixel_subsampling() { + return wuffs_base__image_config__pixel_subsampling(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_config::bounds() { + return wuffs_base__image_config__bounds(this); +} + +inline uint32_t wuffs_base__image_config::width() { + return wuffs_base__image_config__width(this); +} + +inline uint32_t wuffs_base__image_config::height() { + return wuffs_base__image_config__height(this); +} + +inline uint32_t wuffs_base__image_config::num_loops() { + return wuffs_base__image_config__num_loops(this); +} + +inline uint32_t wuffs_base__image_config::first_frame_is_opaque() { + return wuffs_base__image_config__first_frame_is_opaque(this); +} + +inline size_t wuffs_base__image_config::pixbuf_size() { + return wuffs_base__image_config__pixbuf_size(this); +} + +#endif // __cplusplus + // -------- // wuffs_base__animation_disposal encodes, for an animated image, how to @@ -1158,6 +1476,30 @@ typedef struct { bool palette_changed; uint8_t palette[1024]; } private_impl; + +#ifdef __cplusplus + inline wuffs_base__status set_from_pixbuf(wuffs_base__image_config config, + wuffs_base__pixel_buffer pixbuf); + inline wuffs_base__status set_from_slice(wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory); + inline void update(wuffs_base__rect_ie_u32 dirty_rect, + wuffs_base__flicks duration, + bool blend, + wuffs_base__animation_disposal disposal, + wuffs_base__slice_u8 palette); + inline wuffs_base__image_config* image_config(); + inline wuffs_base__rect_ie_u32 bounds(); + inline uint32_t width(); + inline uint32_t height(); + inline wuffs_base__rect_ie_u32 dirty_rect(); + inline wuffs_base__flicks duration(); + inline bool blend(); + inline wuffs_base__animation_disposal disposal(); + inline bool palette_changed(); + inline wuffs_base__slice_u8 palette(); + inline wuffs_base__table_u8 plane(uint32_t p); +#endif // __cplusplus + } wuffs_base__image_buffer; static inline wuffs_base__status wuffs_base__image_buffer__set_from_pixbuf( @@ -1302,6 +1644,76 @@ static inline wuffs_base__table_u8 wuffs_base__image_buffer__plane( : ((wuffs_base__table_u8){}); } +#ifdef __cplusplus + +inline wuffs_base__status wuffs_base__image_buffer::set_from_pixbuf( + wuffs_base__image_config config, + wuffs_base__pixel_buffer pixbuf) { + return wuffs_base__image_buffer__set_from_pixbuf(this, config, pixbuf); +} + +inline wuffs_base__status wuffs_base__image_buffer::set_from_slice( + wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory) { + return wuffs_base__image_buffer__set_from_slice(this, config, pixbuf_memory); +} + +inline void wuffs_base__image_buffer::update( + wuffs_base__rect_ie_u32 dirty_rect, + wuffs_base__flicks duration, + bool blend, + wuffs_base__animation_disposal disposal, + wuffs_base__slice_u8 palette) { + wuffs_base__image_buffer__update(this, dirty_rect, duration, blend, disposal, + palette); +} + +inline wuffs_base__image_config* wuffs_base__image_buffer::image_config() { + return wuffs_base__image_buffer__image_config(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::bounds() { + return wuffs_base__image_buffer__bounds(this); +} + +inline uint32_t wuffs_base__image_buffer::width() { + return wuffs_base__image_buffer__width(this); +} + +inline uint32_t wuffs_base__image_buffer::height() { + return wuffs_base__image_buffer__height(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::dirty_rect() { + return wuffs_base__image_buffer__dirty_rect(this); +} + +inline wuffs_base__flicks wuffs_base__image_buffer::duration() { + return wuffs_base__image_buffer__duration(this); +} + +inline bool wuffs_base__image_buffer::blend() { + return wuffs_base__image_buffer__blend(this); +} + +inline wuffs_base__animation_disposal wuffs_base__image_buffer::disposal() { + return wuffs_base__image_buffer__disposal(this); +} + +inline bool wuffs_base__image_buffer::palette_changed() { + return wuffs_base__image_buffer__palette_changed(this); +} + +inline wuffs_base__slice_u8 wuffs_base__image_buffer::palette() { + return wuffs_base__image_buffer__palette(this); +} + +inline wuffs_base__table_u8 wuffs_base__image_buffer::plane(uint32_t p) { + return wuffs_base__image_buffer__plane(this, p); +} + +#endif // __cplusplus + #ifdef __cplusplus } // extern "C" #endif diff --git a/cmd/wuffs-c/internal/cgen/data.go b/cmd/wuffs-c/internal/cgen/data.go index 20e06df1..d977b8a8 100644 --- a/cmd/wuffs-c/internal/cgen/data.go +++ b/cmd/wuffs-c/internal/cgen/data.go @@ -37,26 +37,33 @@ const basePublicH = "" + "LE(uint64_t) wuffs_base__table_u64;\n\n" + "" + "// ---------------- 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_incl;\n uint32_t max_incl;\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_incl > r->max_incl;\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_incl == s.min_incl && r->max_incl == s.max_incl) ||\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_incl <= x) && (x <= r->max_incl);\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 wuffs_base__range_ii_u32 t;\n t.min_incl = wuffs_base__u32__max(r->min_incl, s.min_incl);\n t.max_incl = wuffs_base__u32__min(r->max_incl, s.max_incl);\n return t;\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 retur" + - "n *r;\n }\n wuffs_base__range_ii_u32 t;\n t.min_incl = wuffs_base__u32__min(r->min_incl, s.min_incl);\n t.max_incl = wuffs_base__u32__max(r->max_incl, s.max_incl);\n return t;\n}\n\n" + + "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 wuffs_base__range_ii_u32__struct {\n uint32_t min_incl;\n uint32_t max_incl;\n\n#ifdef __cplusplus\n inline bool is_empty();\n inline bool equals(wuffs_base__range_ii_u32__struct s);\n inline bool contains(uint" + + "32_t x);\n inline wuffs_base__range_ii_u32__struct intersection(\n wuffs_base__range_ii_u32__struct s);\n inline wuffs_base__range_ii_u32__struct unionz(\n wuffs_base__range_ii_u32__struct s);\n#endif // __cplusplus\n\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_incl > r->max_incl;\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_incl == s.min_incl && r->max_incl == s.max_incl) ||\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_incl <= x) && (x <= r->max_incl);\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 wuffs_base__range_ii_u32 t;\n t.min_inc" + + "l = wuffs_base__u32__max(r->min_incl, s.min_incl);\n t.max_incl = wuffs_base__u32__min(r->max_incl, s.max_incl);\n return t;\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 wuffs_base__range_ii_u32 t;\n t.min_incl = wuffs_base__u32__min(r->min_incl, s.min_incl);\n t.max_incl = wuffs_base__u32__max(r->max_incl, s.max_incl);\n return t;\n}\n\n#ifdef __cplusplus\n\ninline bool wuffs_base__range_ii_u32::is_empty() {\n return wuffs_base__range_ii_u32__is_empty(this);\n}\n\ninline bool wuffs_base__range_ii_u32::equals(wuffs_base__range_ii_u32 s) {\n return wuffs_base__range_ii_u32__equals(this, s);\n}\n\ninline bool wuffs_base__range_ii_u32::contains(uint32_t x) {\n return wuffs_base__range_ii_u32__contains(this, x);\n}\n\ninline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::intersection(\n wuffs_b" + + "ase__range_ii_u32 s) {\n return wuffs_base__range_ii_u32__intersection(this, s);\n}\n\ninline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::unionz(\n wuffs_base__range_ii_u32 s) {\n return wuffs_base__range_ii_u32__union(this, s);\n}\n\n#endif // __cplusplus\n\n" + "" + - "// --------\n\ntypedef struct {\n uint32_t min_incl;\n uint32_t max_excl;\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_incl >= r->max_excl;\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_incl == s.min_incl && r->max_excl == s.max_excl) ||\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_incl <= x) && (x < r->max_excl);\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 wuffs_base__range_ie_u32 t;\n t.min_incl = wuffs_base__u32__max(r->min_incl, s.min_incl);\n t.max_excl = wuffs_base__u32__min(r->max_excl, s.max_excl);\n return t;\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 wuffs_base__range_ie_u32 t;\n t.min_incl = wuffs_base__u32__min(r->min_incl, s.min_incl);\n t.max_excl = wuffs_base__u32__max(r->max_excl, s.max_excl);\n return t;\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_excl, r->min_incl);\n}\n\n" + + "// --------\n\ntypedef struct wuffs_base__range_ie_u32__struct {\n uint32_t min_incl;\n uint32_t max_excl;\n\n#ifdef __cplusplus\n inline bool is_empty();\n inline bool equals(wuffs_base__range_ie_u32__struct s);\n inline bool contains(uint32_t x);\n inline wuffs_base__range_ie_u32__struct intersection(\n wuffs_base__range_ie_u32__struct s);\n inline wuffs_base__range_ie_u32__struct unionz(\n wuffs_base__range_ie_u32__struct s);\n inline uint32_t length();\n#endif // __cplusplus\n\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_incl >= r->max_excl;\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_incl == s.min_incl && r->max_excl == s.max_excl) ||\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_u3" + + "2* r,\n uint32_t x) {\n return (r->min_incl <= x) && (x < r->max_excl);\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 wuffs_base__range_ie_u32 t;\n t.min_incl = wuffs_base__u32__max(r->min_incl, s.min_incl);\n t.max_excl = wuffs_base__u32__min(r->max_excl, s.max_excl);\n return t;\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 wuffs_base__range_ie_u32 t;\n t.min_incl = wuffs_base__u32__min(r->min_incl, s.min_incl);\n t.max_excl = wuffs_base__u32__max(r->max_excl, s.max_excl);\n return t;\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_excl, r->min_incl);\n}\n\n#ifdef __cplusplus\n\ninline bool wuff" + + "s_base__range_ie_u32::is_empty() {\n return wuffs_base__range_ie_u32__is_empty(this);\n}\n\ninline bool wuffs_base__range_ie_u32::equals(wuffs_base__range_ie_u32 s) {\n return wuffs_base__range_ie_u32__equals(this, s);\n}\n\ninline bool wuffs_base__range_ie_u32::contains(uint32_t x) {\n return wuffs_base__range_ie_u32__contains(this, x);\n}\n\ninline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::intersection(\n wuffs_base__range_ie_u32 s) {\n return wuffs_base__range_ie_u32__intersection(this, s);\n}\n\ninline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::unionz(\n wuffs_base__range_ie_u32 s) {\n return wuffs_base__range_ie_u32__union(this, s);\n}\n\ninline uint32_t wuffs_base__range_ie_u32::length() {\n return wuffs_base__range_ie_u32__length(this);\n}\n\n#endif // __cplusplus\n\n" + "" + - "// --------\n\ntypedef struct {\n uint64_t min_incl;\n uint64_t max_incl;\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_incl > r->max_incl;\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_incl == s.min_incl && r->max_incl == s.max_incl) ||\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_incl <= x) && (x <= r->max_incl);\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 wuffs_base__range_ii_u64 t;\n t.min_incl = wuffs_base__u64__max(r->min_incl, s.min_incl);\n t.max_incl = wuffs_base__u64__min(r->max_incl, s.max_incl);\n return t;\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 wuffs_base__range_ii_u64 t;\n t.min_incl = wuffs_base__u64__min(r->min_incl, s.min_incl);\n t.max_incl = wuffs_base__u64__max(r->max_incl, s.max_incl);\n return t;\n}\n\n" + + "// --------\n\ntypedef struct wuffs_base__range_ii_u64__struct {\n uint64_t min_incl;\n uint64_t max_incl;\n\n#ifdef __cplusplus\n inline bool is_empty();\n inline bool equals(wuffs_base__range_ii_u64__struct s);\n inline bool contains(uint64_t x);\n inline wuffs_base__range_ii_u64__struct intersection(\n wuffs_base__range_ii_u64__struct s);\n inline wuffs_base__range_ii_u64__struct unionz(\n wuffs_base__range_ii_u64__struct s);\n#endif // __cplusplus\n\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_incl > r->max_incl;\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_incl == s.min_incl && r->max_incl == s.max_incl) ||\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 ret" + + "urn (r->min_incl <= x) && (x <= r->max_incl);\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 wuffs_base__range_ii_u64 t;\n t.min_incl = wuffs_base__u64__max(r->min_incl, s.min_incl);\n t.max_incl = wuffs_base__u64__min(r->max_incl, s.max_incl);\n return t;\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 wuffs_base__range_ii_u64 t;\n t.min_incl = wuffs_base__u64__min(r->min_incl, s.min_incl);\n t.max_incl = wuffs_base__u64__max(r->max_incl, s.max_incl);\n return t;\n}\n\n#ifdef __cplusplus\n\ninline bool wuffs_base__range_ii_u64::is_empty() {\n return wuffs_base__range_ii_u64__is_empty(this);\n}\n\ninline bool wuffs_base__range_ii_u64::equals(wuffs_base__range_ii_u64 s) {\n return wuffs_base_" + + "_range_ii_u64__equals(this, s);\n}\n\ninline bool wuffs_base__range_ii_u64::contains(uint64_t x) {\n return wuffs_base__range_ii_u64__contains(this, x);\n}\n\ninline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::intersection(\n wuffs_base__range_ii_u64 s) {\n return wuffs_base__range_ii_u64__intersection(this, s);\n}\n\ninline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::unionz(\n wuffs_base__range_ii_u64 s) {\n return wuffs_base__range_ii_u64__union(this, s);\n}\n\n#endif // __cplusplus\n\n" + "" + - "// --------\n\ntypedef struct {\n uint64_t min_incl;\n uint64_t max_excl;\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_incl >= r->max_excl;\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_incl == s.min_incl && r->max_excl == s.max_excl) ||\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_incl <= x) && (x < r->max_excl);\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 wuffs_base__range_ie_u64 t;\n t.min_incl = wuffs_base__u64__max(r->min_incl, s.min_incl);\n t.max_excl = wuffs_base__u64__min(r->max_excl, s.max_excl);\n return t;\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 wuffs_base__range_ie_u64 t;\n t.min_incl = wuffs_base__u64__min(r->min_incl, s.min_incl);\n t.max_excl = wuffs_base__u64__max(r->max_excl, s.max_excl);\n return t;\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_excl, r->min_incl);\n}\n\n" + + "// --------\n\ntypedef struct wuffs_base__range_ie_u64__struct {\n uint64_t min_incl;\n uint64_t max_excl;\n\n#ifdef __cplusplus\n inline bool is_empty();\n inline bool equals(wuffs_base__range_ie_u64__struct s);\n inline bool contains(uint64_t x);\n inline wuffs_base__range_ie_u64__struct intersection(\n wuffs_base__range_ie_u64__struct s);\n inline wuffs_base__range_ie_u64__struct unionz(\n wuffs_base__range_ie_u64__struct s);\n inline uint64_t length();\n#endif // __cplusplus\n\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_incl >= r->max_excl;\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_incl == s.min_incl && r->max_excl == s.max_excl) ||\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_u6" + + "4* r,\n uint64_t x) {\n return (r->min_incl <= x) && (x < r->max_excl);\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 wuffs_base__range_ie_u64 t;\n t.min_incl = wuffs_base__u64__max(r->min_incl, s.min_incl);\n t.max_excl = wuffs_base__u64__min(r->max_excl, s.max_excl);\n return t;\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 wuffs_base__range_ie_u64 t;\n t.min_incl = wuffs_base__u64__min(r->min_incl, s.min_incl);\n t.max_excl = wuffs_base__u64__max(r->max_excl, s.max_excl);\n return t;\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_excl, r->min_incl);\n}\n\n#ifdef __cplusplus\n\ninline bool wuff" + + "s_base__range_ie_u64::is_empty() {\n return wuffs_base__range_ie_u64__is_empty(this);\n}\n\ninline bool wuffs_base__range_ie_u64::equals(wuffs_base__range_ie_u64 s) {\n return wuffs_base__range_ie_u64__equals(this, s);\n}\n\ninline bool wuffs_base__range_ie_u64::contains(uint64_t x) {\n return wuffs_base__range_ie_u64__contains(this, x);\n}\n\ninline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::intersection(\n wuffs_base__range_ie_u64 s) {\n return wuffs_base__range_ie_u64__intersection(this, s);\n}\n\ninline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::unionz(\n wuffs_base__range_ie_u64 s) {\n return wuffs_base__range_ie_u64__union(this, s);\n}\n\ninline uint64_t wuffs_base__range_ie_u64::length() {\n return wuffs_base__range_ie_u64__length(this);\n}\n\n#endif // __cplusplus\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_incl_x <= x) && (x <= max_incl_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_incl_x;\n uint32_t min_incl_y;\n uint32_t max_incl_x;\n uint32_t max_incl_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_incl_x > r->max_incl_x) || (r->min_incl_y > r->max_incl_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_incl_x == s.min_incl_x && r->min_incl_y == s.min_incl_y &&\n " + - " r->max_incl_x == s.max_incl_x && r->max_incl_y == s.max_incl_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_incl_x <= x) && (x <= r->max_incl_x) && (r->min_incl_y <= y) &&\n (y <= r->max_incl_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 wuffs_base__rect_ii_u32 t;\n t.min_incl_x = wuffs_base__u32__max(r->min_incl_x, s.min_incl_x);\n t.min_incl_y = wuffs_base__u32__max(r->min_incl_y, s.min_incl_y);\n t.max_incl_x = wuffs_base__u32__min(r->max_incl_x, s.max_incl_x);\n t.max_incl_y = wuffs_base__u32__min(r->max_incl_y, s.max_incl_y);\n return t;\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 wuffs_base__rect_ii_u32 t;\n t.min_incl_x = wuffs_base__u32__min(r->min_incl_x, s.min_incl_x);\n t.min_incl_y = wuffs_base__u32__min(r->min_incl_y, s.min_incl_y);\n t.max_incl_x = wuffs_base__u32__max(r->max_incl_x, s.max_incl_x);\n t.max_incl_y = wuffs_base__u32__max(r->max_incl_y, s.max_incl_y);\n return t;\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_incl_x <= x) && (x <= max_incl_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 wuffs_base__rect_ii_u32__struct {\n uint32_t min_incl_x;\n uint32_t min_incl_y;\n uint32_t max_incl_x;\n uint32_t max_incl_y;\n\n#ifdef __cplusplus\n inline bool is_empty();\n inline bool equals(wuffs_base__rect_ii_u32__struct s);\n inline bool contains(uint32_t x, uint32_t y);\n inline wuffs_base__rect_ii_u32__struct intersection(\n wuffs_base__rect_ii_u32__struct s);\n inline wuffs_base__rect_ii_u32__struct unionz(\n wuffs_base__rect_ii_u32__struct s);\n#endif // __cplusplus\n\n} wuffs_base__rect_ii_u32;\n\nstatic inli" + + "ne bool wuffs_base__rect_ii_u32__is_empty(\n wuffs_base__rect_ii_u32* r) {\n return (r->min_incl_x > r->max_incl_x) || (r->min_incl_y > r->max_incl_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_incl_x == s.min_incl_x && r->min_incl_y == s.min_incl_y &&\n r->max_incl_x == s.max_incl_x && r->max_incl_y == s.max_incl_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_incl_x <= x) && (x <= r->max_incl_x) && (r->min_incl_y <= y) &&\n (y <= r->max_incl_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 wuffs_base__rect_ii_u32 t;\n t.min_incl_x = wuffs_base__u32__max(r->min_incl_x, s.min_incl_x);\n t.min_incl_y = wuffs_base__u32__max(r->min_incl_y, s.min_incl_y);\n t.max_incl_x = wuffs_base__u32__min(r->max_incl_x, s.max_incl_x);\n t.max_incl_y = wuffs_base__u32__min(r->max_incl_y, s.max_incl_y);\n return t;\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 wuffs_base__rect_ii_u32 t;\n t.min_incl_x = wuffs_base__u32__min(r->min_incl_x, s.min_incl_x);\n t.min_incl_y = wuffs_base__u32__min(r->min_incl_y, s.min_incl_y);\n t.max_incl_x = wuffs_base__u32__max(r->max_incl_x, s.max_incl_x);\n t.max_incl_y = wuffs_base__u32__max(r->max_incl_y, s.max_incl_y);\n return t;\n}\n\n#ifdef __cplusplus\n\ninline bool wuffs_base__rect_ii_u32::is_empty() {\n return wuffs_base__rect_ii_u32__is_em" + + "pty(this);\n}\n\ninline bool wuffs_base__rect_ii_u32::equals(wuffs_base__rect_ii_u32 s) {\n return wuffs_base__rect_ii_u32__equals(this, s);\n}\n\ninline bool wuffs_base__rect_ii_u32::contains(uint32_t x, uint32_t y) {\n return wuffs_base__rect_ii_u32__contains(this, x, y);\n}\n\ninline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::intersection(\n wuffs_base__rect_ii_u32 s) {\n return wuffs_base__rect_ii_u32__intersection(this, s);\n}\n\ninline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::unionz(\n wuffs_base__rect_ii_u32 s) {\n return wuffs_base__rect_ii_u32__union(this, s);\n}\n\n#endif // __cplusplus\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_incl_x <= x) && (x < max_excl_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_incl_x;\n uint32_t min_incl_y;\n uint32_t max_excl_x;\n uint32_t max_excl_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_incl_x >= r->max_excl_x) || (r->min_incl_y >= r->max_excl_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_incl_x == s.min_i" + - "ncl_x && r->min_incl_y == s.min_incl_y &&\n r->max_excl_x == s.max_excl_x && r->max_excl_y == s.max_excl_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_incl_x <= x) && (x < r->max_excl_x) && (r->min_incl_y <= y) &&\n (y < r->max_excl_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 wuffs_base__rect_ie_u32 t;\n t.min_incl_x = wuffs_base__u32__max(r->min_incl_x, s.min_incl_x);\n t.min_incl_y = wuffs_base__u32__max(r->min_incl_y, s.min_incl_y);\n t.max_excl_x = wuffs_base__u32__min(r->max_excl_x, s.max_excl_x);\n t.max_excl_y = wuffs_base__u32__min(r->max_excl_y, s.max_excl_y);\n return t;\n}\n\nstatic inline wuff" + - "s_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 wuffs_base__rect_ie_u32 t;\n t.min_incl_x = wuffs_base__u32__min(r->min_incl_x, s.min_incl_x);\n t.min_incl_y = wuffs_base__u32__min(r->min_incl_y, s.min_incl_y);\n t.max_excl_x = wuffs_base__u32__max(r->max_excl_x, s.max_excl_x);\n t.max_excl_y = wuffs_base__u32__max(r->max_excl_y, s.max_excl_y);\n return t;\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_excl_x, r->min_incl_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_excl_y, r->min_incl_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_incl_x <= x) && (x < max_excl_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 wuffs_base__rect_ie_u32__struct {\n uint32_t min_incl_x;\n uint32_t min_incl_y;\n uint32_t max_excl_x;\n uint32_t max_excl_y;\n\n#ifdef __cplusplus\n inline bool is_empty();\n inline bool equals(wuffs_base__rect_ie_u32__struct s);\n inline bool contains(uint32_t x, uint32_t y);\n inline wuffs_base__rect_ie_u32__struct intersection(\n wuffs_base__rect_ie_u32__struct s);\n inline wuffs_base__rect_ie_u32__struct unionz(\n wuffs_base__rect_ie_u32__struct s);\n inline uint32_t wi" + + "dth();\n inline uint32_t height();\n#endif // __cplusplus\n\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_incl_x >= r->max_excl_x) || (r->min_incl_y >= r->max_excl_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_incl_x == s.min_incl_x && r->min_incl_y == s.min_incl_y &&\n r->max_excl_x == s.max_excl_x && r->max_excl_y == s.max_excl_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_incl_x <= x) && (x < r->max_excl_x) && (r->min_incl_y <= y) &&\n (y < r->max_excl_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 wuffs_base__rect_ie_u32 t;\n t.min_incl_x = wuffs_base__u32__max(r->min_incl_x, s.min_incl_x);\n t.min_incl_y = wuffs_base__u32__max(r->min_incl_y, s.min_incl_y);\n t.max_excl_x = wuffs_base__u32__min(r->max_excl_x, s.max_excl_x);\n t.max_excl_y = wuffs_base__u32__min(r->max_excl_y, s.max_excl_y);\n return t;\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 wuffs_base__rect_ie_u32 t;\n t.min_incl_x = wuffs_base__u32__min(r->min_incl_x, s.min_incl_x);\n t.min_incl_y = wuffs_base__u32__min(r->min_incl_y, s.min_incl_y);\n t.max_excl_x = wuffs_base__u32__max(r->max_excl_x, s.max_excl_x);\n t.max_excl_y = wuffs_base__u32__max(r->max_excl_y, s.max_excl_y);\n return t;\n}\n\nstatic inli" + + "ne uint32_t wuffs_base__rect_ie_u32__width(\n wuffs_base__rect_ie_u32* r) {\n return wuffs_base__u32__sat_sub(r->max_excl_x, r->min_incl_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_excl_y, r->min_incl_y);\n}\n\n#ifdef __cplusplus\n\ninline bool wuffs_base__rect_ie_u32::is_empty() {\n return wuffs_base__rect_ie_u32__is_empty(this);\n}\n\ninline bool wuffs_base__rect_ie_u32::equals(wuffs_base__rect_ie_u32 s) {\n return wuffs_base__rect_ie_u32__equals(this, s);\n}\n\ninline bool wuffs_base__rect_ie_u32::contains(uint32_t x, uint32_t y) {\n return wuffs_base__rect_ie_u32__contains(this, x, y);\n}\n\ninline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::intersection(\n wuffs_base__rect_ie_u32 s) {\n return wuffs_base__rect_ie_u32__intersection(this, s);\n}\n\ninline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::unionz(\n wuffs_base__rect_ie_u32 s) {\n return wuffs_base__rect_ie_u32__union(this, s);\n}\n\ninline uint32_t wuffs_base" + + "__rect_ie_u32::width() {\n return wuffs_base__rect_ie_u32__width(this);\n}\n\ninline uint32_t wuffs_base__rect_ie_u32::height() {\n return wuffs_base__rect_ie_u32__height(this);\n}\n\n#endif // __cplusplus\n\n" + "" + "// ---------------- I/O\n\nstruct wuffs_base__io_buffer__struct;\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 struct wuffs_base__io_buffer__struct* 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/ABI\n // compatibility or safety guarantee if you do so.\n struct {\n struct wuffs_base__io_buffer__struct* 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\n// wuffs_base__io_buffer is a 1-dimensional buffer (a pointer and leng" + "th), 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 wuffs_base__io_buffer__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\n#ifdef __cplusplus\n inline void compact();\n inline wuffs_base__io_reader reader();\n inline wuffs_base__io_writer writer();\n#endif // __cplusplus\n\n} wuffs_base__io_buffer;\n\n// wuffs_base__io_buffer__compact moves any written but unread bytes to the\n// start of the buffer.\nstatic inline void wuffs_base__io_buffer__compact(wuffs_base__io_buffer* buf) {\n if (!buf || (buf->ri == 0)) {\n return;\n }\n size_t n = buf->wi - buf->ri;\n if (n != 0) {\n memmove(buf->ptr, buf->ptr + buf->ri, n);\n }\n buf->wi = n;\n buf->ri = 0;\n}\n\nstatic inline wuffs_base__io_reader wuffs_base__io_buffer__reader(\n wuf" + @@ -79,19 +86,24 @@ const basePublicH = "" + "SUBSAMPLING__440 \\\n ((wuffs_base__pixel_subsampling)0x010100)\n#define WUFFS_BASE__PIXEL_SUBSAMPLING__422 \\\n ((wuffs_base__pixel_subsampling)0x101000)\n#define WUFFS_BASE__PIXEL_SUBSAMPLING__420 \\\n ((wuffs_base__pixel_subsampling)0x111100)\n#define WUFFS_BASE__PIXEL_SUBSAMPLING__411 \\\n ((wuffs_base__pixel_subsampling)0x202000)\n#define WUFFS_BASE__PIXEL_SUBSAMPLING__410 \\\n ((wuffs_base__pixel_subsampling)0x212100)\n\nstatic inline uint32_t wuffs_base__pixel_subsampling__bias_x(\n wuffs_base__pixel_subsampling s,\n uint32_t plane) {\n uint32_t shift = ((plane & 0x03) * 8) + 6;\n return (s >> shift) & 0x03;\n}\n\nstatic inline uint32_t wuffs_base__pixel_subsampling__shift_x(\n wuffs_base__pixel_subsampling s,\n uint32_t plane) {\n uint32_t shift = ((plane & 0x03) * 8) + 4;\n return (s >> shift) & 0x03;\n}\n\nstatic inline uint32_t wuffs_base__pixel_subsampling__bias_y(\n wuffs_base__pixel_subsampling s,\n uint32_t plane) {\n uint32_t shift = ((plane & 0x03) * 8) + 2;\n return (s >> shift) & 0x03;\n}\n\nstatic" + " inline uint32_t wuffs_base__pixel_subsampling__shift_y(\n wuffs_base__pixel_subsampling s,\n uint32_t plane) {\n uint32_t shift = ((plane & 0x03) * 8) + 0;\n return (s >> shift) & 0x03;\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__pixel_format pixfmt;\n wuffs_base__pixel_subsampling pixsub;\n uint32_t width;\n uint32_t height;\n uint32_t num_loops;\n bool first_frame_is_opaque;\n } private_impl;\n} wuffs_base__image_config;\n\n// TODO: Should this function return bool? An error type?\nstatic inline void wuffs_base__image_config__initialize(\n wuffs_base__image_config* c,\n wuffs_base__pixel_format pixfmt,\n wuffs_base__pixel_subsampling pixsub,\n uint32_t width,\n uint32_t height,\n uint32_t num_loops,\n bool first_frame_is_opaque) {\n if (!c) {\n return;\n }\n if (pixfmt) {\n uint64_t wh = ((uint64_t)width) * ((uint64_t)height);\n // TODO: handle things other than 1 byte per pixel.\n if (wh <= ((uint64_t)SIZE_MAX)) {\n c->private_impl.pixfmt = pixfmt;\n c->private_impl.pixsub = pixsub;\n c->private_impl.width = wi" + - "dth;\n c->private_impl.height = height;\n c->private_impl.num_loops = num_loops;\n c->private_impl.first_frame_is_opaque = first_frame_is_opaque;\n return;\n }\n }\n *c = ((wuffs_base__image_config){});\n}\n\nstatic inline void wuffs_base__image_config__invalidate(\n wuffs_base__image_config* c) {\n if (c) {\n *c = ((wuffs_base__image_config){});\n }\n}\n\nstatic inline bool wuffs_base__image_config__is_valid(\n wuffs_base__image_config* c) {\n return c && c->private_impl.pixfmt;\n}\n\nstatic inline wuffs_base__pixel_format wuffs_base__image_config__pixel_format(\n wuffs_base__image_config* c) {\n return c ? c->private_impl.pixfmt : 0;\n}\n\nstatic inline wuffs_base__pixel_subsampling\nwuffs_base__image_config__pixel_subsampling(wuffs_base__image_config* c) {\n return c ? c->private_impl.pixsub : 0;\n}\n\nstatic inline wuffs_base__rect_ie_u32 wuffs_base__image_config__bounds(\n wuffs_base__image_config* c) {\n return c ? ((wuffs_base__rect_ie_u32){\n .min_incl_x = 0,\n " + - " .min_incl_y = 0,\n .max_excl_x = c->private_impl.width,\n .max_excl_y = c->private_impl.height,\n })\n : ((wuffs_base__rect_ie_u32){});\n}\n\nstatic inline uint32_t wuffs_base__image_config__width(\n wuffs_base__image_config* c) {\n return c ? c->private_impl.width : 0;\n}\n\nstatic inline uint32_t wuffs_base__image_config__height(\n wuffs_base__image_config* c) {\n return c ? c->private_impl.height : 0;\n}\n\nstatic inline uint32_t wuffs_base__image_config__num_loops(\n wuffs_base__image_config* c) {\n return c ? c->private_impl.num_loops : 0;\n}\n\nstatic inline uint32_t wuffs_base__image_config__first_frame_is_opaque(\n wuffs_base__image_config* c) {\n return c ? c->private_impl.first_frame_is_opaque : false;\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__pixel_format pixfmt;\n wuffs_base__pixel_subsampling pixsub;\n uint32_t width;\n uint32_t height;\n uint32_t num_loops;\n bool first_frame_is_opaque;\n } private_impl;\n\n#ifdef __cplusplus\n inline void initialize(wuffs_base__pixel_format pixfmt,\n wuffs_base__pixel_subsampling pixsub,\n uint32_t width,\n uint32_t height,\n uint32_t num_loops,\n bool first_frame_is_opaque);\n inline void invalidate();\n inline bool is_valid();\n inline wuffs_base__pixel_format pixel_format();\n inline wuffs_base__pixel_subsampling pixel_subsampling();\n inline wuffs_base__rect_ie_u32 bounds();\n inline uint32_t width();\n inline uint32_t height();\n inline uint32_t num_loops();\n inline uint32_t first_frame_is_opaque();\n " + + "inline size_t pixbuf_size();\n#endif // __cplusplus\n\n} wuffs_base__image_config;\n\n// TODO: Should this function return bool? An error type?\nstatic inline void wuffs_base__image_config__initialize(\n wuffs_base__image_config* c,\n wuffs_base__pixel_format pixfmt,\n wuffs_base__pixel_subsampling pixsub,\n uint32_t width,\n uint32_t height,\n uint32_t num_loops,\n bool first_frame_is_opaque) {\n if (!c) {\n return;\n }\n if (pixfmt) {\n uint64_t wh = ((uint64_t)width) * ((uint64_t)height);\n // TODO: handle things other than 1 byte per pixel.\n if (wh <= ((uint64_t)SIZE_MAX)) {\n c->private_impl.pixfmt = pixfmt;\n c->private_impl.pixsub = pixsub;\n c->private_impl.width = width;\n c->private_impl.height = height;\n c->private_impl.num_loops = num_loops;\n c->private_impl.first_frame_is_opaque = first_frame_is_opaque;\n return;\n }\n }\n *c = ((wuffs_base__image_config){});\n}\n\nstatic inline void wuffs_base__image_config__invalidate(\n wuffs_base__image_config*" + + " c) {\n if (c) {\n *c = ((wuffs_base__image_config){});\n }\n}\n\nstatic inline bool wuffs_base__image_config__is_valid(\n wuffs_base__image_config* c) {\n return c && c->private_impl.pixfmt;\n}\n\nstatic inline wuffs_base__pixel_format wuffs_base__image_config__pixel_format(\n wuffs_base__image_config* c) {\n return c ? c->private_impl.pixfmt : 0;\n}\n\nstatic inline wuffs_base__pixel_subsampling\nwuffs_base__image_config__pixel_subsampling(wuffs_base__image_config* c) {\n return c ? c->private_impl.pixsub : 0;\n}\n\nstatic inline wuffs_base__rect_ie_u32 wuffs_base__image_config__bounds(\n wuffs_base__image_config* c) {\n return c ? ((wuffs_base__rect_ie_u32){\n .min_incl_x = 0,\n .min_incl_y = 0,\n .max_excl_x = c->private_impl.width,\n .max_excl_y = c->private_impl.height,\n })\n : ((wuffs_base__rect_ie_u32){});\n}\n\nstatic inline uint32_t wuffs_base__image_config__width(\n wuffs_base__image_config* c) {\n return c ? c->private_impl" + + ".width : 0;\n}\n\nstatic inline uint32_t wuffs_base__image_config__height(\n wuffs_base__image_config* c) {\n return c ? c->private_impl.height : 0;\n}\n\nstatic inline uint32_t wuffs_base__image_config__num_loops(\n wuffs_base__image_config* c) {\n return c ? c->private_impl.num_loops : 0;\n}\n\nstatic inline uint32_t wuffs_base__image_config__first_frame_is_opaque(\n wuffs_base__image_config* c) {\n return c ? c->private_impl.first_frame_is_opaque : false;\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#ifdef __cplusplus\n\ninline vo" + + "id wuffs_base__image_config::initialize(\n wuffs_base__pixel_format pixfmt,\n wuffs_base__pixel_subsampling pixsub,\n uint32_t width,\n uint32_t height,\n uint32_t num_loops,\n bool first_frame_is_opaque) {\n wuffs_base__image_config__initialize(this, pixfmt, pixsub, width, height,\n num_loops, first_frame_is_opaque);\n}\n\ninline void wuffs_base__image_config::invalidate() {\n wuffs_base__image_config__invalidate(this);\n}\n\ninline bool wuffs_base__image_config::is_valid() {\n return wuffs_base__image_config__is_valid(this);\n}\n\ninline wuffs_base__pixel_format wuffs_base__image_config::pixel_format() {\n return wuffs_base__image_config__pixel_format(this);\n}\n\ninline wuffs_base__pixel_subsampling\nwuffs_base__image_config::pixel_subsampling() {\n return wuffs_base__image_config__pixel_subsampling(this);\n}\n\ninline wuffs_base__rect_ie_u32 wuffs_base__image_config::bounds() {\n return wuffs_base__image_config__bounds(this);\n}\n\ninline uint32_t wuffs_base__image_config::wi" + + "dth() {\n return wuffs_base__image_config__width(this);\n}\n\ninline uint32_t wuffs_base__image_config::height() {\n return wuffs_base__image_config__height(this);\n}\n\ninline uint32_t wuffs_base__image_config::num_loops() {\n return wuffs_base__image_config__num_loops(this);\n}\n\ninline uint32_t wuffs_base__image_config::first_frame_is_opaque() {\n return wuffs_base__image_config__first_frame_is_opaque(this);\n}\n\ninline size_t wuffs_base__image_config::pixbuf_size() {\n return wuffs_base__image_config__pixbuf_size(this);\n}\n\n#endif // __cplusplus\n\n" + "" + "// --------\n\n// wuffs_base__animation_disposal encodes, for an animated image, how to\n// dispose of a frame after displaying it:\n// - None means to draw the next frame on top of this one.\n// - Restore Background means to clear the frame's dirty rectangle to \"the\n// background color\" (in practice, this means transparent black) before\n// drawing the next frame.\n// - Restore Previous means to undo the current frame, so that the next frame\n// is drawn on top of the previous one.\ntypedef uint8_t wuffs_base__animation_disposal;\n\n#define WUFFS_BASE__ANIMATION_DISPOSAL__NONE ((wuffs_base__animation_disposal)0)\n#define WUFFS_BASE__ANIMATION_DISPOSAL__RESTORE_BACKGROUND \\\n ((wuffs_base__animation_disposal)1)\n#define WUFFS_BASE__ANIMATION_DISPOSAL__RESTORE_PREVIOUS \\\n ((wuffs_base__animation_disposal)2)\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 wuffs_base__rect_ie_u32 dirty_rect;\n wuffs_base__flicks duration;\n bool blend;\n wuffs_base__animation_disposal disposal;\n bool palette_changed;\n uint8_t palette[1024];\n } private_impl;\n} wuffs_base__image_buffer;\n\nstatic inline wuffs_base__status 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 WUFFS_BASE__ERROR_BAD_RECEIVER;\n }\n *b = ((wuffs_base__image_buffer){});\n b->private_impl.config = config;\n b->private_impl.pixbuf = pixbuf;\n return WUFFS_BASE__STATUS_OK;\n}\n\nstatic inline wuffs_base__status wuffs_base__image_buffer__set_from_" + - "slice(\n wuffs_base__image_buffer* b,\n wuffs_base__image_config config,\n wuffs_base__slice_u8 pixbuf_memory) {\n if (!b) {\n return WUFFS_BASE__ERROR_BAD_RECEIVER;\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 WUFFS_BASE__ERROR_BAD_ARGUMENT_LENGTH_TOO_SHORT;\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 return WUFFS_BASE__STATUS_OK;\n}\n\n// The palette argument is ignored unless its length is exactly 1024.\nstatic inline void wuffs_base__image_buffer__update(\n wuffs_base__image_buffer* b,\n wuffs_base__rect_ie_u32 dirty_rect,\n wuffs_base__flicks duration,\n bool bl" + - "end,\n wuffs_base__animation_disposal disposal,\n wuffs_base__slice_u8 palette) {\n if (!b) {\n return;\n }\n\n // Clip the dirty_rect to the image bounds.\n dirty_rect.max_excl_x = wuffs_base__u32__min(\n dirty_rect.max_excl_x, b->private_impl.config.private_impl.width);\n dirty_rect.max_excl_y = wuffs_base__u32__min(\n dirty_rect.max_excl_y, b->private_impl.config.private_impl.height);\n b->private_impl.dirty_rect = dirty_rect;\n\n b->private_impl.duration = duration;\n b->private_impl.blend = blend;\n b->private_impl.disposal = disposal;\n b->private_impl.palette_changed = palette.ptr && (palette.len == 1024);\n if (b->private_impl.palette_changed) {\n memmove(b->private_impl.palette, palette.ptr, 1024);\n }\n}\n\n// wuffs_base__image_config returns the overall configuration for this frame.\nstatic inline wuffs_base__image_config* wuffs_base__image_buffer__image_config(\n wuffs_base__image_buffer* b) {\n return b ? &b->private_impl.config : NULL;\n}\n\nstatic inline wuffs_base__rect_ie_u32 wuffs_b" + - "ase__image_buffer__bounds(\n wuffs_base__image_buffer* b) {\n return b ? wuffs_base__image_config__bounds(&b->private_impl.config)\n : ((wuffs_base__rect_ie_u32){});\n}\n\nstatic inline uint32_t wuffs_base__image_buffer__width(\n wuffs_base__image_buffer* b) {\n return b ? wuffs_base__image_config__width(&b->private_impl.config) : 0;\n}\n\nstatic inline uint32_t wuffs_base__image_buffer__height(\n wuffs_base__image_buffer* b) {\n return b ? wuffs_base__image_config__height(&b->private_impl.config) : 0;\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){});\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__fl" + - "icks 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__blend returns, for a transparent image, whether to\n// blend this frame with the existing canvas.\n//\n// In Porter-Duff compositing operator terminology, false means \"src\" and true\n// means \"src over dst\".\nstatic inline bool wuffs_base__image_buffer__blend(\n wuffs_base__image_buffer* b) {\n return b && b->private_impl.blend;\n}\n\n// wuffs_base__image_buffer__disposal returns, for an animated image, how to\n// dispose of this frame after displaying it.\nstatic inline wuffs_base__animation_disposal wuffs_base__image_buffer__disposal(\n wuffs_base__image_buffer* b) {\n return b ? b->private_impl.disposal : 0;\n}\n\n// wuffs_base__image_buffer__palette_changed returns whether this frame's\n// palette differs from the previous frame. It is conservative and may return\n// false positives (but never false negatives).\nstatic inline bool wuffs_base__image_buffer__palette_chan" + - "ged(\n wuffs_base__image_buffer* b) {\n return b && b->private_impl.palette_changed;\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 wuffs_base__slice_u8 wuffs_base__image_buffer__palette(\n wuffs_base__image_buffer* b) {\n return b ? ((wuffs_base__slice_u8){.ptr = b->private_impl.palette,\n .len = 1024})\n : ((wuffs_base__slice_u8){});\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#ifdef __cplusplus\n} // extern \"C\"\n#endif\n\n#endif // WUFFS_INCLUDE_GUARD__BASE_PUBLIC\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 wuffs_base__rect_ie_u32 dirty_rect;\n wuffs_base__flicks duration;\n bool blend;\n wuffs_base__animation_disposal disposal;\n bool palette_changed;\n uint8_t palette[1024];\n } private_impl;\n\n#ifdef __cplusplus\n inline wuffs_base__status set_from_pixbuf(wuffs_base__image_config config,\n wuffs_base__pixel_buffer pixbuf);\n inline wuffs_base__status set_from_slice(wuffs_base__image_config config,\n wuffs_base__slice_u8 pixbuf_memory);\n inline void update(wuffs_base__rect_ie_u32 dirty_rect,\n wuffs_base__flicks duration,\n bool blend,\n " + + " wuffs_base__animation_disposal disposal,\n wuffs_base__slice_u8 palette);\n inline wuffs_base__image_config* image_config();\n inline wuffs_base__rect_ie_u32 bounds();\n inline uint32_t width();\n inline uint32_t height();\n inline wuffs_base__rect_ie_u32 dirty_rect();\n inline wuffs_base__flicks duration();\n inline bool blend();\n inline wuffs_base__animation_disposal disposal();\n inline bool palette_changed();\n inline wuffs_base__slice_u8 palette();\n inline wuffs_base__table_u8 plane(uint32_t p);\n#endif // __cplusplus\n\n} wuffs_base__image_buffer;\n\nstatic inline wuffs_base__status 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 WUFFS_BASE__ERROR_BAD_RECEIVER;\n }\n *b = ((wuffs_base__image_buffer){});\n b->private_impl.config = config;\n b->private_impl.pixbuf = pixbuf;\n return WUFFS_BASE__STATUS_OK;\n}\n\nstatic inline wuffs_base__status wuffs_base__imag" + + "e_buffer__set_from_slice(\n wuffs_base__image_buffer* b,\n wuffs_base__image_config config,\n wuffs_base__slice_u8 pixbuf_memory) {\n if (!b) {\n return WUFFS_BASE__ERROR_BAD_RECEIVER;\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 WUFFS_BASE__ERROR_BAD_ARGUMENT_LENGTH_TOO_SHORT;\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 return WUFFS_BASE__STATUS_OK;\n}\n\n// The palette argument is ignored unless its length is exactly 1024.\nstatic inline void wuffs_base__image_buffer__update(\n wuffs_base__image_buffer* b,\n wuffs_base__rect_ie_u32 dirty_rect,\n wuffs_base__flicks du" + + "ration,\n bool blend,\n wuffs_base__animation_disposal disposal,\n wuffs_base__slice_u8 palette) {\n if (!b) {\n return;\n }\n\n // Clip the dirty_rect to the image bounds.\n dirty_rect.max_excl_x = wuffs_base__u32__min(\n dirty_rect.max_excl_x, b->private_impl.config.private_impl.width);\n dirty_rect.max_excl_y = wuffs_base__u32__min(\n dirty_rect.max_excl_y, b->private_impl.config.private_impl.height);\n b->private_impl.dirty_rect = dirty_rect;\n\n b->private_impl.duration = duration;\n b->private_impl.blend = blend;\n b->private_impl.disposal = disposal;\n b->private_impl.palette_changed = palette.ptr && (palette.len == 1024);\n if (b->private_impl.palette_changed) {\n memmove(b->private_impl.palette, palette.ptr, 1024);\n }\n}\n\n// wuffs_base__image_config returns the overall configuration for this frame.\nstatic inline wuffs_base__image_config* wuffs_base__image_buffer__image_config(\n wuffs_base__image_buffer* b) {\n return b ? &b->private_impl.config : NULL;\n}\n\nstatic inline wuffs_base__" + + "rect_ie_u32 wuffs_base__image_buffer__bounds(\n wuffs_base__image_buffer* b) {\n return b ? wuffs_base__image_config__bounds(&b->private_impl.config)\n : ((wuffs_base__rect_ie_u32){});\n}\n\nstatic inline uint32_t wuffs_base__image_buffer__width(\n wuffs_base__image_buffer* b) {\n return b ? wuffs_base__image_config__width(&b->private_impl.config) : 0;\n}\n\nstatic inline uint32_t wuffs_base__image_buffer__height(\n wuffs_base__image_buffer* b) {\n return b ? wuffs_base__image_config__height(&b->private_impl.config) : 0;\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){});\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 in" + + "line 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__blend returns, for a transparent image, whether to\n// blend this frame with the existing canvas.\n//\n// In Porter-Duff compositing operator terminology, false means \"src\" and true\n// means \"src over dst\".\nstatic inline bool wuffs_base__image_buffer__blend(\n wuffs_base__image_buffer* b) {\n return b && b->private_impl.blend;\n}\n\n// wuffs_base__image_buffer__disposal returns, for an animated image, how to\n// dispose of this frame after displaying it.\nstatic inline wuffs_base__animation_disposal wuffs_base__image_buffer__disposal(\n wuffs_base__image_buffer* b) {\n return b ? b->private_impl.disposal : 0;\n}\n\n// wuffs_base__image_buffer__palette_changed returns whether this frame's\n// palette differs from the previous frame. It is conservative and may return\n// false positives (but never false negatives).\nstatic inline bool wuffs_base__image_b" + + "uffer__palette_changed(\n wuffs_base__image_buffer* b) {\n return b && b->private_impl.palette_changed;\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 wuffs_base__slice_u8 wuffs_base__image_buffer__palette(\n wuffs_base__image_buffer* b) {\n return b ? ((wuffs_base__slice_u8){.ptr = b->private_impl.palette,\n .len = 1024})\n : ((wuffs_base__slice_u8){});\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#ifdef __cplusplus\n\ninline wuffs_base__status wuffs_base__image_buffer::set_from_pixbuf(\n wuffs_base__image_config config,\n wuffs_base__pixel_buffer pixbuf) {\n return wuffs_base__image_buffer__set_from_pixbuf(this, config" + + ", pixbuf);\n}\n\ninline wuffs_base__status wuffs_base__image_buffer::set_from_slice(\n wuffs_base__image_config config,\n wuffs_base__slice_u8 pixbuf_memory) {\n return wuffs_base__image_buffer__set_from_slice(this, config, pixbuf_memory);\n}\n\ninline void wuffs_base__image_buffer::update(\n wuffs_base__rect_ie_u32 dirty_rect,\n wuffs_base__flicks duration,\n bool blend,\n wuffs_base__animation_disposal disposal,\n wuffs_base__slice_u8 palette) {\n wuffs_base__image_buffer__update(this, dirty_rect, duration, blend, disposal,\n palette);\n}\n\ninline wuffs_base__image_config* wuffs_base__image_buffer::image_config() {\n return wuffs_base__image_buffer__image_config(this);\n}\n\ninline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::bounds() {\n return wuffs_base__image_buffer__bounds(this);\n}\n\ninline uint32_t wuffs_base__image_buffer::width() {\n return wuffs_base__image_buffer__width(this);\n}\n\ninline uint32_t wuffs_base__image_buffer::height() {\n return wuffs_base__image" + + "_buffer__height(this);\n}\n\ninline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::dirty_rect() {\n return wuffs_base__image_buffer__dirty_rect(this);\n}\n\ninline wuffs_base__flicks wuffs_base__image_buffer::duration() {\n return wuffs_base__image_buffer__duration(this);\n}\n\ninline bool wuffs_base__image_buffer::blend() {\n return wuffs_base__image_buffer__blend(this);\n}\n\ninline wuffs_base__animation_disposal wuffs_base__image_buffer::disposal() {\n return wuffs_base__image_buffer__disposal(this);\n}\n\ninline bool wuffs_base__image_buffer::palette_changed() {\n return wuffs_base__image_buffer__palette_changed(this);\n}\n\ninline wuffs_base__slice_u8 wuffs_base__image_buffer::palette() {\n return wuffs_base__image_buffer__palette(this);\n}\n\ninline wuffs_base__table_u8 wuffs_base__image_buffer::plane(uint32_t p) {\n return wuffs_base__image_buffer__plane(this, p);\n}\n\n#endif // __cplusplus\n\n#ifdef __cplusplus\n} // extern \"C\"\n#endif\n\n#endif // WUFFS_INCLUDE_GUARD__BASE_PUBLIC\n" + "" const basePrivateH = "" + diff --git a/gen/c/base.c b/gen/c/base.c index d7b1f965..e5f43977 100644 --- a/gen/c/base.c +++ b/gen/c/base.c @@ -341,9 +341,20 @@ typedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64; // in which case the range is empty. There are multiple representations of an // empty range. -typedef struct { +typedef struct wuffs_base__range_ii_u32__struct { uint32_t min_incl; uint32_t max_incl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ii_u32__struct s); + inline bool contains(uint32_t x); + inline wuffs_base__range_ii_u32__struct intersection( + wuffs_base__range_ii_u32__struct s); + inline wuffs_base__range_ii_u32__struct unionz( + wuffs_base__range_ii_u32__struct s); +#endif // __cplusplus + } wuffs_base__range_ii_u32; static inline bool wuffs_base__range_ii_u32__is_empty( @@ -389,11 +400,49 @@ static inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__range_ii_u32::is_empty() { + return wuffs_base__range_ii_u32__is_empty(this); +} + +inline bool wuffs_base__range_ii_u32::equals(wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__equals(this, s); +} + +inline bool wuffs_base__range_ii_u32::contains(uint32_t x) { + return wuffs_base__range_ii_u32__contains(this, x); +} + +inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::intersection( + wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__intersection(this, s); +} + +inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::unionz( + wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__union(this, s); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ie_u32__struct { uint32_t min_incl; uint32_t max_excl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ie_u32__struct s); + inline bool contains(uint32_t x); + inline wuffs_base__range_ie_u32__struct intersection( + wuffs_base__range_ie_u32__struct s); + inline wuffs_base__range_ie_u32__struct unionz( + wuffs_base__range_ie_u32__struct s); + inline uint32_t length(); +#endif // __cplusplus + } wuffs_base__range_ie_u32; static inline bool wuffs_base__range_ie_u32__is_empty( @@ -444,11 +493,52 @@ static inline uint32_t wuffs_base__range_ie_u32__length( return wuffs_base__u32__sat_sub(r->max_excl, r->min_incl); } +#ifdef __cplusplus + +inline bool wuffs_base__range_ie_u32::is_empty() { + return wuffs_base__range_ie_u32__is_empty(this); +} + +inline bool wuffs_base__range_ie_u32::equals(wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__equals(this, s); +} + +inline bool wuffs_base__range_ie_u32::contains(uint32_t x) { + return wuffs_base__range_ie_u32__contains(this, x); +} + +inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::intersection( + wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__intersection(this, s); +} + +inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::unionz( + wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__union(this, s); +} + +inline uint32_t wuffs_base__range_ie_u32::length() { + return wuffs_base__range_ie_u32__length(this); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ii_u64__struct { uint64_t min_incl; uint64_t max_incl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ii_u64__struct s); + inline bool contains(uint64_t x); + inline wuffs_base__range_ii_u64__struct intersection( + wuffs_base__range_ii_u64__struct s); + inline wuffs_base__range_ii_u64__struct unionz( + wuffs_base__range_ii_u64__struct s); +#endif // __cplusplus + } wuffs_base__range_ii_u64; static inline bool wuffs_base__range_ii_u64__is_empty( @@ -494,11 +584,49 @@ static inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__range_ii_u64::is_empty() { + return wuffs_base__range_ii_u64__is_empty(this); +} + +inline bool wuffs_base__range_ii_u64::equals(wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__equals(this, s); +} + +inline bool wuffs_base__range_ii_u64::contains(uint64_t x) { + return wuffs_base__range_ii_u64__contains(this, x); +} + +inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::intersection( + wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__intersection(this, s); +} + +inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::unionz( + wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__union(this, s); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ie_u64__struct { uint64_t min_incl; uint64_t max_excl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ie_u64__struct s); + inline bool contains(uint64_t x); + inline wuffs_base__range_ie_u64__struct intersection( + wuffs_base__range_ie_u64__struct s); + inline wuffs_base__range_ie_u64__struct unionz( + wuffs_base__range_ie_u64__struct s); + inline uint64_t length(); +#endif // __cplusplus + } wuffs_base__range_ie_u64; static inline bool wuffs_base__range_ie_u64__is_empty( @@ -549,6 +677,36 @@ static inline uint64_t wuffs_base__range_ie_u64__length( return wuffs_base__u64__sat_sub(r->max_excl, r->min_incl); } +#ifdef __cplusplus + +inline bool wuffs_base__range_ie_u64::is_empty() { + return wuffs_base__range_ie_u64__is_empty(this); +} + +inline bool wuffs_base__range_ie_u64::equals(wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__equals(this, s); +} + +inline bool wuffs_base__range_ie_u64::contains(uint64_t x) { + return wuffs_base__range_ie_u64__contains(this, x); +} + +inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::intersection( + wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__intersection(this, s); +} + +inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::unionz( + wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__union(this, s); +} + +inline uint64_t wuffs_base__range_ie_u64::length() { + return wuffs_base__range_ie_u64__length(this); +} + +#endif // __cplusplus + // -------- // wuffs_base__rect_ii_u32 is a rectangle (a 2-dimensional range) on the @@ -560,11 +718,22 @@ static inline uint64_t wuffs_base__range_ie_u64__length( // multiple representations of an empty rectangle. // // The X and Y axes increase right and down. -typedef struct { +typedef struct wuffs_base__rect_ii_u32__struct { uint32_t min_incl_x; uint32_t min_incl_y; uint32_t max_incl_x; uint32_t max_incl_y; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__rect_ii_u32__struct s); + inline bool contains(uint32_t x, uint32_t y); + inline wuffs_base__rect_ii_u32__struct intersection( + wuffs_base__rect_ii_u32__struct s); + inline wuffs_base__rect_ii_u32__struct unionz( + wuffs_base__rect_ii_u32__struct s); +#endif // __cplusplus + } wuffs_base__rect_ii_u32; static inline bool wuffs_base__rect_ii_u32__is_empty( @@ -615,6 +784,32 @@ static inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__rect_ii_u32::is_empty() { + return wuffs_base__rect_ii_u32__is_empty(this); +} + +inline bool wuffs_base__rect_ii_u32::equals(wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__equals(this, s); +} + +inline bool wuffs_base__rect_ii_u32::contains(uint32_t x, uint32_t y) { + return wuffs_base__rect_ii_u32__contains(this, x, y); +} + +inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::intersection( + wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__intersection(this, s); +} + +inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::unionz( + wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__union(this, s); +} + +#endif // __cplusplus + // -------- // wuffs_base__rect_ie_u32 is a rectangle (a 2-dimensional range) on the @@ -627,11 +822,24 @@ static inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union( // fields zero. // // The X and Y axes increase right and down. -typedef struct { +typedef struct wuffs_base__rect_ie_u32__struct { uint32_t min_incl_x; uint32_t min_incl_y; uint32_t max_excl_x; uint32_t max_excl_y; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__rect_ie_u32__struct s); + inline bool contains(uint32_t x, uint32_t y); + inline wuffs_base__rect_ie_u32__struct intersection( + wuffs_base__rect_ie_u32__struct s); + inline wuffs_base__rect_ie_u32__struct unionz( + wuffs_base__rect_ie_u32__struct s); + inline uint32_t width(); + inline uint32_t height(); +#endif // __cplusplus + } wuffs_base__rect_ie_u32; static inline bool wuffs_base__rect_ie_u32__is_empty( @@ -692,6 +900,40 @@ static inline uint32_t wuffs_base__rect_ie_u32__height( return wuffs_base__u32__sat_sub(r->max_excl_y, r->min_incl_y); } +#ifdef __cplusplus + +inline bool wuffs_base__rect_ie_u32::is_empty() { + return wuffs_base__rect_ie_u32__is_empty(this); +} + +inline bool wuffs_base__rect_ie_u32::equals(wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__equals(this, s); +} + +inline bool wuffs_base__rect_ie_u32::contains(uint32_t x, uint32_t y) { + return wuffs_base__rect_ie_u32__contains(this, x, y); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::intersection( + wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__intersection(this, s); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::unionz( + wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__union(this, s); +} + +inline uint32_t wuffs_base__rect_ie_u32::width() { + return wuffs_base__rect_ie_u32__width(this); +} + +inline uint32_t wuffs_base__rect_ie_u32::height() { + return wuffs_base__rect_ie_u32__height(this); +} + +#endif // __cplusplus + // ---------------- I/O struct wuffs_base__io_buffer__struct; @@ -1057,6 +1299,26 @@ typedef struct { uint32_t num_loops; bool first_frame_is_opaque; } private_impl; + +#ifdef __cplusplus + inline void initialize(wuffs_base__pixel_format pixfmt, + wuffs_base__pixel_subsampling pixsub, + uint32_t width, + uint32_t height, + uint32_t num_loops, + bool first_frame_is_opaque); + inline void invalidate(); + inline bool is_valid(); + inline wuffs_base__pixel_format pixel_format(); + inline wuffs_base__pixel_subsampling pixel_subsampling(); + inline wuffs_base__rect_ie_u32 bounds(); + inline uint32_t width(); + inline uint32_t height(); + inline uint32_t num_loops(); + inline uint32_t first_frame_is_opaque(); + inline size_t pixbuf_size(); +#endif // __cplusplus + } wuffs_base__image_config; // TODO: Should this function return bool? An error type? @@ -1154,6 +1416,62 @@ static inline size_t wuffs_base__image_config__pixbuf_size( return 0; } +#ifdef __cplusplus + +inline void wuffs_base__image_config::initialize( + wuffs_base__pixel_format pixfmt, + wuffs_base__pixel_subsampling pixsub, + uint32_t width, + uint32_t height, + uint32_t num_loops, + bool first_frame_is_opaque) { + wuffs_base__image_config__initialize(this, pixfmt, pixsub, width, height, + num_loops, first_frame_is_opaque); +} + +inline void wuffs_base__image_config::invalidate() { + wuffs_base__image_config__invalidate(this); +} + +inline bool wuffs_base__image_config::is_valid() { + return wuffs_base__image_config__is_valid(this); +} + +inline wuffs_base__pixel_format wuffs_base__image_config::pixel_format() { + return wuffs_base__image_config__pixel_format(this); +} + +inline wuffs_base__pixel_subsampling +wuffs_base__image_config::pixel_subsampling() { + return wuffs_base__image_config__pixel_subsampling(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_config::bounds() { + return wuffs_base__image_config__bounds(this); +} + +inline uint32_t wuffs_base__image_config::width() { + return wuffs_base__image_config__width(this); +} + +inline uint32_t wuffs_base__image_config::height() { + return wuffs_base__image_config__height(this); +} + +inline uint32_t wuffs_base__image_config::num_loops() { + return wuffs_base__image_config__num_loops(this); +} + +inline uint32_t wuffs_base__image_config::first_frame_is_opaque() { + return wuffs_base__image_config__first_frame_is_opaque(this); +} + +inline size_t wuffs_base__image_config::pixbuf_size() { + return wuffs_base__image_config__pixbuf_size(this); +} + +#endif // __cplusplus + // -------- // wuffs_base__animation_disposal encodes, for an animated image, how to @@ -1189,6 +1507,30 @@ typedef struct { bool palette_changed; uint8_t palette[1024]; } private_impl; + +#ifdef __cplusplus + inline wuffs_base__status set_from_pixbuf(wuffs_base__image_config config, + wuffs_base__pixel_buffer pixbuf); + inline wuffs_base__status set_from_slice(wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory); + inline void update(wuffs_base__rect_ie_u32 dirty_rect, + wuffs_base__flicks duration, + bool blend, + wuffs_base__animation_disposal disposal, + wuffs_base__slice_u8 palette); + inline wuffs_base__image_config* image_config(); + inline wuffs_base__rect_ie_u32 bounds(); + inline uint32_t width(); + inline uint32_t height(); + inline wuffs_base__rect_ie_u32 dirty_rect(); + inline wuffs_base__flicks duration(); + inline bool blend(); + inline wuffs_base__animation_disposal disposal(); + inline bool palette_changed(); + inline wuffs_base__slice_u8 palette(); + inline wuffs_base__table_u8 plane(uint32_t p); +#endif // __cplusplus + } wuffs_base__image_buffer; static inline wuffs_base__status wuffs_base__image_buffer__set_from_pixbuf( @@ -1333,6 +1675,76 @@ static inline wuffs_base__table_u8 wuffs_base__image_buffer__plane( : ((wuffs_base__table_u8){}); } +#ifdef __cplusplus + +inline wuffs_base__status wuffs_base__image_buffer::set_from_pixbuf( + wuffs_base__image_config config, + wuffs_base__pixel_buffer pixbuf) { + return wuffs_base__image_buffer__set_from_pixbuf(this, config, pixbuf); +} + +inline wuffs_base__status wuffs_base__image_buffer::set_from_slice( + wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory) { + return wuffs_base__image_buffer__set_from_slice(this, config, pixbuf_memory); +} + +inline void wuffs_base__image_buffer::update( + wuffs_base__rect_ie_u32 dirty_rect, + wuffs_base__flicks duration, + bool blend, + wuffs_base__animation_disposal disposal, + wuffs_base__slice_u8 palette) { + wuffs_base__image_buffer__update(this, dirty_rect, duration, blend, disposal, + palette); +} + +inline wuffs_base__image_config* wuffs_base__image_buffer::image_config() { + return wuffs_base__image_buffer__image_config(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::bounds() { + return wuffs_base__image_buffer__bounds(this); +} + +inline uint32_t wuffs_base__image_buffer::width() { + return wuffs_base__image_buffer__width(this); +} + +inline uint32_t wuffs_base__image_buffer::height() { + return wuffs_base__image_buffer__height(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::dirty_rect() { + return wuffs_base__image_buffer__dirty_rect(this); +} + +inline wuffs_base__flicks wuffs_base__image_buffer::duration() { + return wuffs_base__image_buffer__duration(this); +} + +inline bool wuffs_base__image_buffer::blend() { + return wuffs_base__image_buffer__blend(this); +} + +inline wuffs_base__animation_disposal wuffs_base__image_buffer::disposal() { + return wuffs_base__image_buffer__disposal(this); +} + +inline bool wuffs_base__image_buffer::palette_changed() { + return wuffs_base__image_buffer__palette_changed(this); +} + +inline wuffs_base__slice_u8 wuffs_base__image_buffer::palette() { + return wuffs_base__image_buffer__palette(this); +} + +inline wuffs_base__table_u8 wuffs_base__image_buffer::plane(uint32_t p) { + return wuffs_base__image_buffer__plane(this, p); +} + +#endif // __cplusplus + #ifdef __cplusplus } // extern "C" #endif diff --git a/gen/c/std/adler32.c b/gen/c/std/adler32.c index ef7337b4..8ec2517a 100644 --- a/gen/c/std/adler32.c +++ b/gen/c/std/adler32.c @@ -330,9 +330,20 @@ typedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64; // in which case the range is empty. There are multiple representations of an // empty range. -typedef struct { +typedef struct wuffs_base__range_ii_u32__struct { uint32_t min_incl; uint32_t max_incl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ii_u32__struct s); + inline bool contains(uint32_t x); + inline wuffs_base__range_ii_u32__struct intersection( + wuffs_base__range_ii_u32__struct s); + inline wuffs_base__range_ii_u32__struct unionz( + wuffs_base__range_ii_u32__struct s); +#endif // __cplusplus + } wuffs_base__range_ii_u32; static inline bool wuffs_base__range_ii_u32__is_empty( @@ -378,11 +389,49 @@ static inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__range_ii_u32::is_empty() { + return wuffs_base__range_ii_u32__is_empty(this); +} + +inline bool wuffs_base__range_ii_u32::equals(wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__equals(this, s); +} + +inline bool wuffs_base__range_ii_u32::contains(uint32_t x) { + return wuffs_base__range_ii_u32__contains(this, x); +} + +inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::intersection( + wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__intersection(this, s); +} + +inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::unionz( + wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__union(this, s); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ie_u32__struct { uint32_t min_incl; uint32_t max_excl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ie_u32__struct s); + inline bool contains(uint32_t x); + inline wuffs_base__range_ie_u32__struct intersection( + wuffs_base__range_ie_u32__struct s); + inline wuffs_base__range_ie_u32__struct unionz( + wuffs_base__range_ie_u32__struct s); + inline uint32_t length(); +#endif // __cplusplus + } wuffs_base__range_ie_u32; static inline bool wuffs_base__range_ie_u32__is_empty( @@ -433,11 +482,52 @@ static inline uint32_t wuffs_base__range_ie_u32__length( return wuffs_base__u32__sat_sub(r->max_excl, r->min_incl); } +#ifdef __cplusplus + +inline bool wuffs_base__range_ie_u32::is_empty() { + return wuffs_base__range_ie_u32__is_empty(this); +} + +inline bool wuffs_base__range_ie_u32::equals(wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__equals(this, s); +} + +inline bool wuffs_base__range_ie_u32::contains(uint32_t x) { + return wuffs_base__range_ie_u32__contains(this, x); +} + +inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::intersection( + wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__intersection(this, s); +} + +inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::unionz( + wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__union(this, s); +} + +inline uint32_t wuffs_base__range_ie_u32::length() { + return wuffs_base__range_ie_u32__length(this); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ii_u64__struct { uint64_t min_incl; uint64_t max_incl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ii_u64__struct s); + inline bool contains(uint64_t x); + inline wuffs_base__range_ii_u64__struct intersection( + wuffs_base__range_ii_u64__struct s); + inline wuffs_base__range_ii_u64__struct unionz( + wuffs_base__range_ii_u64__struct s); +#endif // __cplusplus + } wuffs_base__range_ii_u64; static inline bool wuffs_base__range_ii_u64__is_empty( @@ -483,11 +573,49 @@ static inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__range_ii_u64::is_empty() { + return wuffs_base__range_ii_u64__is_empty(this); +} + +inline bool wuffs_base__range_ii_u64::equals(wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__equals(this, s); +} + +inline bool wuffs_base__range_ii_u64::contains(uint64_t x) { + return wuffs_base__range_ii_u64__contains(this, x); +} + +inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::intersection( + wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__intersection(this, s); +} + +inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::unionz( + wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__union(this, s); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ie_u64__struct { uint64_t min_incl; uint64_t max_excl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ie_u64__struct s); + inline bool contains(uint64_t x); + inline wuffs_base__range_ie_u64__struct intersection( + wuffs_base__range_ie_u64__struct s); + inline wuffs_base__range_ie_u64__struct unionz( + wuffs_base__range_ie_u64__struct s); + inline uint64_t length(); +#endif // __cplusplus + } wuffs_base__range_ie_u64; static inline bool wuffs_base__range_ie_u64__is_empty( @@ -538,6 +666,36 @@ static inline uint64_t wuffs_base__range_ie_u64__length( return wuffs_base__u64__sat_sub(r->max_excl, r->min_incl); } +#ifdef __cplusplus + +inline bool wuffs_base__range_ie_u64::is_empty() { + return wuffs_base__range_ie_u64__is_empty(this); +} + +inline bool wuffs_base__range_ie_u64::equals(wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__equals(this, s); +} + +inline bool wuffs_base__range_ie_u64::contains(uint64_t x) { + return wuffs_base__range_ie_u64__contains(this, x); +} + +inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::intersection( + wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__intersection(this, s); +} + +inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::unionz( + wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__union(this, s); +} + +inline uint64_t wuffs_base__range_ie_u64::length() { + return wuffs_base__range_ie_u64__length(this); +} + +#endif // __cplusplus + // -------- // wuffs_base__rect_ii_u32 is a rectangle (a 2-dimensional range) on the @@ -549,11 +707,22 @@ static inline uint64_t wuffs_base__range_ie_u64__length( // multiple representations of an empty rectangle. // // The X and Y axes increase right and down. -typedef struct { +typedef struct wuffs_base__rect_ii_u32__struct { uint32_t min_incl_x; uint32_t min_incl_y; uint32_t max_incl_x; uint32_t max_incl_y; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__rect_ii_u32__struct s); + inline bool contains(uint32_t x, uint32_t y); + inline wuffs_base__rect_ii_u32__struct intersection( + wuffs_base__rect_ii_u32__struct s); + inline wuffs_base__rect_ii_u32__struct unionz( + wuffs_base__rect_ii_u32__struct s); +#endif // __cplusplus + } wuffs_base__rect_ii_u32; static inline bool wuffs_base__rect_ii_u32__is_empty( @@ -604,6 +773,32 @@ static inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__rect_ii_u32::is_empty() { + return wuffs_base__rect_ii_u32__is_empty(this); +} + +inline bool wuffs_base__rect_ii_u32::equals(wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__equals(this, s); +} + +inline bool wuffs_base__rect_ii_u32::contains(uint32_t x, uint32_t y) { + return wuffs_base__rect_ii_u32__contains(this, x, y); +} + +inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::intersection( + wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__intersection(this, s); +} + +inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::unionz( + wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__union(this, s); +} + +#endif // __cplusplus + // -------- // wuffs_base__rect_ie_u32 is a rectangle (a 2-dimensional range) on the @@ -616,11 +811,24 @@ static inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union( // fields zero. // // The X and Y axes increase right and down. -typedef struct { +typedef struct wuffs_base__rect_ie_u32__struct { uint32_t min_incl_x; uint32_t min_incl_y; uint32_t max_excl_x; uint32_t max_excl_y; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__rect_ie_u32__struct s); + inline bool contains(uint32_t x, uint32_t y); + inline wuffs_base__rect_ie_u32__struct intersection( + wuffs_base__rect_ie_u32__struct s); + inline wuffs_base__rect_ie_u32__struct unionz( + wuffs_base__rect_ie_u32__struct s); + inline uint32_t width(); + inline uint32_t height(); +#endif // __cplusplus + } wuffs_base__rect_ie_u32; static inline bool wuffs_base__rect_ie_u32__is_empty( @@ -681,6 +889,40 @@ static inline uint32_t wuffs_base__rect_ie_u32__height( return wuffs_base__u32__sat_sub(r->max_excl_y, r->min_incl_y); } +#ifdef __cplusplus + +inline bool wuffs_base__rect_ie_u32::is_empty() { + return wuffs_base__rect_ie_u32__is_empty(this); +} + +inline bool wuffs_base__rect_ie_u32::equals(wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__equals(this, s); +} + +inline bool wuffs_base__rect_ie_u32::contains(uint32_t x, uint32_t y) { + return wuffs_base__rect_ie_u32__contains(this, x, y); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::intersection( + wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__intersection(this, s); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::unionz( + wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__union(this, s); +} + +inline uint32_t wuffs_base__rect_ie_u32::width() { + return wuffs_base__rect_ie_u32__width(this); +} + +inline uint32_t wuffs_base__rect_ie_u32::height() { + return wuffs_base__rect_ie_u32__height(this); +} + +#endif // __cplusplus + // ---------------- I/O struct wuffs_base__io_buffer__struct; @@ -1046,6 +1288,26 @@ typedef struct { uint32_t num_loops; bool first_frame_is_opaque; } private_impl; + +#ifdef __cplusplus + inline void initialize(wuffs_base__pixel_format pixfmt, + wuffs_base__pixel_subsampling pixsub, + uint32_t width, + uint32_t height, + uint32_t num_loops, + bool first_frame_is_opaque); + inline void invalidate(); + inline bool is_valid(); + inline wuffs_base__pixel_format pixel_format(); + inline wuffs_base__pixel_subsampling pixel_subsampling(); + inline wuffs_base__rect_ie_u32 bounds(); + inline uint32_t width(); + inline uint32_t height(); + inline uint32_t num_loops(); + inline uint32_t first_frame_is_opaque(); + inline size_t pixbuf_size(); +#endif // __cplusplus + } wuffs_base__image_config; // TODO: Should this function return bool? An error type? @@ -1143,6 +1405,62 @@ static inline size_t wuffs_base__image_config__pixbuf_size( return 0; } +#ifdef __cplusplus + +inline void wuffs_base__image_config::initialize( + wuffs_base__pixel_format pixfmt, + wuffs_base__pixel_subsampling pixsub, + uint32_t width, + uint32_t height, + uint32_t num_loops, + bool first_frame_is_opaque) { + wuffs_base__image_config__initialize(this, pixfmt, pixsub, width, height, + num_loops, first_frame_is_opaque); +} + +inline void wuffs_base__image_config::invalidate() { + wuffs_base__image_config__invalidate(this); +} + +inline bool wuffs_base__image_config::is_valid() { + return wuffs_base__image_config__is_valid(this); +} + +inline wuffs_base__pixel_format wuffs_base__image_config::pixel_format() { + return wuffs_base__image_config__pixel_format(this); +} + +inline wuffs_base__pixel_subsampling +wuffs_base__image_config::pixel_subsampling() { + return wuffs_base__image_config__pixel_subsampling(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_config::bounds() { + return wuffs_base__image_config__bounds(this); +} + +inline uint32_t wuffs_base__image_config::width() { + return wuffs_base__image_config__width(this); +} + +inline uint32_t wuffs_base__image_config::height() { + return wuffs_base__image_config__height(this); +} + +inline uint32_t wuffs_base__image_config::num_loops() { + return wuffs_base__image_config__num_loops(this); +} + +inline uint32_t wuffs_base__image_config::first_frame_is_opaque() { + return wuffs_base__image_config__first_frame_is_opaque(this); +} + +inline size_t wuffs_base__image_config::pixbuf_size() { + return wuffs_base__image_config__pixbuf_size(this); +} + +#endif // __cplusplus + // -------- // wuffs_base__animation_disposal encodes, for an animated image, how to @@ -1178,6 +1496,30 @@ typedef struct { bool palette_changed; uint8_t palette[1024]; } private_impl; + +#ifdef __cplusplus + inline wuffs_base__status set_from_pixbuf(wuffs_base__image_config config, + wuffs_base__pixel_buffer pixbuf); + inline wuffs_base__status set_from_slice(wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory); + inline void update(wuffs_base__rect_ie_u32 dirty_rect, + wuffs_base__flicks duration, + bool blend, + wuffs_base__animation_disposal disposal, + wuffs_base__slice_u8 palette); + inline wuffs_base__image_config* image_config(); + inline wuffs_base__rect_ie_u32 bounds(); + inline uint32_t width(); + inline uint32_t height(); + inline wuffs_base__rect_ie_u32 dirty_rect(); + inline wuffs_base__flicks duration(); + inline bool blend(); + inline wuffs_base__animation_disposal disposal(); + inline bool palette_changed(); + inline wuffs_base__slice_u8 palette(); + inline wuffs_base__table_u8 plane(uint32_t p); +#endif // __cplusplus + } wuffs_base__image_buffer; static inline wuffs_base__status wuffs_base__image_buffer__set_from_pixbuf( @@ -1322,6 +1664,76 @@ static inline wuffs_base__table_u8 wuffs_base__image_buffer__plane( : ((wuffs_base__table_u8){}); } +#ifdef __cplusplus + +inline wuffs_base__status wuffs_base__image_buffer::set_from_pixbuf( + wuffs_base__image_config config, + wuffs_base__pixel_buffer pixbuf) { + return wuffs_base__image_buffer__set_from_pixbuf(this, config, pixbuf); +} + +inline wuffs_base__status wuffs_base__image_buffer::set_from_slice( + wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory) { + return wuffs_base__image_buffer__set_from_slice(this, config, pixbuf_memory); +} + +inline void wuffs_base__image_buffer::update( + wuffs_base__rect_ie_u32 dirty_rect, + wuffs_base__flicks duration, + bool blend, + wuffs_base__animation_disposal disposal, + wuffs_base__slice_u8 palette) { + wuffs_base__image_buffer__update(this, dirty_rect, duration, blend, disposal, + palette); +} + +inline wuffs_base__image_config* wuffs_base__image_buffer::image_config() { + return wuffs_base__image_buffer__image_config(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::bounds() { + return wuffs_base__image_buffer__bounds(this); +} + +inline uint32_t wuffs_base__image_buffer::width() { + return wuffs_base__image_buffer__width(this); +} + +inline uint32_t wuffs_base__image_buffer::height() { + return wuffs_base__image_buffer__height(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::dirty_rect() { + return wuffs_base__image_buffer__dirty_rect(this); +} + +inline wuffs_base__flicks wuffs_base__image_buffer::duration() { + return wuffs_base__image_buffer__duration(this); +} + +inline bool wuffs_base__image_buffer::blend() { + return wuffs_base__image_buffer__blend(this); +} + +inline wuffs_base__animation_disposal wuffs_base__image_buffer::disposal() { + return wuffs_base__image_buffer__disposal(this); +} + +inline bool wuffs_base__image_buffer::palette_changed() { + return wuffs_base__image_buffer__palette_changed(this); +} + +inline wuffs_base__slice_u8 wuffs_base__image_buffer::palette() { + return wuffs_base__image_buffer__palette(this); +} + +inline wuffs_base__table_u8 wuffs_base__image_buffer::plane(uint32_t p) { + return wuffs_base__image_buffer__plane(this, p); +} + +#endif // __cplusplus + #ifdef __cplusplus } // extern "C" #endif diff --git a/gen/c/std/crc32.c b/gen/c/std/crc32.c index 80d9739c..e802a9af 100644 --- a/gen/c/std/crc32.c +++ b/gen/c/std/crc32.c @@ -330,9 +330,20 @@ typedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64; // in which case the range is empty. There are multiple representations of an // empty range. -typedef struct { +typedef struct wuffs_base__range_ii_u32__struct { uint32_t min_incl; uint32_t max_incl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ii_u32__struct s); + inline bool contains(uint32_t x); + inline wuffs_base__range_ii_u32__struct intersection( + wuffs_base__range_ii_u32__struct s); + inline wuffs_base__range_ii_u32__struct unionz( + wuffs_base__range_ii_u32__struct s); +#endif // __cplusplus + } wuffs_base__range_ii_u32; static inline bool wuffs_base__range_ii_u32__is_empty( @@ -378,11 +389,49 @@ static inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__range_ii_u32::is_empty() { + return wuffs_base__range_ii_u32__is_empty(this); +} + +inline bool wuffs_base__range_ii_u32::equals(wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__equals(this, s); +} + +inline bool wuffs_base__range_ii_u32::contains(uint32_t x) { + return wuffs_base__range_ii_u32__contains(this, x); +} + +inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::intersection( + wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__intersection(this, s); +} + +inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::unionz( + wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__union(this, s); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ie_u32__struct { uint32_t min_incl; uint32_t max_excl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ie_u32__struct s); + inline bool contains(uint32_t x); + inline wuffs_base__range_ie_u32__struct intersection( + wuffs_base__range_ie_u32__struct s); + inline wuffs_base__range_ie_u32__struct unionz( + wuffs_base__range_ie_u32__struct s); + inline uint32_t length(); +#endif // __cplusplus + } wuffs_base__range_ie_u32; static inline bool wuffs_base__range_ie_u32__is_empty( @@ -433,11 +482,52 @@ static inline uint32_t wuffs_base__range_ie_u32__length( return wuffs_base__u32__sat_sub(r->max_excl, r->min_incl); } +#ifdef __cplusplus + +inline bool wuffs_base__range_ie_u32::is_empty() { + return wuffs_base__range_ie_u32__is_empty(this); +} + +inline bool wuffs_base__range_ie_u32::equals(wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__equals(this, s); +} + +inline bool wuffs_base__range_ie_u32::contains(uint32_t x) { + return wuffs_base__range_ie_u32__contains(this, x); +} + +inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::intersection( + wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__intersection(this, s); +} + +inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::unionz( + wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__union(this, s); +} + +inline uint32_t wuffs_base__range_ie_u32::length() { + return wuffs_base__range_ie_u32__length(this); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ii_u64__struct { uint64_t min_incl; uint64_t max_incl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ii_u64__struct s); + inline bool contains(uint64_t x); + inline wuffs_base__range_ii_u64__struct intersection( + wuffs_base__range_ii_u64__struct s); + inline wuffs_base__range_ii_u64__struct unionz( + wuffs_base__range_ii_u64__struct s); +#endif // __cplusplus + } wuffs_base__range_ii_u64; static inline bool wuffs_base__range_ii_u64__is_empty( @@ -483,11 +573,49 @@ static inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__range_ii_u64::is_empty() { + return wuffs_base__range_ii_u64__is_empty(this); +} + +inline bool wuffs_base__range_ii_u64::equals(wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__equals(this, s); +} + +inline bool wuffs_base__range_ii_u64::contains(uint64_t x) { + return wuffs_base__range_ii_u64__contains(this, x); +} + +inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::intersection( + wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__intersection(this, s); +} + +inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::unionz( + wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__union(this, s); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ie_u64__struct { uint64_t min_incl; uint64_t max_excl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ie_u64__struct s); + inline bool contains(uint64_t x); + inline wuffs_base__range_ie_u64__struct intersection( + wuffs_base__range_ie_u64__struct s); + inline wuffs_base__range_ie_u64__struct unionz( + wuffs_base__range_ie_u64__struct s); + inline uint64_t length(); +#endif // __cplusplus + } wuffs_base__range_ie_u64; static inline bool wuffs_base__range_ie_u64__is_empty( @@ -538,6 +666,36 @@ static inline uint64_t wuffs_base__range_ie_u64__length( return wuffs_base__u64__sat_sub(r->max_excl, r->min_incl); } +#ifdef __cplusplus + +inline bool wuffs_base__range_ie_u64::is_empty() { + return wuffs_base__range_ie_u64__is_empty(this); +} + +inline bool wuffs_base__range_ie_u64::equals(wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__equals(this, s); +} + +inline bool wuffs_base__range_ie_u64::contains(uint64_t x) { + return wuffs_base__range_ie_u64__contains(this, x); +} + +inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::intersection( + wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__intersection(this, s); +} + +inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::unionz( + wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__union(this, s); +} + +inline uint64_t wuffs_base__range_ie_u64::length() { + return wuffs_base__range_ie_u64__length(this); +} + +#endif // __cplusplus + // -------- // wuffs_base__rect_ii_u32 is a rectangle (a 2-dimensional range) on the @@ -549,11 +707,22 @@ static inline uint64_t wuffs_base__range_ie_u64__length( // multiple representations of an empty rectangle. // // The X and Y axes increase right and down. -typedef struct { +typedef struct wuffs_base__rect_ii_u32__struct { uint32_t min_incl_x; uint32_t min_incl_y; uint32_t max_incl_x; uint32_t max_incl_y; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__rect_ii_u32__struct s); + inline bool contains(uint32_t x, uint32_t y); + inline wuffs_base__rect_ii_u32__struct intersection( + wuffs_base__rect_ii_u32__struct s); + inline wuffs_base__rect_ii_u32__struct unionz( + wuffs_base__rect_ii_u32__struct s); +#endif // __cplusplus + } wuffs_base__rect_ii_u32; static inline bool wuffs_base__rect_ii_u32__is_empty( @@ -604,6 +773,32 @@ static inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__rect_ii_u32::is_empty() { + return wuffs_base__rect_ii_u32__is_empty(this); +} + +inline bool wuffs_base__rect_ii_u32::equals(wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__equals(this, s); +} + +inline bool wuffs_base__rect_ii_u32::contains(uint32_t x, uint32_t y) { + return wuffs_base__rect_ii_u32__contains(this, x, y); +} + +inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::intersection( + wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__intersection(this, s); +} + +inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::unionz( + wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__union(this, s); +} + +#endif // __cplusplus + // -------- // wuffs_base__rect_ie_u32 is a rectangle (a 2-dimensional range) on the @@ -616,11 +811,24 @@ static inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union( // fields zero. // // The X and Y axes increase right and down. -typedef struct { +typedef struct wuffs_base__rect_ie_u32__struct { uint32_t min_incl_x; uint32_t min_incl_y; uint32_t max_excl_x; uint32_t max_excl_y; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__rect_ie_u32__struct s); + inline bool contains(uint32_t x, uint32_t y); + inline wuffs_base__rect_ie_u32__struct intersection( + wuffs_base__rect_ie_u32__struct s); + inline wuffs_base__rect_ie_u32__struct unionz( + wuffs_base__rect_ie_u32__struct s); + inline uint32_t width(); + inline uint32_t height(); +#endif // __cplusplus + } wuffs_base__rect_ie_u32; static inline bool wuffs_base__rect_ie_u32__is_empty( @@ -681,6 +889,40 @@ static inline uint32_t wuffs_base__rect_ie_u32__height( return wuffs_base__u32__sat_sub(r->max_excl_y, r->min_incl_y); } +#ifdef __cplusplus + +inline bool wuffs_base__rect_ie_u32::is_empty() { + return wuffs_base__rect_ie_u32__is_empty(this); +} + +inline bool wuffs_base__rect_ie_u32::equals(wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__equals(this, s); +} + +inline bool wuffs_base__rect_ie_u32::contains(uint32_t x, uint32_t y) { + return wuffs_base__rect_ie_u32__contains(this, x, y); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::intersection( + wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__intersection(this, s); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::unionz( + wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__union(this, s); +} + +inline uint32_t wuffs_base__rect_ie_u32::width() { + return wuffs_base__rect_ie_u32__width(this); +} + +inline uint32_t wuffs_base__rect_ie_u32::height() { + return wuffs_base__rect_ie_u32__height(this); +} + +#endif // __cplusplus + // ---------------- I/O struct wuffs_base__io_buffer__struct; @@ -1046,6 +1288,26 @@ typedef struct { uint32_t num_loops; bool first_frame_is_opaque; } private_impl; + +#ifdef __cplusplus + inline void initialize(wuffs_base__pixel_format pixfmt, + wuffs_base__pixel_subsampling pixsub, + uint32_t width, + uint32_t height, + uint32_t num_loops, + bool first_frame_is_opaque); + inline void invalidate(); + inline bool is_valid(); + inline wuffs_base__pixel_format pixel_format(); + inline wuffs_base__pixel_subsampling pixel_subsampling(); + inline wuffs_base__rect_ie_u32 bounds(); + inline uint32_t width(); + inline uint32_t height(); + inline uint32_t num_loops(); + inline uint32_t first_frame_is_opaque(); + inline size_t pixbuf_size(); +#endif // __cplusplus + } wuffs_base__image_config; // TODO: Should this function return bool? An error type? @@ -1143,6 +1405,62 @@ static inline size_t wuffs_base__image_config__pixbuf_size( return 0; } +#ifdef __cplusplus + +inline void wuffs_base__image_config::initialize( + wuffs_base__pixel_format pixfmt, + wuffs_base__pixel_subsampling pixsub, + uint32_t width, + uint32_t height, + uint32_t num_loops, + bool first_frame_is_opaque) { + wuffs_base__image_config__initialize(this, pixfmt, pixsub, width, height, + num_loops, first_frame_is_opaque); +} + +inline void wuffs_base__image_config::invalidate() { + wuffs_base__image_config__invalidate(this); +} + +inline bool wuffs_base__image_config::is_valid() { + return wuffs_base__image_config__is_valid(this); +} + +inline wuffs_base__pixel_format wuffs_base__image_config::pixel_format() { + return wuffs_base__image_config__pixel_format(this); +} + +inline wuffs_base__pixel_subsampling +wuffs_base__image_config::pixel_subsampling() { + return wuffs_base__image_config__pixel_subsampling(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_config::bounds() { + return wuffs_base__image_config__bounds(this); +} + +inline uint32_t wuffs_base__image_config::width() { + return wuffs_base__image_config__width(this); +} + +inline uint32_t wuffs_base__image_config::height() { + return wuffs_base__image_config__height(this); +} + +inline uint32_t wuffs_base__image_config::num_loops() { + return wuffs_base__image_config__num_loops(this); +} + +inline uint32_t wuffs_base__image_config::first_frame_is_opaque() { + return wuffs_base__image_config__first_frame_is_opaque(this); +} + +inline size_t wuffs_base__image_config::pixbuf_size() { + return wuffs_base__image_config__pixbuf_size(this); +} + +#endif // __cplusplus + // -------- // wuffs_base__animation_disposal encodes, for an animated image, how to @@ -1178,6 +1496,30 @@ typedef struct { bool palette_changed; uint8_t palette[1024]; } private_impl; + +#ifdef __cplusplus + inline wuffs_base__status set_from_pixbuf(wuffs_base__image_config config, + wuffs_base__pixel_buffer pixbuf); + inline wuffs_base__status set_from_slice(wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory); + inline void update(wuffs_base__rect_ie_u32 dirty_rect, + wuffs_base__flicks duration, + bool blend, + wuffs_base__animation_disposal disposal, + wuffs_base__slice_u8 palette); + inline wuffs_base__image_config* image_config(); + inline wuffs_base__rect_ie_u32 bounds(); + inline uint32_t width(); + inline uint32_t height(); + inline wuffs_base__rect_ie_u32 dirty_rect(); + inline wuffs_base__flicks duration(); + inline bool blend(); + inline wuffs_base__animation_disposal disposal(); + inline bool palette_changed(); + inline wuffs_base__slice_u8 palette(); + inline wuffs_base__table_u8 plane(uint32_t p); +#endif // __cplusplus + } wuffs_base__image_buffer; static inline wuffs_base__status wuffs_base__image_buffer__set_from_pixbuf( @@ -1322,6 +1664,76 @@ static inline wuffs_base__table_u8 wuffs_base__image_buffer__plane( : ((wuffs_base__table_u8){}); } +#ifdef __cplusplus + +inline wuffs_base__status wuffs_base__image_buffer::set_from_pixbuf( + wuffs_base__image_config config, + wuffs_base__pixel_buffer pixbuf) { + return wuffs_base__image_buffer__set_from_pixbuf(this, config, pixbuf); +} + +inline wuffs_base__status wuffs_base__image_buffer::set_from_slice( + wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory) { + return wuffs_base__image_buffer__set_from_slice(this, config, pixbuf_memory); +} + +inline void wuffs_base__image_buffer::update( + wuffs_base__rect_ie_u32 dirty_rect, + wuffs_base__flicks duration, + bool blend, + wuffs_base__animation_disposal disposal, + wuffs_base__slice_u8 palette) { + wuffs_base__image_buffer__update(this, dirty_rect, duration, blend, disposal, + palette); +} + +inline wuffs_base__image_config* wuffs_base__image_buffer::image_config() { + return wuffs_base__image_buffer__image_config(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::bounds() { + return wuffs_base__image_buffer__bounds(this); +} + +inline uint32_t wuffs_base__image_buffer::width() { + return wuffs_base__image_buffer__width(this); +} + +inline uint32_t wuffs_base__image_buffer::height() { + return wuffs_base__image_buffer__height(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::dirty_rect() { + return wuffs_base__image_buffer__dirty_rect(this); +} + +inline wuffs_base__flicks wuffs_base__image_buffer::duration() { + return wuffs_base__image_buffer__duration(this); +} + +inline bool wuffs_base__image_buffer::blend() { + return wuffs_base__image_buffer__blend(this); +} + +inline wuffs_base__animation_disposal wuffs_base__image_buffer::disposal() { + return wuffs_base__image_buffer__disposal(this); +} + +inline bool wuffs_base__image_buffer::palette_changed() { + return wuffs_base__image_buffer__palette_changed(this); +} + +inline wuffs_base__slice_u8 wuffs_base__image_buffer::palette() { + return wuffs_base__image_buffer__palette(this); +} + +inline wuffs_base__table_u8 wuffs_base__image_buffer::plane(uint32_t p) { + return wuffs_base__image_buffer__plane(this, p); +} + +#endif // __cplusplus + #ifdef __cplusplus } // extern "C" #endif diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index 64fc732f..2b34e6f6 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -330,9 +330,20 @@ typedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64; // in which case the range is empty. There are multiple representations of an // empty range. -typedef struct { +typedef struct wuffs_base__range_ii_u32__struct { uint32_t min_incl; uint32_t max_incl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ii_u32__struct s); + inline bool contains(uint32_t x); + inline wuffs_base__range_ii_u32__struct intersection( + wuffs_base__range_ii_u32__struct s); + inline wuffs_base__range_ii_u32__struct unionz( + wuffs_base__range_ii_u32__struct s); +#endif // __cplusplus + } wuffs_base__range_ii_u32; static inline bool wuffs_base__range_ii_u32__is_empty( @@ -378,11 +389,49 @@ static inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__range_ii_u32::is_empty() { + return wuffs_base__range_ii_u32__is_empty(this); +} + +inline bool wuffs_base__range_ii_u32::equals(wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__equals(this, s); +} + +inline bool wuffs_base__range_ii_u32::contains(uint32_t x) { + return wuffs_base__range_ii_u32__contains(this, x); +} + +inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::intersection( + wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__intersection(this, s); +} + +inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::unionz( + wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__union(this, s); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ie_u32__struct { uint32_t min_incl; uint32_t max_excl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ie_u32__struct s); + inline bool contains(uint32_t x); + inline wuffs_base__range_ie_u32__struct intersection( + wuffs_base__range_ie_u32__struct s); + inline wuffs_base__range_ie_u32__struct unionz( + wuffs_base__range_ie_u32__struct s); + inline uint32_t length(); +#endif // __cplusplus + } wuffs_base__range_ie_u32; static inline bool wuffs_base__range_ie_u32__is_empty( @@ -433,11 +482,52 @@ static inline uint32_t wuffs_base__range_ie_u32__length( return wuffs_base__u32__sat_sub(r->max_excl, r->min_incl); } +#ifdef __cplusplus + +inline bool wuffs_base__range_ie_u32::is_empty() { + return wuffs_base__range_ie_u32__is_empty(this); +} + +inline bool wuffs_base__range_ie_u32::equals(wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__equals(this, s); +} + +inline bool wuffs_base__range_ie_u32::contains(uint32_t x) { + return wuffs_base__range_ie_u32__contains(this, x); +} + +inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::intersection( + wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__intersection(this, s); +} + +inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::unionz( + wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__union(this, s); +} + +inline uint32_t wuffs_base__range_ie_u32::length() { + return wuffs_base__range_ie_u32__length(this); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ii_u64__struct { uint64_t min_incl; uint64_t max_incl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ii_u64__struct s); + inline bool contains(uint64_t x); + inline wuffs_base__range_ii_u64__struct intersection( + wuffs_base__range_ii_u64__struct s); + inline wuffs_base__range_ii_u64__struct unionz( + wuffs_base__range_ii_u64__struct s); +#endif // __cplusplus + } wuffs_base__range_ii_u64; static inline bool wuffs_base__range_ii_u64__is_empty( @@ -483,11 +573,49 @@ static inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__range_ii_u64::is_empty() { + return wuffs_base__range_ii_u64__is_empty(this); +} + +inline bool wuffs_base__range_ii_u64::equals(wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__equals(this, s); +} + +inline bool wuffs_base__range_ii_u64::contains(uint64_t x) { + return wuffs_base__range_ii_u64__contains(this, x); +} + +inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::intersection( + wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__intersection(this, s); +} + +inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::unionz( + wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__union(this, s); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ie_u64__struct { uint64_t min_incl; uint64_t max_excl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ie_u64__struct s); + inline bool contains(uint64_t x); + inline wuffs_base__range_ie_u64__struct intersection( + wuffs_base__range_ie_u64__struct s); + inline wuffs_base__range_ie_u64__struct unionz( + wuffs_base__range_ie_u64__struct s); + inline uint64_t length(); +#endif // __cplusplus + } wuffs_base__range_ie_u64; static inline bool wuffs_base__range_ie_u64__is_empty( @@ -538,6 +666,36 @@ static inline uint64_t wuffs_base__range_ie_u64__length( return wuffs_base__u64__sat_sub(r->max_excl, r->min_incl); } +#ifdef __cplusplus + +inline bool wuffs_base__range_ie_u64::is_empty() { + return wuffs_base__range_ie_u64__is_empty(this); +} + +inline bool wuffs_base__range_ie_u64::equals(wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__equals(this, s); +} + +inline bool wuffs_base__range_ie_u64::contains(uint64_t x) { + return wuffs_base__range_ie_u64__contains(this, x); +} + +inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::intersection( + wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__intersection(this, s); +} + +inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::unionz( + wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__union(this, s); +} + +inline uint64_t wuffs_base__range_ie_u64::length() { + return wuffs_base__range_ie_u64__length(this); +} + +#endif // __cplusplus + // -------- // wuffs_base__rect_ii_u32 is a rectangle (a 2-dimensional range) on the @@ -549,11 +707,22 @@ static inline uint64_t wuffs_base__range_ie_u64__length( // multiple representations of an empty rectangle. // // The X and Y axes increase right and down. -typedef struct { +typedef struct wuffs_base__rect_ii_u32__struct { uint32_t min_incl_x; uint32_t min_incl_y; uint32_t max_incl_x; uint32_t max_incl_y; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__rect_ii_u32__struct s); + inline bool contains(uint32_t x, uint32_t y); + inline wuffs_base__rect_ii_u32__struct intersection( + wuffs_base__rect_ii_u32__struct s); + inline wuffs_base__rect_ii_u32__struct unionz( + wuffs_base__rect_ii_u32__struct s); +#endif // __cplusplus + } wuffs_base__rect_ii_u32; static inline bool wuffs_base__rect_ii_u32__is_empty( @@ -604,6 +773,32 @@ static inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__rect_ii_u32::is_empty() { + return wuffs_base__rect_ii_u32__is_empty(this); +} + +inline bool wuffs_base__rect_ii_u32::equals(wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__equals(this, s); +} + +inline bool wuffs_base__rect_ii_u32::contains(uint32_t x, uint32_t y) { + return wuffs_base__rect_ii_u32__contains(this, x, y); +} + +inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::intersection( + wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__intersection(this, s); +} + +inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::unionz( + wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__union(this, s); +} + +#endif // __cplusplus + // -------- // wuffs_base__rect_ie_u32 is a rectangle (a 2-dimensional range) on the @@ -616,11 +811,24 @@ static inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union( // fields zero. // // The X and Y axes increase right and down. -typedef struct { +typedef struct wuffs_base__rect_ie_u32__struct { uint32_t min_incl_x; uint32_t min_incl_y; uint32_t max_excl_x; uint32_t max_excl_y; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__rect_ie_u32__struct s); + inline bool contains(uint32_t x, uint32_t y); + inline wuffs_base__rect_ie_u32__struct intersection( + wuffs_base__rect_ie_u32__struct s); + inline wuffs_base__rect_ie_u32__struct unionz( + wuffs_base__rect_ie_u32__struct s); + inline uint32_t width(); + inline uint32_t height(); +#endif // __cplusplus + } wuffs_base__rect_ie_u32; static inline bool wuffs_base__rect_ie_u32__is_empty( @@ -681,6 +889,40 @@ static inline uint32_t wuffs_base__rect_ie_u32__height( return wuffs_base__u32__sat_sub(r->max_excl_y, r->min_incl_y); } +#ifdef __cplusplus + +inline bool wuffs_base__rect_ie_u32::is_empty() { + return wuffs_base__rect_ie_u32__is_empty(this); +} + +inline bool wuffs_base__rect_ie_u32::equals(wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__equals(this, s); +} + +inline bool wuffs_base__rect_ie_u32::contains(uint32_t x, uint32_t y) { + return wuffs_base__rect_ie_u32__contains(this, x, y); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::intersection( + wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__intersection(this, s); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::unionz( + wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__union(this, s); +} + +inline uint32_t wuffs_base__rect_ie_u32::width() { + return wuffs_base__rect_ie_u32__width(this); +} + +inline uint32_t wuffs_base__rect_ie_u32::height() { + return wuffs_base__rect_ie_u32__height(this); +} + +#endif // __cplusplus + // ---------------- I/O struct wuffs_base__io_buffer__struct; @@ -1046,6 +1288,26 @@ typedef struct { uint32_t num_loops; bool first_frame_is_opaque; } private_impl; + +#ifdef __cplusplus + inline void initialize(wuffs_base__pixel_format pixfmt, + wuffs_base__pixel_subsampling pixsub, + uint32_t width, + uint32_t height, + uint32_t num_loops, + bool first_frame_is_opaque); + inline void invalidate(); + inline bool is_valid(); + inline wuffs_base__pixel_format pixel_format(); + inline wuffs_base__pixel_subsampling pixel_subsampling(); + inline wuffs_base__rect_ie_u32 bounds(); + inline uint32_t width(); + inline uint32_t height(); + inline uint32_t num_loops(); + inline uint32_t first_frame_is_opaque(); + inline size_t pixbuf_size(); +#endif // __cplusplus + } wuffs_base__image_config; // TODO: Should this function return bool? An error type? @@ -1143,6 +1405,62 @@ static inline size_t wuffs_base__image_config__pixbuf_size( return 0; } +#ifdef __cplusplus + +inline void wuffs_base__image_config::initialize( + wuffs_base__pixel_format pixfmt, + wuffs_base__pixel_subsampling pixsub, + uint32_t width, + uint32_t height, + uint32_t num_loops, + bool first_frame_is_opaque) { + wuffs_base__image_config__initialize(this, pixfmt, pixsub, width, height, + num_loops, first_frame_is_opaque); +} + +inline void wuffs_base__image_config::invalidate() { + wuffs_base__image_config__invalidate(this); +} + +inline bool wuffs_base__image_config::is_valid() { + return wuffs_base__image_config__is_valid(this); +} + +inline wuffs_base__pixel_format wuffs_base__image_config::pixel_format() { + return wuffs_base__image_config__pixel_format(this); +} + +inline wuffs_base__pixel_subsampling +wuffs_base__image_config::pixel_subsampling() { + return wuffs_base__image_config__pixel_subsampling(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_config::bounds() { + return wuffs_base__image_config__bounds(this); +} + +inline uint32_t wuffs_base__image_config::width() { + return wuffs_base__image_config__width(this); +} + +inline uint32_t wuffs_base__image_config::height() { + return wuffs_base__image_config__height(this); +} + +inline uint32_t wuffs_base__image_config::num_loops() { + return wuffs_base__image_config__num_loops(this); +} + +inline uint32_t wuffs_base__image_config::first_frame_is_opaque() { + return wuffs_base__image_config__first_frame_is_opaque(this); +} + +inline size_t wuffs_base__image_config::pixbuf_size() { + return wuffs_base__image_config__pixbuf_size(this); +} + +#endif // __cplusplus + // -------- // wuffs_base__animation_disposal encodes, for an animated image, how to @@ -1178,6 +1496,30 @@ typedef struct { bool palette_changed; uint8_t palette[1024]; } private_impl; + +#ifdef __cplusplus + inline wuffs_base__status set_from_pixbuf(wuffs_base__image_config config, + wuffs_base__pixel_buffer pixbuf); + inline wuffs_base__status set_from_slice(wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory); + inline void update(wuffs_base__rect_ie_u32 dirty_rect, + wuffs_base__flicks duration, + bool blend, + wuffs_base__animation_disposal disposal, + wuffs_base__slice_u8 palette); + inline wuffs_base__image_config* image_config(); + inline wuffs_base__rect_ie_u32 bounds(); + inline uint32_t width(); + inline uint32_t height(); + inline wuffs_base__rect_ie_u32 dirty_rect(); + inline wuffs_base__flicks duration(); + inline bool blend(); + inline wuffs_base__animation_disposal disposal(); + inline bool palette_changed(); + inline wuffs_base__slice_u8 palette(); + inline wuffs_base__table_u8 plane(uint32_t p); +#endif // __cplusplus + } wuffs_base__image_buffer; static inline wuffs_base__status wuffs_base__image_buffer__set_from_pixbuf( @@ -1322,6 +1664,76 @@ static inline wuffs_base__table_u8 wuffs_base__image_buffer__plane( : ((wuffs_base__table_u8){}); } +#ifdef __cplusplus + +inline wuffs_base__status wuffs_base__image_buffer::set_from_pixbuf( + wuffs_base__image_config config, + wuffs_base__pixel_buffer pixbuf) { + return wuffs_base__image_buffer__set_from_pixbuf(this, config, pixbuf); +} + +inline wuffs_base__status wuffs_base__image_buffer::set_from_slice( + wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory) { + return wuffs_base__image_buffer__set_from_slice(this, config, pixbuf_memory); +} + +inline void wuffs_base__image_buffer::update( + wuffs_base__rect_ie_u32 dirty_rect, + wuffs_base__flicks duration, + bool blend, + wuffs_base__animation_disposal disposal, + wuffs_base__slice_u8 palette) { + wuffs_base__image_buffer__update(this, dirty_rect, duration, blend, disposal, + palette); +} + +inline wuffs_base__image_config* wuffs_base__image_buffer::image_config() { + return wuffs_base__image_buffer__image_config(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::bounds() { + return wuffs_base__image_buffer__bounds(this); +} + +inline uint32_t wuffs_base__image_buffer::width() { + return wuffs_base__image_buffer__width(this); +} + +inline uint32_t wuffs_base__image_buffer::height() { + return wuffs_base__image_buffer__height(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::dirty_rect() { + return wuffs_base__image_buffer__dirty_rect(this); +} + +inline wuffs_base__flicks wuffs_base__image_buffer::duration() { + return wuffs_base__image_buffer__duration(this); +} + +inline bool wuffs_base__image_buffer::blend() { + return wuffs_base__image_buffer__blend(this); +} + +inline wuffs_base__animation_disposal wuffs_base__image_buffer::disposal() { + return wuffs_base__image_buffer__disposal(this); +} + +inline bool wuffs_base__image_buffer::palette_changed() { + return wuffs_base__image_buffer__palette_changed(this); +} + +inline wuffs_base__slice_u8 wuffs_base__image_buffer::palette() { + return wuffs_base__image_buffer__palette(this); +} + +inline wuffs_base__table_u8 wuffs_base__image_buffer::plane(uint32_t p) { + return wuffs_base__image_buffer__plane(this, p); +} + +#endif // __cplusplus + #ifdef __cplusplus } // extern "C" #endif diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 2e23ef34..c5a0638b 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -330,9 +330,20 @@ typedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64; // in which case the range is empty. There are multiple representations of an // empty range. -typedef struct { +typedef struct wuffs_base__range_ii_u32__struct { uint32_t min_incl; uint32_t max_incl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ii_u32__struct s); + inline bool contains(uint32_t x); + inline wuffs_base__range_ii_u32__struct intersection( + wuffs_base__range_ii_u32__struct s); + inline wuffs_base__range_ii_u32__struct unionz( + wuffs_base__range_ii_u32__struct s); +#endif // __cplusplus + } wuffs_base__range_ii_u32; static inline bool wuffs_base__range_ii_u32__is_empty( @@ -378,11 +389,49 @@ static inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__range_ii_u32::is_empty() { + return wuffs_base__range_ii_u32__is_empty(this); +} + +inline bool wuffs_base__range_ii_u32::equals(wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__equals(this, s); +} + +inline bool wuffs_base__range_ii_u32::contains(uint32_t x) { + return wuffs_base__range_ii_u32__contains(this, x); +} + +inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::intersection( + wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__intersection(this, s); +} + +inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::unionz( + wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__union(this, s); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ie_u32__struct { uint32_t min_incl; uint32_t max_excl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ie_u32__struct s); + inline bool contains(uint32_t x); + inline wuffs_base__range_ie_u32__struct intersection( + wuffs_base__range_ie_u32__struct s); + inline wuffs_base__range_ie_u32__struct unionz( + wuffs_base__range_ie_u32__struct s); + inline uint32_t length(); +#endif // __cplusplus + } wuffs_base__range_ie_u32; static inline bool wuffs_base__range_ie_u32__is_empty( @@ -433,11 +482,52 @@ static inline uint32_t wuffs_base__range_ie_u32__length( return wuffs_base__u32__sat_sub(r->max_excl, r->min_incl); } +#ifdef __cplusplus + +inline bool wuffs_base__range_ie_u32::is_empty() { + return wuffs_base__range_ie_u32__is_empty(this); +} + +inline bool wuffs_base__range_ie_u32::equals(wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__equals(this, s); +} + +inline bool wuffs_base__range_ie_u32::contains(uint32_t x) { + return wuffs_base__range_ie_u32__contains(this, x); +} + +inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::intersection( + wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__intersection(this, s); +} + +inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::unionz( + wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__union(this, s); +} + +inline uint32_t wuffs_base__range_ie_u32::length() { + return wuffs_base__range_ie_u32__length(this); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ii_u64__struct { uint64_t min_incl; uint64_t max_incl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ii_u64__struct s); + inline bool contains(uint64_t x); + inline wuffs_base__range_ii_u64__struct intersection( + wuffs_base__range_ii_u64__struct s); + inline wuffs_base__range_ii_u64__struct unionz( + wuffs_base__range_ii_u64__struct s); +#endif // __cplusplus + } wuffs_base__range_ii_u64; static inline bool wuffs_base__range_ii_u64__is_empty( @@ -483,11 +573,49 @@ static inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__range_ii_u64::is_empty() { + return wuffs_base__range_ii_u64__is_empty(this); +} + +inline bool wuffs_base__range_ii_u64::equals(wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__equals(this, s); +} + +inline bool wuffs_base__range_ii_u64::contains(uint64_t x) { + return wuffs_base__range_ii_u64__contains(this, x); +} + +inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::intersection( + wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__intersection(this, s); +} + +inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::unionz( + wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__union(this, s); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ie_u64__struct { uint64_t min_incl; uint64_t max_excl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ie_u64__struct s); + inline bool contains(uint64_t x); + inline wuffs_base__range_ie_u64__struct intersection( + wuffs_base__range_ie_u64__struct s); + inline wuffs_base__range_ie_u64__struct unionz( + wuffs_base__range_ie_u64__struct s); + inline uint64_t length(); +#endif // __cplusplus + } wuffs_base__range_ie_u64; static inline bool wuffs_base__range_ie_u64__is_empty( @@ -538,6 +666,36 @@ static inline uint64_t wuffs_base__range_ie_u64__length( return wuffs_base__u64__sat_sub(r->max_excl, r->min_incl); } +#ifdef __cplusplus + +inline bool wuffs_base__range_ie_u64::is_empty() { + return wuffs_base__range_ie_u64__is_empty(this); +} + +inline bool wuffs_base__range_ie_u64::equals(wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__equals(this, s); +} + +inline bool wuffs_base__range_ie_u64::contains(uint64_t x) { + return wuffs_base__range_ie_u64__contains(this, x); +} + +inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::intersection( + wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__intersection(this, s); +} + +inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::unionz( + wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__union(this, s); +} + +inline uint64_t wuffs_base__range_ie_u64::length() { + return wuffs_base__range_ie_u64__length(this); +} + +#endif // __cplusplus + // -------- // wuffs_base__rect_ii_u32 is a rectangle (a 2-dimensional range) on the @@ -549,11 +707,22 @@ static inline uint64_t wuffs_base__range_ie_u64__length( // multiple representations of an empty rectangle. // // The X and Y axes increase right and down. -typedef struct { +typedef struct wuffs_base__rect_ii_u32__struct { uint32_t min_incl_x; uint32_t min_incl_y; uint32_t max_incl_x; uint32_t max_incl_y; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__rect_ii_u32__struct s); + inline bool contains(uint32_t x, uint32_t y); + inline wuffs_base__rect_ii_u32__struct intersection( + wuffs_base__rect_ii_u32__struct s); + inline wuffs_base__rect_ii_u32__struct unionz( + wuffs_base__rect_ii_u32__struct s); +#endif // __cplusplus + } wuffs_base__rect_ii_u32; static inline bool wuffs_base__rect_ii_u32__is_empty( @@ -604,6 +773,32 @@ static inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__rect_ii_u32::is_empty() { + return wuffs_base__rect_ii_u32__is_empty(this); +} + +inline bool wuffs_base__rect_ii_u32::equals(wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__equals(this, s); +} + +inline bool wuffs_base__rect_ii_u32::contains(uint32_t x, uint32_t y) { + return wuffs_base__rect_ii_u32__contains(this, x, y); +} + +inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::intersection( + wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__intersection(this, s); +} + +inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::unionz( + wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__union(this, s); +} + +#endif // __cplusplus + // -------- // wuffs_base__rect_ie_u32 is a rectangle (a 2-dimensional range) on the @@ -616,11 +811,24 @@ static inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union( // fields zero. // // The X and Y axes increase right and down. -typedef struct { +typedef struct wuffs_base__rect_ie_u32__struct { uint32_t min_incl_x; uint32_t min_incl_y; uint32_t max_excl_x; uint32_t max_excl_y; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__rect_ie_u32__struct s); + inline bool contains(uint32_t x, uint32_t y); + inline wuffs_base__rect_ie_u32__struct intersection( + wuffs_base__rect_ie_u32__struct s); + inline wuffs_base__rect_ie_u32__struct unionz( + wuffs_base__rect_ie_u32__struct s); + inline uint32_t width(); + inline uint32_t height(); +#endif // __cplusplus + } wuffs_base__rect_ie_u32; static inline bool wuffs_base__rect_ie_u32__is_empty( @@ -681,6 +889,40 @@ static inline uint32_t wuffs_base__rect_ie_u32__height( return wuffs_base__u32__sat_sub(r->max_excl_y, r->min_incl_y); } +#ifdef __cplusplus + +inline bool wuffs_base__rect_ie_u32::is_empty() { + return wuffs_base__rect_ie_u32__is_empty(this); +} + +inline bool wuffs_base__rect_ie_u32::equals(wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__equals(this, s); +} + +inline bool wuffs_base__rect_ie_u32::contains(uint32_t x, uint32_t y) { + return wuffs_base__rect_ie_u32__contains(this, x, y); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::intersection( + wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__intersection(this, s); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::unionz( + wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__union(this, s); +} + +inline uint32_t wuffs_base__rect_ie_u32::width() { + return wuffs_base__rect_ie_u32__width(this); +} + +inline uint32_t wuffs_base__rect_ie_u32::height() { + return wuffs_base__rect_ie_u32__height(this); +} + +#endif // __cplusplus + // ---------------- I/O struct wuffs_base__io_buffer__struct; @@ -1046,6 +1288,26 @@ typedef struct { uint32_t num_loops; bool first_frame_is_opaque; } private_impl; + +#ifdef __cplusplus + inline void initialize(wuffs_base__pixel_format pixfmt, + wuffs_base__pixel_subsampling pixsub, + uint32_t width, + uint32_t height, + uint32_t num_loops, + bool first_frame_is_opaque); + inline void invalidate(); + inline bool is_valid(); + inline wuffs_base__pixel_format pixel_format(); + inline wuffs_base__pixel_subsampling pixel_subsampling(); + inline wuffs_base__rect_ie_u32 bounds(); + inline uint32_t width(); + inline uint32_t height(); + inline uint32_t num_loops(); + inline uint32_t first_frame_is_opaque(); + inline size_t pixbuf_size(); +#endif // __cplusplus + } wuffs_base__image_config; // TODO: Should this function return bool? An error type? @@ -1143,6 +1405,62 @@ static inline size_t wuffs_base__image_config__pixbuf_size( return 0; } +#ifdef __cplusplus + +inline void wuffs_base__image_config::initialize( + wuffs_base__pixel_format pixfmt, + wuffs_base__pixel_subsampling pixsub, + uint32_t width, + uint32_t height, + uint32_t num_loops, + bool first_frame_is_opaque) { + wuffs_base__image_config__initialize(this, pixfmt, pixsub, width, height, + num_loops, first_frame_is_opaque); +} + +inline void wuffs_base__image_config::invalidate() { + wuffs_base__image_config__invalidate(this); +} + +inline bool wuffs_base__image_config::is_valid() { + return wuffs_base__image_config__is_valid(this); +} + +inline wuffs_base__pixel_format wuffs_base__image_config::pixel_format() { + return wuffs_base__image_config__pixel_format(this); +} + +inline wuffs_base__pixel_subsampling +wuffs_base__image_config::pixel_subsampling() { + return wuffs_base__image_config__pixel_subsampling(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_config::bounds() { + return wuffs_base__image_config__bounds(this); +} + +inline uint32_t wuffs_base__image_config::width() { + return wuffs_base__image_config__width(this); +} + +inline uint32_t wuffs_base__image_config::height() { + return wuffs_base__image_config__height(this); +} + +inline uint32_t wuffs_base__image_config::num_loops() { + return wuffs_base__image_config__num_loops(this); +} + +inline uint32_t wuffs_base__image_config::first_frame_is_opaque() { + return wuffs_base__image_config__first_frame_is_opaque(this); +} + +inline size_t wuffs_base__image_config::pixbuf_size() { + return wuffs_base__image_config__pixbuf_size(this); +} + +#endif // __cplusplus + // -------- // wuffs_base__animation_disposal encodes, for an animated image, how to @@ -1178,6 +1496,30 @@ typedef struct { bool palette_changed; uint8_t palette[1024]; } private_impl; + +#ifdef __cplusplus + inline wuffs_base__status set_from_pixbuf(wuffs_base__image_config config, + wuffs_base__pixel_buffer pixbuf); + inline wuffs_base__status set_from_slice(wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory); + inline void update(wuffs_base__rect_ie_u32 dirty_rect, + wuffs_base__flicks duration, + bool blend, + wuffs_base__animation_disposal disposal, + wuffs_base__slice_u8 palette); + inline wuffs_base__image_config* image_config(); + inline wuffs_base__rect_ie_u32 bounds(); + inline uint32_t width(); + inline uint32_t height(); + inline wuffs_base__rect_ie_u32 dirty_rect(); + inline wuffs_base__flicks duration(); + inline bool blend(); + inline wuffs_base__animation_disposal disposal(); + inline bool palette_changed(); + inline wuffs_base__slice_u8 palette(); + inline wuffs_base__table_u8 plane(uint32_t p); +#endif // __cplusplus + } wuffs_base__image_buffer; static inline wuffs_base__status wuffs_base__image_buffer__set_from_pixbuf( @@ -1322,6 +1664,76 @@ static inline wuffs_base__table_u8 wuffs_base__image_buffer__plane( : ((wuffs_base__table_u8){}); } +#ifdef __cplusplus + +inline wuffs_base__status wuffs_base__image_buffer::set_from_pixbuf( + wuffs_base__image_config config, + wuffs_base__pixel_buffer pixbuf) { + return wuffs_base__image_buffer__set_from_pixbuf(this, config, pixbuf); +} + +inline wuffs_base__status wuffs_base__image_buffer::set_from_slice( + wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory) { + return wuffs_base__image_buffer__set_from_slice(this, config, pixbuf_memory); +} + +inline void wuffs_base__image_buffer::update( + wuffs_base__rect_ie_u32 dirty_rect, + wuffs_base__flicks duration, + bool blend, + wuffs_base__animation_disposal disposal, + wuffs_base__slice_u8 palette) { + wuffs_base__image_buffer__update(this, dirty_rect, duration, blend, disposal, + palette); +} + +inline wuffs_base__image_config* wuffs_base__image_buffer::image_config() { + return wuffs_base__image_buffer__image_config(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::bounds() { + return wuffs_base__image_buffer__bounds(this); +} + +inline uint32_t wuffs_base__image_buffer::width() { + return wuffs_base__image_buffer__width(this); +} + +inline uint32_t wuffs_base__image_buffer::height() { + return wuffs_base__image_buffer__height(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::dirty_rect() { + return wuffs_base__image_buffer__dirty_rect(this); +} + +inline wuffs_base__flicks wuffs_base__image_buffer::duration() { + return wuffs_base__image_buffer__duration(this); +} + +inline bool wuffs_base__image_buffer::blend() { + return wuffs_base__image_buffer__blend(this); +} + +inline wuffs_base__animation_disposal wuffs_base__image_buffer::disposal() { + return wuffs_base__image_buffer__disposal(this); +} + +inline bool wuffs_base__image_buffer::palette_changed() { + return wuffs_base__image_buffer__palette_changed(this); +} + +inline wuffs_base__slice_u8 wuffs_base__image_buffer::palette() { + return wuffs_base__image_buffer__palette(this); +} + +inline wuffs_base__table_u8 wuffs_base__image_buffer::plane(uint32_t p) { + return wuffs_base__image_buffer__plane(this, p); +} + +#endif // __cplusplus + #ifdef __cplusplus } // extern "C" #endif diff --git a/gen/c/std/gzip.c b/gen/c/std/gzip.c index 326b07cb..18a766d5 100644 --- a/gen/c/std/gzip.c +++ b/gen/c/std/gzip.c @@ -330,9 +330,20 @@ typedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64; // in which case the range is empty. There are multiple representations of an // empty range. -typedef struct { +typedef struct wuffs_base__range_ii_u32__struct { uint32_t min_incl; uint32_t max_incl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ii_u32__struct s); + inline bool contains(uint32_t x); + inline wuffs_base__range_ii_u32__struct intersection( + wuffs_base__range_ii_u32__struct s); + inline wuffs_base__range_ii_u32__struct unionz( + wuffs_base__range_ii_u32__struct s); +#endif // __cplusplus + } wuffs_base__range_ii_u32; static inline bool wuffs_base__range_ii_u32__is_empty( @@ -378,11 +389,49 @@ static inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__range_ii_u32::is_empty() { + return wuffs_base__range_ii_u32__is_empty(this); +} + +inline bool wuffs_base__range_ii_u32::equals(wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__equals(this, s); +} + +inline bool wuffs_base__range_ii_u32::contains(uint32_t x) { + return wuffs_base__range_ii_u32__contains(this, x); +} + +inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::intersection( + wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__intersection(this, s); +} + +inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::unionz( + wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__union(this, s); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ie_u32__struct { uint32_t min_incl; uint32_t max_excl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ie_u32__struct s); + inline bool contains(uint32_t x); + inline wuffs_base__range_ie_u32__struct intersection( + wuffs_base__range_ie_u32__struct s); + inline wuffs_base__range_ie_u32__struct unionz( + wuffs_base__range_ie_u32__struct s); + inline uint32_t length(); +#endif // __cplusplus + } wuffs_base__range_ie_u32; static inline bool wuffs_base__range_ie_u32__is_empty( @@ -433,11 +482,52 @@ static inline uint32_t wuffs_base__range_ie_u32__length( return wuffs_base__u32__sat_sub(r->max_excl, r->min_incl); } +#ifdef __cplusplus + +inline bool wuffs_base__range_ie_u32::is_empty() { + return wuffs_base__range_ie_u32__is_empty(this); +} + +inline bool wuffs_base__range_ie_u32::equals(wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__equals(this, s); +} + +inline bool wuffs_base__range_ie_u32::contains(uint32_t x) { + return wuffs_base__range_ie_u32__contains(this, x); +} + +inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::intersection( + wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__intersection(this, s); +} + +inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::unionz( + wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__union(this, s); +} + +inline uint32_t wuffs_base__range_ie_u32::length() { + return wuffs_base__range_ie_u32__length(this); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ii_u64__struct { uint64_t min_incl; uint64_t max_incl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ii_u64__struct s); + inline bool contains(uint64_t x); + inline wuffs_base__range_ii_u64__struct intersection( + wuffs_base__range_ii_u64__struct s); + inline wuffs_base__range_ii_u64__struct unionz( + wuffs_base__range_ii_u64__struct s); +#endif // __cplusplus + } wuffs_base__range_ii_u64; static inline bool wuffs_base__range_ii_u64__is_empty( @@ -483,11 +573,49 @@ static inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__range_ii_u64::is_empty() { + return wuffs_base__range_ii_u64__is_empty(this); +} + +inline bool wuffs_base__range_ii_u64::equals(wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__equals(this, s); +} + +inline bool wuffs_base__range_ii_u64::contains(uint64_t x) { + return wuffs_base__range_ii_u64__contains(this, x); +} + +inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::intersection( + wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__intersection(this, s); +} + +inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::unionz( + wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__union(this, s); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ie_u64__struct { uint64_t min_incl; uint64_t max_excl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ie_u64__struct s); + inline bool contains(uint64_t x); + inline wuffs_base__range_ie_u64__struct intersection( + wuffs_base__range_ie_u64__struct s); + inline wuffs_base__range_ie_u64__struct unionz( + wuffs_base__range_ie_u64__struct s); + inline uint64_t length(); +#endif // __cplusplus + } wuffs_base__range_ie_u64; static inline bool wuffs_base__range_ie_u64__is_empty( @@ -538,6 +666,36 @@ static inline uint64_t wuffs_base__range_ie_u64__length( return wuffs_base__u64__sat_sub(r->max_excl, r->min_incl); } +#ifdef __cplusplus + +inline bool wuffs_base__range_ie_u64::is_empty() { + return wuffs_base__range_ie_u64__is_empty(this); +} + +inline bool wuffs_base__range_ie_u64::equals(wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__equals(this, s); +} + +inline bool wuffs_base__range_ie_u64::contains(uint64_t x) { + return wuffs_base__range_ie_u64__contains(this, x); +} + +inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::intersection( + wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__intersection(this, s); +} + +inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::unionz( + wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__union(this, s); +} + +inline uint64_t wuffs_base__range_ie_u64::length() { + return wuffs_base__range_ie_u64__length(this); +} + +#endif // __cplusplus + // -------- // wuffs_base__rect_ii_u32 is a rectangle (a 2-dimensional range) on the @@ -549,11 +707,22 @@ static inline uint64_t wuffs_base__range_ie_u64__length( // multiple representations of an empty rectangle. // // The X and Y axes increase right and down. -typedef struct { +typedef struct wuffs_base__rect_ii_u32__struct { uint32_t min_incl_x; uint32_t min_incl_y; uint32_t max_incl_x; uint32_t max_incl_y; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__rect_ii_u32__struct s); + inline bool contains(uint32_t x, uint32_t y); + inline wuffs_base__rect_ii_u32__struct intersection( + wuffs_base__rect_ii_u32__struct s); + inline wuffs_base__rect_ii_u32__struct unionz( + wuffs_base__rect_ii_u32__struct s); +#endif // __cplusplus + } wuffs_base__rect_ii_u32; static inline bool wuffs_base__rect_ii_u32__is_empty( @@ -604,6 +773,32 @@ static inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__rect_ii_u32::is_empty() { + return wuffs_base__rect_ii_u32__is_empty(this); +} + +inline bool wuffs_base__rect_ii_u32::equals(wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__equals(this, s); +} + +inline bool wuffs_base__rect_ii_u32::contains(uint32_t x, uint32_t y) { + return wuffs_base__rect_ii_u32__contains(this, x, y); +} + +inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::intersection( + wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__intersection(this, s); +} + +inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::unionz( + wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__union(this, s); +} + +#endif // __cplusplus + // -------- // wuffs_base__rect_ie_u32 is a rectangle (a 2-dimensional range) on the @@ -616,11 +811,24 @@ static inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union( // fields zero. // // The X and Y axes increase right and down. -typedef struct { +typedef struct wuffs_base__rect_ie_u32__struct { uint32_t min_incl_x; uint32_t min_incl_y; uint32_t max_excl_x; uint32_t max_excl_y; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__rect_ie_u32__struct s); + inline bool contains(uint32_t x, uint32_t y); + inline wuffs_base__rect_ie_u32__struct intersection( + wuffs_base__rect_ie_u32__struct s); + inline wuffs_base__rect_ie_u32__struct unionz( + wuffs_base__rect_ie_u32__struct s); + inline uint32_t width(); + inline uint32_t height(); +#endif // __cplusplus + } wuffs_base__rect_ie_u32; static inline bool wuffs_base__rect_ie_u32__is_empty( @@ -681,6 +889,40 @@ static inline uint32_t wuffs_base__rect_ie_u32__height( return wuffs_base__u32__sat_sub(r->max_excl_y, r->min_incl_y); } +#ifdef __cplusplus + +inline bool wuffs_base__rect_ie_u32::is_empty() { + return wuffs_base__rect_ie_u32__is_empty(this); +} + +inline bool wuffs_base__rect_ie_u32::equals(wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__equals(this, s); +} + +inline bool wuffs_base__rect_ie_u32::contains(uint32_t x, uint32_t y) { + return wuffs_base__rect_ie_u32__contains(this, x, y); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::intersection( + wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__intersection(this, s); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::unionz( + wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__union(this, s); +} + +inline uint32_t wuffs_base__rect_ie_u32::width() { + return wuffs_base__rect_ie_u32__width(this); +} + +inline uint32_t wuffs_base__rect_ie_u32::height() { + return wuffs_base__rect_ie_u32__height(this); +} + +#endif // __cplusplus + // ---------------- I/O struct wuffs_base__io_buffer__struct; @@ -1046,6 +1288,26 @@ typedef struct { uint32_t num_loops; bool first_frame_is_opaque; } private_impl; + +#ifdef __cplusplus + inline void initialize(wuffs_base__pixel_format pixfmt, + wuffs_base__pixel_subsampling pixsub, + uint32_t width, + uint32_t height, + uint32_t num_loops, + bool first_frame_is_opaque); + inline void invalidate(); + inline bool is_valid(); + inline wuffs_base__pixel_format pixel_format(); + inline wuffs_base__pixel_subsampling pixel_subsampling(); + inline wuffs_base__rect_ie_u32 bounds(); + inline uint32_t width(); + inline uint32_t height(); + inline uint32_t num_loops(); + inline uint32_t first_frame_is_opaque(); + inline size_t pixbuf_size(); +#endif // __cplusplus + } wuffs_base__image_config; // TODO: Should this function return bool? An error type? @@ -1143,6 +1405,62 @@ static inline size_t wuffs_base__image_config__pixbuf_size( return 0; } +#ifdef __cplusplus + +inline void wuffs_base__image_config::initialize( + wuffs_base__pixel_format pixfmt, + wuffs_base__pixel_subsampling pixsub, + uint32_t width, + uint32_t height, + uint32_t num_loops, + bool first_frame_is_opaque) { + wuffs_base__image_config__initialize(this, pixfmt, pixsub, width, height, + num_loops, first_frame_is_opaque); +} + +inline void wuffs_base__image_config::invalidate() { + wuffs_base__image_config__invalidate(this); +} + +inline bool wuffs_base__image_config::is_valid() { + return wuffs_base__image_config__is_valid(this); +} + +inline wuffs_base__pixel_format wuffs_base__image_config::pixel_format() { + return wuffs_base__image_config__pixel_format(this); +} + +inline wuffs_base__pixel_subsampling +wuffs_base__image_config::pixel_subsampling() { + return wuffs_base__image_config__pixel_subsampling(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_config::bounds() { + return wuffs_base__image_config__bounds(this); +} + +inline uint32_t wuffs_base__image_config::width() { + return wuffs_base__image_config__width(this); +} + +inline uint32_t wuffs_base__image_config::height() { + return wuffs_base__image_config__height(this); +} + +inline uint32_t wuffs_base__image_config::num_loops() { + return wuffs_base__image_config__num_loops(this); +} + +inline uint32_t wuffs_base__image_config::first_frame_is_opaque() { + return wuffs_base__image_config__first_frame_is_opaque(this); +} + +inline size_t wuffs_base__image_config::pixbuf_size() { + return wuffs_base__image_config__pixbuf_size(this); +} + +#endif // __cplusplus + // -------- // wuffs_base__animation_disposal encodes, for an animated image, how to @@ -1178,6 +1496,30 @@ typedef struct { bool palette_changed; uint8_t palette[1024]; } private_impl; + +#ifdef __cplusplus + inline wuffs_base__status set_from_pixbuf(wuffs_base__image_config config, + wuffs_base__pixel_buffer pixbuf); + inline wuffs_base__status set_from_slice(wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory); + inline void update(wuffs_base__rect_ie_u32 dirty_rect, + wuffs_base__flicks duration, + bool blend, + wuffs_base__animation_disposal disposal, + wuffs_base__slice_u8 palette); + inline wuffs_base__image_config* image_config(); + inline wuffs_base__rect_ie_u32 bounds(); + inline uint32_t width(); + inline uint32_t height(); + inline wuffs_base__rect_ie_u32 dirty_rect(); + inline wuffs_base__flicks duration(); + inline bool blend(); + inline wuffs_base__animation_disposal disposal(); + inline bool palette_changed(); + inline wuffs_base__slice_u8 palette(); + inline wuffs_base__table_u8 plane(uint32_t p); +#endif // __cplusplus + } wuffs_base__image_buffer; static inline wuffs_base__status wuffs_base__image_buffer__set_from_pixbuf( @@ -1322,6 +1664,76 @@ static inline wuffs_base__table_u8 wuffs_base__image_buffer__plane( : ((wuffs_base__table_u8){}); } +#ifdef __cplusplus + +inline wuffs_base__status wuffs_base__image_buffer::set_from_pixbuf( + wuffs_base__image_config config, + wuffs_base__pixel_buffer pixbuf) { + return wuffs_base__image_buffer__set_from_pixbuf(this, config, pixbuf); +} + +inline wuffs_base__status wuffs_base__image_buffer::set_from_slice( + wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory) { + return wuffs_base__image_buffer__set_from_slice(this, config, pixbuf_memory); +} + +inline void wuffs_base__image_buffer::update( + wuffs_base__rect_ie_u32 dirty_rect, + wuffs_base__flicks duration, + bool blend, + wuffs_base__animation_disposal disposal, + wuffs_base__slice_u8 palette) { + wuffs_base__image_buffer__update(this, dirty_rect, duration, blend, disposal, + palette); +} + +inline wuffs_base__image_config* wuffs_base__image_buffer::image_config() { + return wuffs_base__image_buffer__image_config(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::bounds() { + return wuffs_base__image_buffer__bounds(this); +} + +inline uint32_t wuffs_base__image_buffer::width() { + return wuffs_base__image_buffer__width(this); +} + +inline uint32_t wuffs_base__image_buffer::height() { + return wuffs_base__image_buffer__height(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::dirty_rect() { + return wuffs_base__image_buffer__dirty_rect(this); +} + +inline wuffs_base__flicks wuffs_base__image_buffer::duration() { + return wuffs_base__image_buffer__duration(this); +} + +inline bool wuffs_base__image_buffer::blend() { + return wuffs_base__image_buffer__blend(this); +} + +inline wuffs_base__animation_disposal wuffs_base__image_buffer::disposal() { + return wuffs_base__image_buffer__disposal(this); +} + +inline bool wuffs_base__image_buffer::palette_changed() { + return wuffs_base__image_buffer__palette_changed(this); +} + +inline wuffs_base__slice_u8 wuffs_base__image_buffer::palette() { + return wuffs_base__image_buffer__palette(this); +} + +inline wuffs_base__table_u8 wuffs_base__image_buffer::plane(uint32_t p) { + return wuffs_base__image_buffer__plane(this, p); +} + +#endif // __cplusplus + #ifdef __cplusplus } // extern "C" #endif diff --git a/gen/c/std/lzw.c b/gen/c/std/lzw.c index 3c459dc0..6016e1de 100644 --- a/gen/c/std/lzw.c +++ b/gen/c/std/lzw.c @@ -330,9 +330,20 @@ typedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64; // in which case the range is empty. There are multiple representations of an // empty range. -typedef struct { +typedef struct wuffs_base__range_ii_u32__struct { uint32_t min_incl; uint32_t max_incl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ii_u32__struct s); + inline bool contains(uint32_t x); + inline wuffs_base__range_ii_u32__struct intersection( + wuffs_base__range_ii_u32__struct s); + inline wuffs_base__range_ii_u32__struct unionz( + wuffs_base__range_ii_u32__struct s); +#endif // __cplusplus + } wuffs_base__range_ii_u32; static inline bool wuffs_base__range_ii_u32__is_empty( @@ -378,11 +389,49 @@ static inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__range_ii_u32::is_empty() { + return wuffs_base__range_ii_u32__is_empty(this); +} + +inline bool wuffs_base__range_ii_u32::equals(wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__equals(this, s); +} + +inline bool wuffs_base__range_ii_u32::contains(uint32_t x) { + return wuffs_base__range_ii_u32__contains(this, x); +} + +inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::intersection( + wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__intersection(this, s); +} + +inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::unionz( + wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__union(this, s); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ie_u32__struct { uint32_t min_incl; uint32_t max_excl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ie_u32__struct s); + inline bool contains(uint32_t x); + inline wuffs_base__range_ie_u32__struct intersection( + wuffs_base__range_ie_u32__struct s); + inline wuffs_base__range_ie_u32__struct unionz( + wuffs_base__range_ie_u32__struct s); + inline uint32_t length(); +#endif // __cplusplus + } wuffs_base__range_ie_u32; static inline bool wuffs_base__range_ie_u32__is_empty( @@ -433,11 +482,52 @@ static inline uint32_t wuffs_base__range_ie_u32__length( return wuffs_base__u32__sat_sub(r->max_excl, r->min_incl); } +#ifdef __cplusplus + +inline bool wuffs_base__range_ie_u32::is_empty() { + return wuffs_base__range_ie_u32__is_empty(this); +} + +inline bool wuffs_base__range_ie_u32::equals(wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__equals(this, s); +} + +inline bool wuffs_base__range_ie_u32::contains(uint32_t x) { + return wuffs_base__range_ie_u32__contains(this, x); +} + +inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::intersection( + wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__intersection(this, s); +} + +inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::unionz( + wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__union(this, s); +} + +inline uint32_t wuffs_base__range_ie_u32::length() { + return wuffs_base__range_ie_u32__length(this); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ii_u64__struct { uint64_t min_incl; uint64_t max_incl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ii_u64__struct s); + inline bool contains(uint64_t x); + inline wuffs_base__range_ii_u64__struct intersection( + wuffs_base__range_ii_u64__struct s); + inline wuffs_base__range_ii_u64__struct unionz( + wuffs_base__range_ii_u64__struct s); +#endif // __cplusplus + } wuffs_base__range_ii_u64; static inline bool wuffs_base__range_ii_u64__is_empty( @@ -483,11 +573,49 @@ static inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__range_ii_u64::is_empty() { + return wuffs_base__range_ii_u64__is_empty(this); +} + +inline bool wuffs_base__range_ii_u64::equals(wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__equals(this, s); +} + +inline bool wuffs_base__range_ii_u64::contains(uint64_t x) { + return wuffs_base__range_ii_u64__contains(this, x); +} + +inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::intersection( + wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__intersection(this, s); +} + +inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::unionz( + wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__union(this, s); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ie_u64__struct { uint64_t min_incl; uint64_t max_excl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ie_u64__struct s); + inline bool contains(uint64_t x); + inline wuffs_base__range_ie_u64__struct intersection( + wuffs_base__range_ie_u64__struct s); + inline wuffs_base__range_ie_u64__struct unionz( + wuffs_base__range_ie_u64__struct s); + inline uint64_t length(); +#endif // __cplusplus + } wuffs_base__range_ie_u64; static inline bool wuffs_base__range_ie_u64__is_empty( @@ -538,6 +666,36 @@ static inline uint64_t wuffs_base__range_ie_u64__length( return wuffs_base__u64__sat_sub(r->max_excl, r->min_incl); } +#ifdef __cplusplus + +inline bool wuffs_base__range_ie_u64::is_empty() { + return wuffs_base__range_ie_u64__is_empty(this); +} + +inline bool wuffs_base__range_ie_u64::equals(wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__equals(this, s); +} + +inline bool wuffs_base__range_ie_u64::contains(uint64_t x) { + return wuffs_base__range_ie_u64__contains(this, x); +} + +inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::intersection( + wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__intersection(this, s); +} + +inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::unionz( + wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__union(this, s); +} + +inline uint64_t wuffs_base__range_ie_u64::length() { + return wuffs_base__range_ie_u64__length(this); +} + +#endif // __cplusplus + // -------- // wuffs_base__rect_ii_u32 is a rectangle (a 2-dimensional range) on the @@ -549,11 +707,22 @@ static inline uint64_t wuffs_base__range_ie_u64__length( // multiple representations of an empty rectangle. // // The X and Y axes increase right and down. -typedef struct { +typedef struct wuffs_base__rect_ii_u32__struct { uint32_t min_incl_x; uint32_t min_incl_y; uint32_t max_incl_x; uint32_t max_incl_y; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__rect_ii_u32__struct s); + inline bool contains(uint32_t x, uint32_t y); + inline wuffs_base__rect_ii_u32__struct intersection( + wuffs_base__rect_ii_u32__struct s); + inline wuffs_base__rect_ii_u32__struct unionz( + wuffs_base__rect_ii_u32__struct s); +#endif // __cplusplus + } wuffs_base__rect_ii_u32; static inline bool wuffs_base__rect_ii_u32__is_empty( @@ -604,6 +773,32 @@ static inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__rect_ii_u32::is_empty() { + return wuffs_base__rect_ii_u32__is_empty(this); +} + +inline bool wuffs_base__rect_ii_u32::equals(wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__equals(this, s); +} + +inline bool wuffs_base__rect_ii_u32::contains(uint32_t x, uint32_t y) { + return wuffs_base__rect_ii_u32__contains(this, x, y); +} + +inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::intersection( + wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__intersection(this, s); +} + +inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::unionz( + wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__union(this, s); +} + +#endif // __cplusplus + // -------- // wuffs_base__rect_ie_u32 is a rectangle (a 2-dimensional range) on the @@ -616,11 +811,24 @@ static inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union( // fields zero. // // The X and Y axes increase right and down. -typedef struct { +typedef struct wuffs_base__rect_ie_u32__struct { uint32_t min_incl_x; uint32_t min_incl_y; uint32_t max_excl_x; uint32_t max_excl_y; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__rect_ie_u32__struct s); + inline bool contains(uint32_t x, uint32_t y); + inline wuffs_base__rect_ie_u32__struct intersection( + wuffs_base__rect_ie_u32__struct s); + inline wuffs_base__rect_ie_u32__struct unionz( + wuffs_base__rect_ie_u32__struct s); + inline uint32_t width(); + inline uint32_t height(); +#endif // __cplusplus + } wuffs_base__rect_ie_u32; static inline bool wuffs_base__rect_ie_u32__is_empty( @@ -681,6 +889,40 @@ static inline uint32_t wuffs_base__rect_ie_u32__height( return wuffs_base__u32__sat_sub(r->max_excl_y, r->min_incl_y); } +#ifdef __cplusplus + +inline bool wuffs_base__rect_ie_u32::is_empty() { + return wuffs_base__rect_ie_u32__is_empty(this); +} + +inline bool wuffs_base__rect_ie_u32::equals(wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__equals(this, s); +} + +inline bool wuffs_base__rect_ie_u32::contains(uint32_t x, uint32_t y) { + return wuffs_base__rect_ie_u32__contains(this, x, y); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::intersection( + wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__intersection(this, s); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::unionz( + wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__union(this, s); +} + +inline uint32_t wuffs_base__rect_ie_u32::width() { + return wuffs_base__rect_ie_u32__width(this); +} + +inline uint32_t wuffs_base__rect_ie_u32::height() { + return wuffs_base__rect_ie_u32__height(this); +} + +#endif // __cplusplus + // ---------------- I/O struct wuffs_base__io_buffer__struct; @@ -1046,6 +1288,26 @@ typedef struct { uint32_t num_loops; bool first_frame_is_opaque; } private_impl; + +#ifdef __cplusplus + inline void initialize(wuffs_base__pixel_format pixfmt, + wuffs_base__pixel_subsampling pixsub, + uint32_t width, + uint32_t height, + uint32_t num_loops, + bool first_frame_is_opaque); + inline void invalidate(); + inline bool is_valid(); + inline wuffs_base__pixel_format pixel_format(); + inline wuffs_base__pixel_subsampling pixel_subsampling(); + inline wuffs_base__rect_ie_u32 bounds(); + inline uint32_t width(); + inline uint32_t height(); + inline uint32_t num_loops(); + inline uint32_t first_frame_is_opaque(); + inline size_t pixbuf_size(); +#endif // __cplusplus + } wuffs_base__image_config; // TODO: Should this function return bool? An error type? @@ -1143,6 +1405,62 @@ static inline size_t wuffs_base__image_config__pixbuf_size( return 0; } +#ifdef __cplusplus + +inline void wuffs_base__image_config::initialize( + wuffs_base__pixel_format pixfmt, + wuffs_base__pixel_subsampling pixsub, + uint32_t width, + uint32_t height, + uint32_t num_loops, + bool first_frame_is_opaque) { + wuffs_base__image_config__initialize(this, pixfmt, pixsub, width, height, + num_loops, first_frame_is_opaque); +} + +inline void wuffs_base__image_config::invalidate() { + wuffs_base__image_config__invalidate(this); +} + +inline bool wuffs_base__image_config::is_valid() { + return wuffs_base__image_config__is_valid(this); +} + +inline wuffs_base__pixel_format wuffs_base__image_config::pixel_format() { + return wuffs_base__image_config__pixel_format(this); +} + +inline wuffs_base__pixel_subsampling +wuffs_base__image_config::pixel_subsampling() { + return wuffs_base__image_config__pixel_subsampling(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_config::bounds() { + return wuffs_base__image_config__bounds(this); +} + +inline uint32_t wuffs_base__image_config::width() { + return wuffs_base__image_config__width(this); +} + +inline uint32_t wuffs_base__image_config::height() { + return wuffs_base__image_config__height(this); +} + +inline uint32_t wuffs_base__image_config::num_loops() { + return wuffs_base__image_config__num_loops(this); +} + +inline uint32_t wuffs_base__image_config::first_frame_is_opaque() { + return wuffs_base__image_config__first_frame_is_opaque(this); +} + +inline size_t wuffs_base__image_config::pixbuf_size() { + return wuffs_base__image_config__pixbuf_size(this); +} + +#endif // __cplusplus + // -------- // wuffs_base__animation_disposal encodes, for an animated image, how to @@ -1178,6 +1496,30 @@ typedef struct { bool palette_changed; uint8_t palette[1024]; } private_impl; + +#ifdef __cplusplus + inline wuffs_base__status set_from_pixbuf(wuffs_base__image_config config, + wuffs_base__pixel_buffer pixbuf); + inline wuffs_base__status set_from_slice(wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory); + inline void update(wuffs_base__rect_ie_u32 dirty_rect, + wuffs_base__flicks duration, + bool blend, + wuffs_base__animation_disposal disposal, + wuffs_base__slice_u8 palette); + inline wuffs_base__image_config* image_config(); + inline wuffs_base__rect_ie_u32 bounds(); + inline uint32_t width(); + inline uint32_t height(); + inline wuffs_base__rect_ie_u32 dirty_rect(); + inline wuffs_base__flicks duration(); + inline bool blend(); + inline wuffs_base__animation_disposal disposal(); + inline bool palette_changed(); + inline wuffs_base__slice_u8 palette(); + inline wuffs_base__table_u8 plane(uint32_t p); +#endif // __cplusplus + } wuffs_base__image_buffer; static inline wuffs_base__status wuffs_base__image_buffer__set_from_pixbuf( @@ -1322,6 +1664,76 @@ static inline wuffs_base__table_u8 wuffs_base__image_buffer__plane( : ((wuffs_base__table_u8){}); } +#ifdef __cplusplus + +inline wuffs_base__status wuffs_base__image_buffer::set_from_pixbuf( + wuffs_base__image_config config, + wuffs_base__pixel_buffer pixbuf) { + return wuffs_base__image_buffer__set_from_pixbuf(this, config, pixbuf); +} + +inline wuffs_base__status wuffs_base__image_buffer::set_from_slice( + wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory) { + return wuffs_base__image_buffer__set_from_slice(this, config, pixbuf_memory); +} + +inline void wuffs_base__image_buffer::update( + wuffs_base__rect_ie_u32 dirty_rect, + wuffs_base__flicks duration, + bool blend, + wuffs_base__animation_disposal disposal, + wuffs_base__slice_u8 palette) { + wuffs_base__image_buffer__update(this, dirty_rect, duration, blend, disposal, + palette); +} + +inline wuffs_base__image_config* wuffs_base__image_buffer::image_config() { + return wuffs_base__image_buffer__image_config(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::bounds() { + return wuffs_base__image_buffer__bounds(this); +} + +inline uint32_t wuffs_base__image_buffer::width() { + return wuffs_base__image_buffer__width(this); +} + +inline uint32_t wuffs_base__image_buffer::height() { + return wuffs_base__image_buffer__height(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::dirty_rect() { + return wuffs_base__image_buffer__dirty_rect(this); +} + +inline wuffs_base__flicks wuffs_base__image_buffer::duration() { + return wuffs_base__image_buffer__duration(this); +} + +inline bool wuffs_base__image_buffer::blend() { + return wuffs_base__image_buffer__blend(this); +} + +inline wuffs_base__animation_disposal wuffs_base__image_buffer::disposal() { + return wuffs_base__image_buffer__disposal(this); +} + +inline bool wuffs_base__image_buffer::palette_changed() { + return wuffs_base__image_buffer__palette_changed(this); +} + +inline wuffs_base__slice_u8 wuffs_base__image_buffer::palette() { + return wuffs_base__image_buffer__palette(this); +} + +inline wuffs_base__table_u8 wuffs_base__image_buffer::plane(uint32_t p) { + return wuffs_base__image_buffer__plane(this, p); +} + +#endif // __cplusplus + #ifdef __cplusplus } // extern "C" #endif diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index 97a4edce..fef6af6b 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -330,9 +330,20 @@ typedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64; // in which case the range is empty. There are multiple representations of an // empty range. -typedef struct { +typedef struct wuffs_base__range_ii_u32__struct { uint32_t min_incl; uint32_t max_incl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ii_u32__struct s); + inline bool contains(uint32_t x); + inline wuffs_base__range_ii_u32__struct intersection( + wuffs_base__range_ii_u32__struct s); + inline wuffs_base__range_ii_u32__struct unionz( + wuffs_base__range_ii_u32__struct s); +#endif // __cplusplus + } wuffs_base__range_ii_u32; static inline bool wuffs_base__range_ii_u32__is_empty( @@ -378,11 +389,49 @@ static inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__range_ii_u32::is_empty() { + return wuffs_base__range_ii_u32__is_empty(this); +} + +inline bool wuffs_base__range_ii_u32::equals(wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__equals(this, s); +} + +inline bool wuffs_base__range_ii_u32::contains(uint32_t x) { + return wuffs_base__range_ii_u32__contains(this, x); +} + +inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::intersection( + wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__intersection(this, s); +} + +inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::unionz( + wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__union(this, s); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ie_u32__struct { uint32_t min_incl; uint32_t max_excl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ie_u32__struct s); + inline bool contains(uint32_t x); + inline wuffs_base__range_ie_u32__struct intersection( + wuffs_base__range_ie_u32__struct s); + inline wuffs_base__range_ie_u32__struct unionz( + wuffs_base__range_ie_u32__struct s); + inline uint32_t length(); +#endif // __cplusplus + } wuffs_base__range_ie_u32; static inline bool wuffs_base__range_ie_u32__is_empty( @@ -433,11 +482,52 @@ static inline uint32_t wuffs_base__range_ie_u32__length( return wuffs_base__u32__sat_sub(r->max_excl, r->min_incl); } +#ifdef __cplusplus + +inline bool wuffs_base__range_ie_u32::is_empty() { + return wuffs_base__range_ie_u32__is_empty(this); +} + +inline bool wuffs_base__range_ie_u32::equals(wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__equals(this, s); +} + +inline bool wuffs_base__range_ie_u32::contains(uint32_t x) { + return wuffs_base__range_ie_u32__contains(this, x); +} + +inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::intersection( + wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__intersection(this, s); +} + +inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::unionz( + wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__union(this, s); +} + +inline uint32_t wuffs_base__range_ie_u32::length() { + return wuffs_base__range_ie_u32__length(this); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ii_u64__struct { uint64_t min_incl; uint64_t max_incl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ii_u64__struct s); + inline bool contains(uint64_t x); + inline wuffs_base__range_ii_u64__struct intersection( + wuffs_base__range_ii_u64__struct s); + inline wuffs_base__range_ii_u64__struct unionz( + wuffs_base__range_ii_u64__struct s); +#endif // __cplusplus + } wuffs_base__range_ii_u64; static inline bool wuffs_base__range_ii_u64__is_empty( @@ -483,11 +573,49 @@ static inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__range_ii_u64::is_empty() { + return wuffs_base__range_ii_u64__is_empty(this); +} + +inline bool wuffs_base__range_ii_u64::equals(wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__equals(this, s); +} + +inline bool wuffs_base__range_ii_u64::contains(uint64_t x) { + return wuffs_base__range_ii_u64__contains(this, x); +} + +inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::intersection( + wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__intersection(this, s); +} + +inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::unionz( + wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__union(this, s); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ie_u64__struct { uint64_t min_incl; uint64_t max_excl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ie_u64__struct s); + inline bool contains(uint64_t x); + inline wuffs_base__range_ie_u64__struct intersection( + wuffs_base__range_ie_u64__struct s); + inline wuffs_base__range_ie_u64__struct unionz( + wuffs_base__range_ie_u64__struct s); + inline uint64_t length(); +#endif // __cplusplus + } wuffs_base__range_ie_u64; static inline bool wuffs_base__range_ie_u64__is_empty( @@ -538,6 +666,36 @@ static inline uint64_t wuffs_base__range_ie_u64__length( return wuffs_base__u64__sat_sub(r->max_excl, r->min_incl); } +#ifdef __cplusplus + +inline bool wuffs_base__range_ie_u64::is_empty() { + return wuffs_base__range_ie_u64__is_empty(this); +} + +inline bool wuffs_base__range_ie_u64::equals(wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__equals(this, s); +} + +inline bool wuffs_base__range_ie_u64::contains(uint64_t x) { + return wuffs_base__range_ie_u64__contains(this, x); +} + +inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::intersection( + wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__intersection(this, s); +} + +inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::unionz( + wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__union(this, s); +} + +inline uint64_t wuffs_base__range_ie_u64::length() { + return wuffs_base__range_ie_u64__length(this); +} + +#endif // __cplusplus + // -------- // wuffs_base__rect_ii_u32 is a rectangle (a 2-dimensional range) on the @@ -549,11 +707,22 @@ static inline uint64_t wuffs_base__range_ie_u64__length( // multiple representations of an empty rectangle. // // The X and Y axes increase right and down. -typedef struct { +typedef struct wuffs_base__rect_ii_u32__struct { uint32_t min_incl_x; uint32_t min_incl_y; uint32_t max_incl_x; uint32_t max_incl_y; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__rect_ii_u32__struct s); + inline bool contains(uint32_t x, uint32_t y); + inline wuffs_base__rect_ii_u32__struct intersection( + wuffs_base__rect_ii_u32__struct s); + inline wuffs_base__rect_ii_u32__struct unionz( + wuffs_base__rect_ii_u32__struct s); +#endif // __cplusplus + } wuffs_base__rect_ii_u32; static inline bool wuffs_base__rect_ii_u32__is_empty( @@ -604,6 +773,32 @@ static inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__rect_ii_u32::is_empty() { + return wuffs_base__rect_ii_u32__is_empty(this); +} + +inline bool wuffs_base__rect_ii_u32::equals(wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__equals(this, s); +} + +inline bool wuffs_base__rect_ii_u32::contains(uint32_t x, uint32_t y) { + return wuffs_base__rect_ii_u32__contains(this, x, y); +} + +inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::intersection( + wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__intersection(this, s); +} + +inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::unionz( + wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__union(this, s); +} + +#endif // __cplusplus + // -------- // wuffs_base__rect_ie_u32 is a rectangle (a 2-dimensional range) on the @@ -616,11 +811,24 @@ static inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union( // fields zero. // // The X and Y axes increase right and down. -typedef struct { +typedef struct wuffs_base__rect_ie_u32__struct { uint32_t min_incl_x; uint32_t min_incl_y; uint32_t max_excl_x; uint32_t max_excl_y; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__rect_ie_u32__struct s); + inline bool contains(uint32_t x, uint32_t y); + inline wuffs_base__rect_ie_u32__struct intersection( + wuffs_base__rect_ie_u32__struct s); + inline wuffs_base__rect_ie_u32__struct unionz( + wuffs_base__rect_ie_u32__struct s); + inline uint32_t width(); + inline uint32_t height(); +#endif // __cplusplus + } wuffs_base__rect_ie_u32; static inline bool wuffs_base__rect_ie_u32__is_empty( @@ -681,6 +889,40 @@ static inline uint32_t wuffs_base__rect_ie_u32__height( return wuffs_base__u32__sat_sub(r->max_excl_y, r->min_incl_y); } +#ifdef __cplusplus + +inline bool wuffs_base__rect_ie_u32::is_empty() { + return wuffs_base__rect_ie_u32__is_empty(this); +} + +inline bool wuffs_base__rect_ie_u32::equals(wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__equals(this, s); +} + +inline bool wuffs_base__rect_ie_u32::contains(uint32_t x, uint32_t y) { + return wuffs_base__rect_ie_u32__contains(this, x, y); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::intersection( + wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__intersection(this, s); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::unionz( + wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__union(this, s); +} + +inline uint32_t wuffs_base__rect_ie_u32::width() { + return wuffs_base__rect_ie_u32__width(this); +} + +inline uint32_t wuffs_base__rect_ie_u32::height() { + return wuffs_base__rect_ie_u32__height(this); +} + +#endif // __cplusplus + // ---------------- I/O struct wuffs_base__io_buffer__struct; @@ -1046,6 +1288,26 @@ typedef struct { uint32_t num_loops; bool first_frame_is_opaque; } private_impl; + +#ifdef __cplusplus + inline void initialize(wuffs_base__pixel_format pixfmt, + wuffs_base__pixel_subsampling pixsub, + uint32_t width, + uint32_t height, + uint32_t num_loops, + bool first_frame_is_opaque); + inline void invalidate(); + inline bool is_valid(); + inline wuffs_base__pixel_format pixel_format(); + inline wuffs_base__pixel_subsampling pixel_subsampling(); + inline wuffs_base__rect_ie_u32 bounds(); + inline uint32_t width(); + inline uint32_t height(); + inline uint32_t num_loops(); + inline uint32_t first_frame_is_opaque(); + inline size_t pixbuf_size(); +#endif // __cplusplus + } wuffs_base__image_config; // TODO: Should this function return bool? An error type? @@ -1143,6 +1405,62 @@ static inline size_t wuffs_base__image_config__pixbuf_size( return 0; } +#ifdef __cplusplus + +inline void wuffs_base__image_config::initialize( + wuffs_base__pixel_format pixfmt, + wuffs_base__pixel_subsampling pixsub, + uint32_t width, + uint32_t height, + uint32_t num_loops, + bool first_frame_is_opaque) { + wuffs_base__image_config__initialize(this, pixfmt, pixsub, width, height, + num_loops, first_frame_is_opaque); +} + +inline void wuffs_base__image_config::invalidate() { + wuffs_base__image_config__invalidate(this); +} + +inline bool wuffs_base__image_config::is_valid() { + return wuffs_base__image_config__is_valid(this); +} + +inline wuffs_base__pixel_format wuffs_base__image_config::pixel_format() { + return wuffs_base__image_config__pixel_format(this); +} + +inline wuffs_base__pixel_subsampling +wuffs_base__image_config::pixel_subsampling() { + return wuffs_base__image_config__pixel_subsampling(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_config::bounds() { + return wuffs_base__image_config__bounds(this); +} + +inline uint32_t wuffs_base__image_config::width() { + return wuffs_base__image_config__width(this); +} + +inline uint32_t wuffs_base__image_config::height() { + return wuffs_base__image_config__height(this); +} + +inline uint32_t wuffs_base__image_config::num_loops() { + return wuffs_base__image_config__num_loops(this); +} + +inline uint32_t wuffs_base__image_config::first_frame_is_opaque() { + return wuffs_base__image_config__first_frame_is_opaque(this); +} + +inline size_t wuffs_base__image_config::pixbuf_size() { + return wuffs_base__image_config__pixbuf_size(this); +} + +#endif // __cplusplus + // -------- // wuffs_base__animation_disposal encodes, for an animated image, how to @@ -1178,6 +1496,30 @@ typedef struct { bool palette_changed; uint8_t palette[1024]; } private_impl; + +#ifdef __cplusplus + inline wuffs_base__status set_from_pixbuf(wuffs_base__image_config config, + wuffs_base__pixel_buffer pixbuf); + inline wuffs_base__status set_from_slice(wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory); + inline void update(wuffs_base__rect_ie_u32 dirty_rect, + wuffs_base__flicks duration, + bool blend, + wuffs_base__animation_disposal disposal, + wuffs_base__slice_u8 palette); + inline wuffs_base__image_config* image_config(); + inline wuffs_base__rect_ie_u32 bounds(); + inline uint32_t width(); + inline uint32_t height(); + inline wuffs_base__rect_ie_u32 dirty_rect(); + inline wuffs_base__flicks duration(); + inline bool blend(); + inline wuffs_base__animation_disposal disposal(); + inline bool palette_changed(); + inline wuffs_base__slice_u8 palette(); + inline wuffs_base__table_u8 plane(uint32_t p); +#endif // __cplusplus + } wuffs_base__image_buffer; static inline wuffs_base__status wuffs_base__image_buffer__set_from_pixbuf( @@ -1322,6 +1664,76 @@ static inline wuffs_base__table_u8 wuffs_base__image_buffer__plane( : ((wuffs_base__table_u8){}); } +#ifdef __cplusplus + +inline wuffs_base__status wuffs_base__image_buffer::set_from_pixbuf( + wuffs_base__image_config config, + wuffs_base__pixel_buffer pixbuf) { + return wuffs_base__image_buffer__set_from_pixbuf(this, config, pixbuf); +} + +inline wuffs_base__status wuffs_base__image_buffer::set_from_slice( + wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory) { + return wuffs_base__image_buffer__set_from_slice(this, config, pixbuf_memory); +} + +inline void wuffs_base__image_buffer::update( + wuffs_base__rect_ie_u32 dirty_rect, + wuffs_base__flicks duration, + bool blend, + wuffs_base__animation_disposal disposal, + wuffs_base__slice_u8 palette) { + wuffs_base__image_buffer__update(this, dirty_rect, duration, blend, disposal, + palette); +} + +inline wuffs_base__image_config* wuffs_base__image_buffer::image_config() { + return wuffs_base__image_buffer__image_config(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::bounds() { + return wuffs_base__image_buffer__bounds(this); +} + +inline uint32_t wuffs_base__image_buffer::width() { + return wuffs_base__image_buffer__width(this); +} + +inline uint32_t wuffs_base__image_buffer::height() { + return wuffs_base__image_buffer__height(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::dirty_rect() { + return wuffs_base__image_buffer__dirty_rect(this); +} + +inline wuffs_base__flicks wuffs_base__image_buffer::duration() { + return wuffs_base__image_buffer__duration(this); +} + +inline bool wuffs_base__image_buffer::blend() { + return wuffs_base__image_buffer__blend(this); +} + +inline wuffs_base__animation_disposal wuffs_base__image_buffer::disposal() { + return wuffs_base__image_buffer__disposal(this); +} + +inline bool wuffs_base__image_buffer::palette_changed() { + return wuffs_base__image_buffer__palette_changed(this); +} + +inline wuffs_base__slice_u8 wuffs_base__image_buffer::palette() { + return wuffs_base__image_buffer__palette(this); +} + +inline wuffs_base__table_u8 wuffs_base__image_buffer::plane(uint32_t p) { + return wuffs_base__image_buffer__plane(this, p); +} + +#endif // __cplusplus + #ifdef __cplusplus } // extern "C" #endif diff --git a/gen/h/std/adler32.h b/gen/h/std/adler32.h index e4a2401f..00b417ec 100644 --- a/gen/h/std/adler32.h +++ b/gen/h/std/adler32.h @@ -330,9 +330,20 @@ typedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64; // in which case the range is empty. There are multiple representations of an // empty range. -typedef struct { +typedef struct wuffs_base__range_ii_u32__struct { uint32_t min_incl; uint32_t max_incl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ii_u32__struct s); + inline bool contains(uint32_t x); + inline wuffs_base__range_ii_u32__struct intersection( + wuffs_base__range_ii_u32__struct s); + inline wuffs_base__range_ii_u32__struct unionz( + wuffs_base__range_ii_u32__struct s); +#endif // __cplusplus + } wuffs_base__range_ii_u32; static inline bool wuffs_base__range_ii_u32__is_empty( @@ -378,11 +389,49 @@ static inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__range_ii_u32::is_empty() { + return wuffs_base__range_ii_u32__is_empty(this); +} + +inline bool wuffs_base__range_ii_u32::equals(wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__equals(this, s); +} + +inline bool wuffs_base__range_ii_u32::contains(uint32_t x) { + return wuffs_base__range_ii_u32__contains(this, x); +} + +inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::intersection( + wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__intersection(this, s); +} + +inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::unionz( + wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__union(this, s); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ie_u32__struct { uint32_t min_incl; uint32_t max_excl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ie_u32__struct s); + inline bool contains(uint32_t x); + inline wuffs_base__range_ie_u32__struct intersection( + wuffs_base__range_ie_u32__struct s); + inline wuffs_base__range_ie_u32__struct unionz( + wuffs_base__range_ie_u32__struct s); + inline uint32_t length(); +#endif // __cplusplus + } wuffs_base__range_ie_u32; static inline bool wuffs_base__range_ie_u32__is_empty( @@ -433,11 +482,52 @@ static inline uint32_t wuffs_base__range_ie_u32__length( return wuffs_base__u32__sat_sub(r->max_excl, r->min_incl); } +#ifdef __cplusplus + +inline bool wuffs_base__range_ie_u32::is_empty() { + return wuffs_base__range_ie_u32__is_empty(this); +} + +inline bool wuffs_base__range_ie_u32::equals(wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__equals(this, s); +} + +inline bool wuffs_base__range_ie_u32::contains(uint32_t x) { + return wuffs_base__range_ie_u32__contains(this, x); +} + +inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::intersection( + wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__intersection(this, s); +} + +inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::unionz( + wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__union(this, s); +} + +inline uint32_t wuffs_base__range_ie_u32::length() { + return wuffs_base__range_ie_u32__length(this); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ii_u64__struct { uint64_t min_incl; uint64_t max_incl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ii_u64__struct s); + inline bool contains(uint64_t x); + inline wuffs_base__range_ii_u64__struct intersection( + wuffs_base__range_ii_u64__struct s); + inline wuffs_base__range_ii_u64__struct unionz( + wuffs_base__range_ii_u64__struct s); +#endif // __cplusplus + } wuffs_base__range_ii_u64; static inline bool wuffs_base__range_ii_u64__is_empty( @@ -483,11 +573,49 @@ static inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__range_ii_u64::is_empty() { + return wuffs_base__range_ii_u64__is_empty(this); +} + +inline bool wuffs_base__range_ii_u64::equals(wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__equals(this, s); +} + +inline bool wuffs_base__range_ii_u64::contains(uint64_t x) { + return wuffs_base__range_ii_u64__contains(this, x); +} + +inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::intersection( + wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__intersection(this, s); +} + +inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::unionz( + wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__union(this, s); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ie_u64__struct { uint64_t min_incl; uint64_t max_excl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ie_u64__struct s); + inline bool contains(uint64_t x); + inline wuffs_base__range_ie_u64__struct intersection( + wuffs_base__range_ie_u64__struct s); + inline wuffs_base__range_ie_u64__struct unionz( + wuffs_base__range_ie_u64__struct s); + inline uint64_t length(); +#endif // __cplusplus + } wuffs_base__range_ie_u64; static inline bool wuffs_base__range_ie_u64__is_empty( @@ -538,6 +666,36 @@ static inline uint64_t wuffs_base__range_ie_u64__length( return wuffs_base__u64__sat_sub(r->max_excl, r->min_incl); } +#ifdef __cplusplus + +inline bool wuffs_base__range_ie_u64::is_empty() { + return wuffs_base__range_ie_u64__is_empty(this); +} + +inline bool wuffs_base__range_ie_u64::equals(wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__equals(this, s); +} + +inline bool wuffs_base__range_ie_u64::contains(uint64_t x) { + return wuffs_base__range_ie_u64__contains(this, x); +} + +inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::intersection( + wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__intersection(this, s); +} + +inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::unionz( + wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__union(this, s); +} + +inline uint64_t wuffs_base__range_ie_u64::length() { + return wuffs_base__range_ie_u64__length(this); +} + +#endif // __cplusplus + // -------- // wuffs_base__rect_ii_u32 is a rectangle (a 2-dimensional range) on the @@ -549,11 +707,22 @@ static inline uint64_t wuffs_base__range_ie_u64__length( // multiple representations of an empty rectangle. // // The X and Y axes increase right and down. -typedef struct { +typedef struct wuffs_base__rect_ii_u32__struct { uint32_t min_incl_x; uint32_t min_incl_y; uint32_t max_incl_x; uint32_t max_incl_y; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__rect_ii_u32__struct s); + inline bool contains(uint32_t x, uint32_t y); + inline wuffs_base__rect_ii_u32__struct intersection( + wuffs_base__rect_ii_u32__struct s); + inline wuffs_base__rect_ii_u32__struct unionz( + wuffs_base__rect_ii_u32__struct s); +#endif // __cplusplus + } wuffs_base__rect_ii_u32; static inline bool wuffs_base__rect_ii_u32__is_empty( @@ -604,6 +773,32 @@ static inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__rect_ii_u32::is_empty() { + return wuffs_base__rect_ii_u32__is_empty(this); +} + +inline bool wuffs_base__rect_ii_u32::equals(wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__equals(this, s); +} + +inline bool wuffs_base__rect_ii_u32::contains(uint32_t x, uint32_t y) { + return wuffs_base__rect_ii_u32__contains(this, x, y); +} + +inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::intersection( + wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__intersection(this, s); +} + +inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::unionz( + wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__union(this, s); +} + +#endif // __cplusplus + // -------- // wuffs_base__rect_ie_u32 is a rectangle (a 2-dimensional range) on the @@ -616,11 +811,24 @@ static inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union( // fields zero. // // The X and Y axes increase right and down. -typedef struct { +typedef struct wuffs_base__rect_ie_u32__struct { uint32_t min_incl_x; uint32_t min_incl_y; uint32_t max_excl_x; uint32_t max_excl_y; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__rect_ie_u32__struct s); + inline bool contains(uint32_t x, uint32_t y); + inline wuffs_base__rect_ie_u32__struct intersection( + wuffs_base__rect_ie_u32__struct s); + inline wuffs_base__rect_ie_u32__struct unionz( + wuffs_base__rect_ie_u32__struct s); + inline uint32_t width(); + inline uint32_t height(); +#endif // __cplusplus + } wuffs_base__rect_ie_u32; static inline bool wuffs_base__rect_ie_u32__is_empty( @@ -681,6 +889,40 @@ static inline uint32_t wuffs_base__rect_ie_u32__height( return wuffs_base__u32__sat_sub(r->max_excl_y, r->min_incl_y); } +#ifdef __cplusplus + +inline bool wuffs_base__rect_ie_u32::is_empty() { + return wuffs_base__rect_ie_u32__is_empty(this); +} + +inline bool wuffs_base__rect_ie_u32::equals(wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__equals(this, s); +} + +inline bool wuffs_base__rect_ie_u32::contains(uint32_t x, uint32_t y) { + return wuffs_base__rect_ie_u32__contains(this, x, y); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::intersection( + wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__intersection(this, s); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::unionz( + wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__union(this, s); +} + +inline uint32_t wuffs_base__rect_ie_u32::width() { + return wuffs_base__rect_ie_u32__width(this); +} + +inline uint32_t wuffs_base__rect_ie_u32::height() { + return wuffs_base__rect_ie_u32__height(this); +} + +#endif // __cplusplus + // ---------------- I/O struct wuffs_base__io_buffer__struct; @@ -1046,6 +1288,26 @@ typedef struct { uint32_t num_loops; bool first_frame_is_opaque; } private_impl; + +#ifdef __cplusplus + inline void initialize(wuffs_base__pixel_format pixfmt, + wuffs_base__pixel_subsampling pixsub, + uint32_t width, + uint32_t height, + uint32_t num_loops, + bool first_frame_is_opaque); + inline void invalidate(); + inline bool is_valid(); + inline wuffs_base__pixel_format pixel_format(); + inline wuffs_base__pixel_subsampling pixel_subsampling(); + inline wuffs_base__rect_ie_u32 bounds(); + inline uint32_t width(); + inline uint32_t height(); + inline uint32_t num_loops(); + inline uint32_t first_frame_is_opaque(); + inline size_t pixbuf_size(); +#endif // __cplusplus + } wuffs_base__image_config; // TODO: Should this function return bool? An error type? @@ -1143,6 +1405,62 @@ static inline size_t wuffs_base__image_config__pixbuf_size( return 0; } +#ifdef __cplusplus + +inline void wuffs_base__image_config::initialize( + wuffs_base__pixel_format pixfmt, + wuffs_base__pixel_subsampling pixsub, + uint32_t width, + uint32_t height, + uint32_t num_loops, + bool first_frame_is_opaque) { + wuffs_base__image_config__initialize(this, pixfmt, pixsub, width, height, + num_loops, first_frame_is_opaque); +} + +inline void wuffs_base__image_config::invalidate() { + wuffs_base__image_config__invalidate(this); +} + +inline bool wuffs_base__image_config::is_valid() { + return wuffs_base__image_config__is_valid(this); +} + +inline wuffs_base__pixel_format wuffs_base__image_config::pixel_format() { + return wuffs_base__image_config__pixel_format(this); +} + +inline wuffs_base__pixel_subsampling +wuffs_base__image_config::pixel_subsampling() { + return wuffs_base__image_config__pixel_subsampling(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_config::bounds() { + return wuffs_base__image_config__bounds(this); +} + +inline uint32_t wuffs_base__image_config::width() { + return wuffs_base__image_config__width(this); +} + +inline uint32_t wuffs_base__image_config::height() { + return wuffs_base__image_config__height(this); +} + +inline uint32_t wuffs_base__image_config::num_loops() { + return wuffs_base__image_config__num_loops(this); +} + +inline uint32_t wuffs_base__image_config::first_frame_is_opaque() { + return wuffs_base__image_config__first_frame_is_opaque(this); +} + +inline size_t wuffs_base__image_config::pixbuf_size() { + return wuffs_base__image_config__pixbuf_size(this); +} + +#endif // __cplusplus + // -------- // wuffs_base__animation_disposal encodes, for an animated image, how to @@ -1178,6 +1496,30 @@ typedef struct { bool palette_changed; uint8_t palette[1024]; } private_impl; + +#ifdef __cplusplus + inline wuffs_base__status set_from_pixbuf(wuffs_base__image_config config, + wuffs_base__pixel_buffer pixbuf); + inline wuffs_base__status set_from_slice(wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory); + inline void update(wuffs_base__rect_ie_u32 dirty_rect, + wuffs_base__flicks duration, + bool blend, + wuffs_base__animation_disposal disposal, + wuffs_base__slice_u8 palette); + inline wuffs_base__image_config* image_config(); + inline wuffs_base__rect_ie_u32 bounds(); + inline uint32_t width(); + inline uint32_t height(); + inline wuffs_base__rect_ie_u32 dirty_rect(); + inline wuffs_base__flicks duration(); + inline bool blend(); + inline wuffs_base__animation_disposal disposal(); + inline bool palette_changed(); + inline wuffs_base__slice_u8 palette(); + inline wuffs_base__table_u8 plane(uint32_t p); +#endif // __cplusplus + } wuffs_base__image_buffer; static inline wuffs_base__status wuffs_base__image_buffer__set_from_pixbuf( @@ -1322,6 +1664,76 @@ static inline wuffs_base__table_u8 wuffs_base__image_buffer__plane( : ((wuffs_base__table_u8){}); } +#ifdef __cplusplus + +inline wuffs_base__status wuffs_base__image_buffer::set_from_pixbuf( + wuffs_base__image_config config, + wuffs_base__pixel_buffer pixbuf) { + return wuffs_base__image_buffer__set_from_pixbuf(this, config, pixbuf); +} + +inline wuffs_base__status wuffs_base__image_buffer::set_from_slice( + wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory) { + return wuffs_base__image_buffer__set_from_slice(this, config, pixbuf_memory); +} + +inline void wuffs_base__image_buffer::update( + wuffs_base__rect_ie_u32 dirty_rect, + wuffs_base__flicks duration, + bool blend, + wuffs_base__animation_disposal disposal, + wuffs_base__slice_u8 palette) { + wuffs_base__image_buffer__update(this, dirty_rect, duration, blend, disposal, + palette); +} + +inline wuffs_base__image_config* wuffs_base__image_buffer::image_config() { + return wuffs_base__image_buffer__image_config(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::bounds() { + return wuffs_base__image_buffer__bounds(this); +} + +inline uint32_t wuffs_base__image_buffer::width() { + return wuffs_base__image_buffer__width(this); +} + +inline uint32_t wuffs_base__image_buffer::height() { + return wuffs_base__image_buffer__height(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::dirty_rect() { + return wuffs_base__image_buffer__dirty_rect(this); +} + +inline wuffs_base__flicks wuffs_base__image_buffer::duration() { + return wuffs_base__image_buffer__duration(this); +} + +inline bool wuffs_base__image_buffer::blend() { + return wuffs_base__image_buffer__blend(this); +} + +inline wuffs_base__animation_disposal wuffs_base__image_buffer::disposal() { + return wuffs_base__image_buffer__disposal(this); +} + +inline bool wuffs_base__image_buffer::palette_changed() { + return wuffs_base__image_buffer__palette_changed(this); +} + +inline wuffs_base__slice_u8 wuffs_base__image_buffer::palette() { + return wuffs_base__image_buffer__palette(this); +} + +inline wuffs_base__table_u8 wuffs_base__image_buffer::plane(uint32_t p) { + return wuffs_base__image_buffer__plane(this, p); +} + +#endif // __cplusplus + #ifdef __cplusplus } // extern "C" #endif diff --git a/gen/h/std/crc32.h b/gen/h/std/crc32.h index 8025ffcd..62df44aa 100644 --- a/gen/h/std/crc32.h +++ b/gen/h/std/crc32.h @@ -330,9 +330,20 @@ typedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64; // in which case the range is empty. There are multiple representations of an // empty range. -typedef struct { +typedef struct wuffs_base__range_ii_u32__struct { uint32_t min_incl; uint32_t max_incl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ii_u32__struct s); + inline bool contains(uint32_t x); + inline wuffs_base__range_ii_u32__struct intersection( + wuffs_base__range_ii_u32__struct s); + inline wuffs_base__range_ii_u32__struct unionz( + wuffs_base__range_ii_u32__struct s); +#endif // __cplusplus + } wuffs_base__range_ii_u32; static inline bool wuffs_base__range_ii_u32__is_empty( @@ -378,11 +389,49 @@ static inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__range_ii_u32::is_empty() { + return wuffs_base__range_ii_u32__is_empty(this); +} + +inline bool wuffs_base__range_ii_u32::equals(wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__equals(this, s); +} + +inline bool wuffs_base__range_ii_u32::contains(uint32_t x) { + return wuffs_base__range_ii_u32__contains(this, x); +} + +inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::intersection( + wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__intersection(this, s); +} + +inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::unionz( + wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__union(this, s); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ie_u32__struct { uint32_t min_incl; uint32_t max_excl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ie_u32__struct s); + inline bool contains(uint32_t x); + inline wuffs_base__range_ie_u32__struct intersection( + wuffs_base__range_ie_u32__struct s); + inline wuffs_base__range_ie_u32__struct unionz( + wuffs_base__range_ie_u32__struct s); + inline uint32_t length(); +#endif // __cplusplus + } wuffs_base__range_ie_u32; static inline bool wuffs_base__range_ie_u32__is_empty( @@ -433,11 +482,52 @@ static inline uint32_t wuffs_base__range_ie_u32__length( return wuffs_base__u32__sat_sub(r->max_excl, r->min_incl); } +#ifdef __cplusplus + +inline bool wuffs_base__range_ie_u32::is_empty() { + return wuffs_base__range_ie_u32__is_empty(this); +} + +inline bool wuffs_base__range_ie_u32::equals(wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__equals(this, s); +} + +inline bool wuffs_base__range_ie_u32::contains(uint32_t x) { + return wuffs_base__range_ie_u32__contains(this, x); +} + +inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::intersection( + wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__intersection(this, s); +} + +inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::unionz( + wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__union(this, s); +} + +inline uint32_t wuffs_base__range_ie_u32::length() { + return wuffs_base__range_ie_u32__length(this); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ii_u64__struct { uint64_t min_incl; uint64_t max_incl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ii_u64__struct s); + inline bool contains(uint64_t x); + inline wuffs_base__range_ii_u64__struct intersection( + wuffs_base__range_ii_u64__struct s); + inline wuffs_base__range_ii_u64__struct unionz( + wuffs_base__range_ii_u64__struct s); +#endif // __cplusplus + } wuffs_base__range_ii_u64; static inline bool wuffs_base__range_ii_u64__is_empty( @@ -483,11 +573,49 @@ static inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__range_ii_u64::is_empty() { + return wuffs_base__range_ii_u64__is_empty(this); +} + +inline bool wuffs_base__range_ii_u64::equals(wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__equals(this, s); +} + +inline bool wuffs_base__range_ii_u64::contains(uint64_t x) { + return wuffs_base__range_ii_u64__contains(this, x); +} + +inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::intersection( + wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__intersection(this, s); +} + +inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::unionz( + wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__union(this, s); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ie_u64__struct { uint64_t min_incl; uint64_t max_excl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ie_u64__struct s); + inline bool contains(uint64_t x); + inline wuffs_base__range_ie_u64__struct intersection( + wuffs_base__range_ie_u64__struct s); + inline wuffs_base__range_ie_u64__struct unionz( + wuffs_base__range_ie_u64__struct s); + inline uint64_t length(); +#endif // __cplusplus + } wuffs_base__range_ie_u64; static inline bool wuffs_base__range_ie_u64__is_empty( @@ -538,6 +666,36 @@ static inline uint64_t wuffs_base__range_ie_u64__length( return wuffs_base__u64__sat_sub(r->max_excl, r->min_incl); } +#ifdef __cplusplus + +inline bool wuffs_base__range_ie_u64::is_empty() { + return wuffs_base__range_ie_u64__is_empty(this); +} + +inline bool wuffs_base__range_ie_u64::equals(wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__equals(this, s); +} + +inline bool wuffs_base__range_ie_u64::contains(uint64_t x) { + return wuffs_base__range_ie_u64__contains(this, x); +} + +inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::intersection( + wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__intersection(this, s); +} + +inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::unionz( + wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__union(this, s); +} + +inline uint64_t wuffs_base__range_ie_u64::length() { + return wuffs_base__range_ie_u64__length(this); +} + +#endif // __cplusplus + // -------- // wuffs_base__rect_ii_u32 is a rectangle (a 2-dimensional range) on the @@ -549,11 +707,22 @@ static inline uint64_t wuffs_base__range_ie_u64__length( // multiple representations of an empty rectangle. // // The X and Y axes increase right and down. -typedef struct { +typedef struct wuffs_base__rect_ii_u32__struct { uint32_t min_incl_x; uint32_t min_incl_y; uint32_t max_incl_x; uint32_t max_incl_y; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__rect_ii_u32__struct s); + inline bool contains(uint32_t x, uint32_t y); + inline wuffs_base__rect_ii_u32__struct intersection( + wuffs_base__rect_ii_u32__struct s); + inline wuffs_base__rect_ii_u32__struct unionz( + wuffs_base__rect_ii_u32__struct s); +#endif // __cplusplus + } wuffs_base__rect_ii_u32; static inline bool wuffs_base__rect_ii_u32__is_empty( @@ -604,6 +773,32 @@ static inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__rect_ii_u32::is_empty() { + return wuffs_base__rect_ii_u32__is_empty(this); +} + +inline bool wuffs_base__rect_ii_u32::equals(wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__equals(this, s); +} + +inline bool wuffs_base__rect_ii_u32::contains(uint32_t x, uint32_t y) { + return wuffs_base__rect_ii_u32__contains(this, x, y); +} + +inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::intersection( + wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__intersection(this, s); +} + +inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::unionz( + wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__union(this, s); +} + +#endif // __cplusplus + // -------- // wuffs_base__rect_ie_u32 is a rectangle (a 2-dimensional range) on the @@ -616,11 +811,24 @@ static inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union( // fields zero. // // The X and Y axes increase right and down. -typedef struct { +typedef struct wuffs_base__rect_ie_u32__struct { uint32_t min_incl_x; uint32_t min_incl_y; uint32_t max_excl_x; uint32_t max_excl_y; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__rect_ie_u32__struct s); + inline bool contains(uint32_t x, uint32_t y); + inline wuffs_base__rect_ie_u32__struct intersection( + wuffs_base__rect_ie_u32__struct s); + inline wuffs_base__rect_ie_u32__struct unionz( + wuffs_base__rect_ie_u32__struct s); + inline uint32_t width(); + inline uint32_t height(); +#endif // __cplusplus + } wuffs_base__rect_ie_u32; static inline bool wuffs_base__rect_ie_u32__is_empty( @@ -681,6 +889,40 @@ static inline uint32_t wuffs_base__rect_ie_u32__height( return wuffs_base__u32__sat_sub(r->max_excl_y, r->min_incl_y); } +#ifdef __cplusplus + +inline bool wuffs_base__rect_ie_u32::is_empty() { + return wuffs_base__rect_ie_u32__is_empty(this); +} + +inline bool wuffs_base__rect_ie_u32::equals(wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__equals(this, s); +} + +inline bool wuffs_base__rect_ie_u32::contains(uint32_t x, uint32_t y) { + return wuffs_base__rect_ie_u32__contains(this, x, y); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::intersection( + wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__intersection(this, s); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::unionz( + wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__union(this, s); +} + +inline uint32_t wuffs_base__rect_ie_u32::width() { + return wuffs_base__rect_ie_u32__width(this); +} + +inline uint32_t wuffs_base__rect_ie_u32::height() { + return wuffs_base__rect_ie_u32__height(this); +} + +#endif // __cplusplus + // ---------------- I/O struct wuffs_base__io_buffer__struct; @@ -1046,6 +1288,26 @@ typedef struct { uint32_t num_loops; bool first_frame_is_opaque; } private_impl; + +#ifdef __cplusplus + inline void initialize(wuffs_base__pixel_format pixfmt, + wuffs_base__pixel_subsampling pixsub, + uint32_t width, + uint32_t height, + uint32_t num_loops, + bool first_frame_is_opaque); + inline void invalidate(); + inline bool is_valid(); + inline wuffs_base__pixel_format pixel_format(); + inline wuffs_base__pixel_subsampling pixel_subsampling(); + inline wuffs_base__rect_ie_u32 bounds(); + inline uint32_t width(); + inline uint32_t height(); + inline uint32_t num_loops(); + inline uint32_t first_frame_is_opaque(); + inline size_t pixbuf_size(); +#endif // __cplusplus + } wuffs_base__image_config; // TODO: Should this function return bool? An error type? @@ -1143,6 +1405,62 @@ static inline size_t wuffs_base__image_config__pixbuf_size( return 0; } +#ifdef __cplusplus + +inline void wuffs_base__image_config::initialize( + wuffs_base__pixel_format pixfmt, + wuffs_base__pixel_subsampling pixsub, + uint32_t width, + uint32_t height, + uint32_t num_loops, + bool first_frame_is_opaque) { + wuffs_base__image_config__initialize(this, pixfmt, pixsub, width, height, + num_loops, first_frame_is_opaque); +} + +inline void wuffs_base__image_config::invalidate() { + wuffs_base__image_config__invalidate(this); +} + +inline bool wuffs_base__image_config::is_valid() { + return wuffs_base__image_config__is_valid(this); +} + +inline wuffs_base__pixel_format wuffs_base__image_config::pixel_format() { + return wuffs_base__image_config__pixel_format(this); +} + +inline wuffs_base__pixel_subsampling +wuffs_base__image_config::pixel_subsampling() { + return wuffs_base__image_config__pixel_subsampling(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_config::bounds() { + return wuffs_base__image_config__bounds(this); +} + +inline uint32_t wuffs_base__image_config::width() { + return wuffs_base__image_config__width(this); +} + +inline uint32_t wuffs_base__image_config::height() { + return wuffs_base__image_config__height(this); +} + +inline uint32_t wuffs_base__image_config::num_loops() { + return wuffs_base__image_config__num_loops(this); +} + +inline uint32_t wuffs_base__image_config::first_frame_is_opaque() { + return wuffs_base__image_config__first_frame_is_opaque(this); +} + +inline size_t wuffs_base__image_config::pixbuf_size() { + return wuffs_base__image_config__pixbuf_size(this); +} + +#endif // __cplusplus + // -------- // wuffs_base__animation_disposal encodes, for an animated image, how to @@ -1178,6 +1496,30 @@ typedef struct { bool palette_changed; uint8_t palette[1024]; } private_impl; + +#ifdef __cplusplus + inline wuffs_base__status set_from_pixbuf(wuffs_base__image_config config, + wuffs_base__pixel_buffer pixbuf); + inline wuffs_base__status set_from_slice(wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory); + inline void update(wuffs_base__rect_ie_u32 dirty_rect, + wuffs_base__flicks duration, + bool blend, + wuffs_base__animation_disposal disposal, + wuffs_base__slice_u8 palette); + inline wuffs_base__image_config* image_config(); + inline wuffs_base__rect_ie_u32 bounds(); + inline uint32_t width(); + inline uint32_t height(); + inline wuffs_base__rect_ie_u32 dirty_rect(); + inline wuffs_base__flicks duration(); + inline bool blend(); + inline wuffs_base__animation_disposal disposal(); + inline bool palette_changed(); + inline wuffs_base__slice_u8 palette(); + inline wuffs_base__table_u8 plane(uint32_t p); +#endif // __cplusplus + } wuffs_base__image_buffer; static inline wuffs_base__status wuffs_base__image_buffer__set_from_pixbuf( @@ -1322,6 +1664,76 @@ static inline wuffs_base__table_u8 wuffs_base__image_buffer__plane( : ((wuffs_base__table_u8){}); } +#ifdef __cplusplus + +inline wuffs_base__status wuffs_base__image_buffer::set_from_pixbuf( + wuffs_base__image_config config, + wuffs_base__pixel_buffer pixbuf) { + return wuffs_base__image_buffer__set_from_pixbuf(this, config, pixbuf); +} + +inline wuffs_base__status wuffs_base__image_buffer::set_from_slice( + wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory) { + return wuffs_base__image_buffer__set_from_slice(this, config, pixbuf_memory); +} + +inline void wuffs_base__image_buffer::update( + wuffs_base__rect_ie_u32 dirty_rect, + wuffs_base__flicks duration, + bool blend, + wuffs_base__animation_disposal disposal, + wuffs_base__slice_u8 palette) { + wuffs_base__image_buffer__update(this, dirty_rect, duration, blend, disposal, + palette); +} + +inline wuffs_base__image_config* wuffs_base__image_buffer::image_config() { + return wuffs_base__image_buffer__image_config(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::bounds() { + return wuffs_base__image_buffer__bounds(this); +} + +inline uint32_t wuffs_base__image_buffer::width() { + return wuffs_base__image_buffer__width(this); +} + +inline uint32_t wuffs_base__image_buffer::height() { + return wuffs_base__image_buffer__height(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::dirty_rect() { + return wuffs_base__image_buffer__dirty_rect(this); +} + +inline wuffs_base__flicks wuffs_base__image_buffer::duration() { + return wuffs_base__image_buffer__duration(this); +} + +inline bool wuffs_base__image_buffer::blend() { + return wuffs_base__image_buffer__blend(this); +} + +inline wuffs_base__animation_disposal wuffs_base__image_buffer::disposal() { + return wuffs_base__image_buffer__disposal(this); +} + +inline bool wuffs_base__image_buffer::palette_changed() { + return wuffs_base__image_buffer__palette_changed(this); +} + +inline wuffs_base__slice_u8 wuffs_base__image_buffer::palette() { + return wuffs_base__image_buffer__palette(this); +} + +inline wuffs_base__table_u8 wuffs_base__image_buffer::plane(uint32_t p) { + return wuffs_base__image_buffer__plane(this, p); +} + +#endif // __cplusplus + #ifdef __cplusplus } // extern "C" #endif diff --git a/gen/h/std/deflate.h b/gen/h/std/deflate.h index 59aa6dc8..bcd9bd96 100644 --- a/gen/h/std/deflate.h +++ b/gen/h/std/deflate.h @@ -330,9 +330,20 @@ typedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64; // in which case the range is empty. There are multiple representations of an // empty range. -typedef struct { +typedef struct wuffs_base__range_ii_u32__struct { uint32_t min_incl; uint32_t max_incl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ii_u32__struct s); + inline bool contains(uint32_t x); + inline wuffs_base__range_ii_u32__struct intersection( + wuffs_base__range_ii_u32__struct s); + inline wuffs_base__range_ii_u32__struct unionz( + wuffs_base__range_ii_u32__struct s); +#endif // __cplusplus + } wuffs_base__range_ii_u32; static inline bool wuffs_base__range_ii_u32__is_empty( @@ -378,11 +389,49 @@ static inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__range_ii_u32::is_empty() { + return wuffs_base__range_ii_u32__is_empty(this); +} + +inline bool wuffs_base__range_ii_u32::equals(wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__equals(this, s); +} + +inline bool wuffs_base__range_ii_u32::contains(uint32_t x) { + return wuffs_base__range_ii_u32__contains(this, x); +} + +inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::intersection( + wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__intersection(this, s); +} + +inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::unionz( + wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__union(this, s); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ie_u32__struct { uint32_t min_incl; uint32_t max_excl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ie_u32__struct s); + inline bool contains(uint32_t x); + inline wuffs_base__range_ie_u32__struct intersection( + wuffs_base__range_ie_u32__struct s); + inline wuffs_base__range_ie_u32__struct unionz( + wuffs_base__range_ie_u32__struct s); + inline uint32_t length(); +#endif // __cplusplus + } wuffs_base__range_ie_u32; static inline bool wuffs_base__range_ie_u32__is_empty( @@ -433,11 +482,52 @@ static inline uint32_t wuffs_base__range_ie_u32__length( return wuffs_base__u32__sat_sub(r->max_excl, r->min_incl); } +#ifdef __cplusplus + +inline bool wuffs_base__range_ie_u32::is_empty() { + return wuffs_base__range_ie_u32__is_empty(this); +} + +inline bool wuffs_base__range_ie_u32::equals(wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__equals(this, s); +} + +inline bool wuffs_base__range_ie_u32::contains(uint32_t x) { + return wuffs_base__range_ie_u32__contains(this, x); +} + +inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::intersection( + wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__intersection(this, s); +} + +inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::unionz( + wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__union(this, s); +} + +inline uint32_t wuffs_base__range_ie_u32::length() { + return wuffs_base__range_ie_u32__length(this); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ii_u64__struct { uint64_t min_incl; uint64_t max_incl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ii_u64__struct s); + inline bool contains(uint64_t x); + inline wuffs_base__range_ii_u64__struct intersection( + wuffs_base__range_ii_u64__struct s); + inline wuffs_base__range_ii_u64__struct unionz( + wuffs_base__range_ii_u64__struct s); +#endif // __cplusplus + } wuffs_base__range_ii_u64; static inline bool wuffs_base__range_ii_u64__is_empty( @@ -483,11 +573,49 @@ static inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__range_ii_u64::is_empty() { + return wuffs_base__range_ii_u64__is_empty(this); +} + +inline bool wuffs_base__range_ii_u64::equals(wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__equals(this, s); +} + +inline bool wuffs_base__range_ii_u64::contains(uint64_t x) { + return wuffs_base__range_ii_u64__contains(this, x); +} + +inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::intersection( + wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__intersection(this, s); +} + +inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::unionz( + wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__union(this, s); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ie_u64__struct { uint64_t min_incl; uint64_t max_excl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ie_u64__struct s); + inline bool contains(uint64_t x); + inline wuffs_base__range_ie_u64__struct intersection( + wuffs_base__range_ie_u64__struct s); + inline wuffs_base__range_ie_u64__struct unionz( + wuffs_base__range_ie_u64__struct s); + inline uint64_t length(); +#endif // __cplusplus + } wuffs_base__range_ie_u64; static inline bool wuffs_base__range_ie_u64__is_empty( @@ -538,6 +666,36 @@ static inline uint64_t wuffs_base__range_ie_u64__length( return wuffs_base__u64__sat_sub(r->max_excl, r->min_incl); } +#ifdef __cplusplus + +inline bool wuffs_base__range_ie_u64::is_empty() { + return wuffs_base__range_ie_u64__is_empty(this); +} + +inline bool wuffs_base__range_ie_u64::equals(wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__equals(this, s); +} + +inline bool wuffs_base__range_ie_u64::contains(uint64_t x) { + return wuffs_base__range_ie_u64__contains(this, x); +} + +inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::intersection( + wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__intersection(this, s); +} + +inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::unionz( + wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__union(this, s); +} + +inline uint64_t wuffs_base__range_ie_u64::length() { + return wuffs_base__range_ie_u64__length(this); +} + +#endif // __cplusplus + // -------- // wuffs_base__rect_ii_u32 is a rectangle (a 2-dimensional range) on the @@ -549,11 +707,22 @@ static inline uint64_t wuffs_base__range_ie_u64__length( // multiple representations of an empty rectangle. // // The X and Y axes increase right and down. -typedef struct { +typedef struct wuffs_base__rect_ii_u32__struct { uint32_t min_incl_x; uint32_t min_incl_y; uint32_t max_incl_x; uint32_t max_incl_y; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__rect_ii_u32__struct s); + inline bool contains(uint32_t x, uint32_t y); + inline wuffs_base__rect_ii_u32__struct intersection( + wuffs_base__rect_ii_u32__struct s); + inline wuffs_base__rect_ii_u32__struct unionz( + wuffs_base__rect_ii_u32__struct s); +#endif // __cplusplus + } wuffs_base__rect_ii_u32; static inline bool wuffs_base__rect_ii_u32__is_empty( @@ -604,6 +773,32 @@ static inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__rect_ii_u32::is_empty() { + return wuffs_base__rect_ii_u32__is_empty(this); +} + +inline bool wuffs_base__rect_ii_u32::equals(wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__equals(this, s); +} + +inline bool wuffs_base__rect_ii_u32::contains(uint32_t x, uint32_t y) { + return wuffs_base__rect_ii_u32__contains(this, x, y); +} + +inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::intersection( + wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__intersection(this, s); +} + +inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::unionz( + wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__union(this, s); +} + +#endif // __cplusplus + // -------- // wuffs_base__rect_ie_u32 is a rectangle (a 2-dimensional range) on the @@ -616,11 +811,24 @@ static inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union( // fields zero. // // The X and Y axes increase right and down. -typedef struct { +typedef struct wuffs_base__rect_ie_u32__struct { uint32_t min_incl_x; uint32_t min_incl_y; uint32_t max_excl_x; uint32_t max_excl_y; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__rect_ie_u32__struct s); + inline bool contains(uint32_t x, uint32_t y); + inline wuffs_base__rect_ie_u32__struct intersection( + wuffs_base__rect_ie_u32__struct s); + inline wuffs_base__rect_ie_u32__struct unionz( + wuffs_base__rect_ie_u32__struct s); + inline uint32_t width(); + inline uint32_t height(); +#endif // __cplusplus + } wuffs_base__rect_ie_u32; static inline bool wuffs_base__rect_ie_u32__is_empty( @@ -681,6 +889,40 @@ static inline uint32_t wuffs_base__rect_ie_u32__height( return wuffs_base__u32__sat_sub(r->max_excl_y, r->min_incl_y); } +#ifdef __cplusplus + +inline bool wuffs_base__rect_ie_u32::is_empty() { + return wuffs_base__rect_ie_u32__is_empty(this); +} + +inline bool wuffs_base__rect_ie_u32::equals(wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__equals(this, s); +} + +inline bool wuffs_base__rect_ie_u32::contains(uint32_t x, uint32_t y) { + return wuffs_base__rect_ie_u32__contains(this, x, y); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::intersection( + wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__intersection(this, s); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::unionz( + wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__union(this, s); +} + +inline uint32_t wuffs_base__rect_ie_u32::width() { + return wuffs_base__rect_ie_u32__width(this); +} + +inline uint32_t wuffs_base__rect_ie_u32::height() { + return wuffs_base__rect_ie_u32__height(this); +} + +#endif // __cplusplus + // ---------------- I/O struct wuffs_base__io_buffer__struct; @@ -1046,6 +1288,26 @@ typedef struct { uint32_t num_loops; bool first_frame_is_opaque; } private_impl; + +#ifdef __cplusplus + inline void initialize(wuffs_base__pixel_format pixfmt, + wuffs_base__pixel_subsampling pixsub, + uint32_t width, + uint32_t height, + uint32_t num_loops, + bool first_frame_is_opaque); + inline void invalidate(); + inline bool is_valid(); + inline wuffs_base__pixel_format pixel_format(); + inline wuffs_base__pixel_subsampling pixel_subsampling(); + inline wuffs_base__rect_ie_u32 bounds(); + inline uint32_t width(); + inline uint32_t height(); + inline uint32_t num_loops(); + inline uint32_t first_frame_is_opaque(); + inline size_t pixbuf_size(); +#endif // __cplusplus + } wuffs_base__image_config; // TODO: Should this function return bool? An error type? @@ -1143,6 +1405,62 @@ static inline size_t wuffs_base__image_config__pixbuf_size( return 0; } +#ifdef __cplusplus + +inline void wuffs_base__image_config::initialize( + wuffs_base__pixel_format pixfmt, + wuffs_base__pixel_subsampling pixsub, + uint32_t width, + uint32_t height, + uint32_t num_loops, + bool first_frame_is_opaque) { + wuffs_base__image_config__initialize(this, pixfmt, pixsub, width, height, + num_loops, first_frame_is_opaque); +} + +inline void wuffs_base__image_config::invalidate() { + wuffs_base__image_config__invalidate(this); +} + +inline bool wuffs_base__image_config::is_valid() { + return wuffs_base__image_config__is_valid(this); +} + +inline wuffs_base__pixel_format wuffs_base__image_config::pixel_format() { + return wuffs_base__image_config__pixel_format(this); +} + +inline wuffs_base__pixel_subsampling +wuffs_base__image_config::pixel_subsampling() { + return wuffs_base__image_config__pixel_subsampling(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_config::bounds() { + return wuffs_base__image_config__bounds(this); +} + +inline uint32_t wuffs_base__image_config::width() { + return wuffs_base__image_config__width(this); +} + +inline uint32_t wuffs_base__image_config::height() { + return wuffs_base__image_config__height(this); +} + +inline uint32_t wuffs_base__image_config::num_loops() { + return wuffs_base__image_config__num_loops(this); +} + +inline uint32_t wuffs_base__image_config::first_frame_is_opaque() { + return wuffs_base__image_config__first_frame_is_opaque(this); +} + +inline size_t wuffs_base__image_config::pixbuf_size() { + return wuffs_base__image_config__pixbuf_size(this); +} + +#endif // __cplusplus + // -------- // wuffs_base__animation_disposal encodes, for an animated image, how to @@ -1178,6 +1496,30 @@ typedef struct { bool palette_changed; uint8_t palette[1024]; } private_impl; + +#ifdef __cplusplus + inline wuffs_base__status set_from_pixbuf(wuffs_base__image_config config, + wuffs_base__pixel_buffer pixbuf); + inline wuffs_base__status set_from_slice(wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory); + inline void update(wuffs_base__rect_ie_u32 dirty_rect, + wuffs_base__flicks duration, + bool blend, + wuffs_base__animation_disposal disposal, + wuffs_base__slice_u8 palette); + inline wuffs_base__image_config* image_config(); + inline wuffs_base__rect_ie_u32 bounds(); + inline uint32_t width(); + inline uint32_t height(); + inline wuffs_base__rect_ie_u32 dirty_rect(); + inline wuffs_base__flicks duration(); + inline bool blend(); + inline wuffs_base__animation_disposal disposal(); + inline bool palette_changed(); + inline wuffs_base__slice_u8 palette(); + inline wuffs_base__table_u8 plane(uint32_t p); +#endif // __cplusplus + } wuffs_base__image_buffer; static inline wuffs_base__status wuffs_base__image_buffer__set_from_pixbuf( @@ -1322,6 +1664,76 @@ static inline wuffs_base__table_u8 wuffs_base__image_buffer__plane( : ((wuffs_base__table_u8){}); } +#ifdef __cplusplus + +inline wuffs_base__status wuffs_base__image_buffer::set_from_pixbuf( + wuffs_base__image_config config, + wuffs_base__pixel_buffer pixbuf) { + return wuffs_base__image_buffer__set_from_pixbuf(this, config, pixbuf); +} + +inline wuffs_base__status wuffs_base__image_buffer::set_from_slice( + wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory) { + return wuffs_base__image_buffer__set_from_slice(this, config, pixbuf_memory); +} + +inline void wuffs_base__image_buffer::update( + wuffs_base__rect_ie_u32 dirty_rect, + wuffs_base__flicks duration, + bool blend, + wuffs_base__animation_disposal disposal, + wuffs_base__slice_u8 palette) { + wuffs_base__image_buffer__update(this, dirty_rect, duration, blend, disposal, + palette); +} + +inline wuffs_base__image_config* wuffs_base__image_buffer::image_config() { + return wuffs_base__image_buffer__image_config(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::bounds() { + return wuffs_base__image_buffer__bounds(this); +} + +inline uint32_t wuffs_base__image_buffer::width() { + return wuffs_base__image_buffer__width(this); +} + +inline uint32_t wuffs_base__image_buffer::height() { + return wuffs_base__image_buffer__height(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::dirty_rect() { + return wuffs_base__image_buffer__dirty_rect(this); +} + +inline wuffs_base__flicks wuffs_base__image_buffer::duration() { + return wuffs_base__image_buffer__duration(this); +} + +inline bool wuffs_base__image_buffer::blend() { + return wuffs_base__image_buffer__blend(this); +} + +inline wuffs_base__animation_disposal wuffs_base__image_buffer::disposal() { + return wuffs_base__image_buffer__disposal(this); +} + +inline bool wuffs_base__image_buffer::palette_changed() { + return wuffs_base__image_buffer__palette_changed(this); +} + +inline wuffs_base__slice_u8 wuffs_base__image_buffer::palette() { + return wuffs_base__image_buffer__palette(this); +} + +inline wuffs_base__table_u8 wuffs_base__image_buffer::plane(uint32_t p) { + return wuffs_base__image_buffer__plane(this, p); +} + +#endif // __cplusplus + #ifdef __cplusplus } // extern "C" #endif diff --git a/gen/h/std/gif.h b/gen/h/std/gif.h index 1227ce72..a9dcb250 100644 --- a/gen/h/std/gif.h +++ b/gen/h/std/gif.h @@ -330,9 +330,20 @@ typedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64; // in which case the range is empty. There are multiple representations of an // empty range. -typedef struct { +typedef struct wuffs_base__range_ii_u32__struct { uint32_t min_incl; uint32_t max_incl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ii_u32__struct s); + inline bool contains(uint32_t x); + inline wuffs_base__range_ii_u32__struct intersection( + wuffs_base__range_ii_u32__struct s); + inline wuffs_base__range_ii_u32__struct unionz( + wuffs_base__range_ii_u32__struct s); +#endif // __cplusplus + } wuffs_base__range_ii_u32; static inline bool wuffs_base__range_ii_u32__is_empty( @@ -378,11 +389,49 @@ static inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__range_ii_u32::is_empty() { + return wuffs_base__range_ii_u32__is_empty(this); +} + +inline bool wuffs_base__range_ii_u32::equals(wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__equals(this, s); +} + +inline bool wuffs_base__range_ii_u32::contains(uint32_t x) { + return wuffs_base__range_ii_u32__contains(this, x); +} + +inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::intersection( + wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__intersection(this, s); +} + +inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::unionz( + wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__union(this, s); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ie_u32__struct { uint32_t min_incl; uint32_t max_excl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ie_u32__struct s); + inline bool contains(uint32_t x); + inline wuffs_base__range_ie_u32__struct intersection( + wuffs_base__range_ie_u32__struct s); + inline wuffs_base__range_ie_u32__struct unionz( + wuffs_base__range_ie_u32__struct s); + inline uint32_t length(); +#endif // __cplusplus + } wuffs_base__range_ie_u32; static inline bool wuffs_base__range_ie_u32__is_empty( @@ -433,11 +482,52 @@ static inline uint32_t wuffs_base__range_ie_u32__length( return wuffs_base__u32__sat_sub(r->max_excl, r->min_incl); } +#ifdef __cplusplus + +inline bool wuffs_base__range_ie_u32::is_empty() { + return wuffs_base__range_ie_u32__is_empty(this); +} + +inline bool wuffs_base__range_ie_u32::equals(wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__equals(this, s); +} + +inline bool wuffs_base__range_ie_u32::contains(uint32_t x) { + return wuffs_base__range_ie_u32__contains(this, x); +} + +inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::intersection( + wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__intersection(this, s); +} + +inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::unionz( + wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__union(this, s); +} + +inline uint32_t wuffs_base__range_ie_u32::length() { + return wuffs_base__range_ie_u32__length(this); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ii_u64__struct { uint64_t min_incl; uint64_t max_incl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ii_u64__struct s); + inline bool contains(uint64_t x); + inline wuffs_base__range_ii_u64__struct intersection( + wuffs_base__range_ii_u64__struct s); + inline wuffs_base__range_ii_u64__struct unionz( + wuffs_base__range_ii_u64__struct s); +#endif // __cplusplus + } wuffs_base__range_ii_u64; static inline bool wuffs_base__range_ii_u64__is_empty( @@ -483,11 +573,49 @@ static inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__range_ii_u64::is_empty() { + return wuffs_base__range_ii_u64__is_empty(this); +} + +inline bool wuffs_base__range_ii_u64::equals(wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__equals(this, s); +} + +inline bool wuffs_base__range_ii_u64::contains(uint64_t x) { + return wuffs_base__range_ii_u64__contains(this, x); +} + +inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::intersection( + wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__intersection(this, s); +} + +inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::unionz( + wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__union(this, s); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ie_u64__struct { uint64_t min_incl; uint64_t max_excl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ie_u64__struct s); + inline bool contains(uint64_t x); + inline wuffs_base__range_ie_u64__struct intersection( + wuffs_base__range_ie_u64__struct s); + inline wuffs_base__range_ie_u64__struct unionz( + wuffs_base__range_ie_u64__struct s); + inline uint64_t length(); +#endif // __cplusplus + } wuffs_base__range_ie_u64; static inline bool wuffs_base__range_ie_u64__is_empty( @@ -538,6 +666,36 @@ static inline uint64_t wuffs_base__range_ie_u64__length( return wuffs_base__u64__sat_sub(r->max_excl, r->min_incl); } +#ifdef __cplusplus + +inline bool wuffs_base__range_ie_u64::is_empty() { + return wuffs_base__range_ie_u64__is_empty(this); +} + +inline bool wuffs_base__range_ie_u64::equals(wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__equals(this, s); +} + +inline bool wuffs_base__range_ie_u64::contains(uint64_t x) { + return wuffs_base__range_ie_u64__contains(this, x); +} + +inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::intersection( + wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__intersection(this, s); +} + +inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::unionz( + wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__union(this, s); +} + +inline uint64_t wuffs_base__range_ie_u64::length() { + return wuffs_base__range_ie_u64__length(this); +} + +#endif // __cplusplus + // -------- // wuffs_base__rect_ii_u32 is a rectangle (a 2-dimensional range) on the @@ -549,11 +707,22 @@ static inline uint64_t wuffs_base__range_ie_u64__length( // multiple representations of an empty rectangle. // // The X and Y axes increase right and down. -typedef struct { +typedef struct wuffs_base__rect_ii_u32__struct { uint32_t min_incl_x; uint32_t min_incl_y; uint32_t max_incl_x; uint32_t max_incl_y; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__rect_ii_u32__struct s); + inline bool contains(uint32_t x, uint32_t y); + inline wuffs_base__rect_ii_u32__struct intersection( + wuffs_base__rect_ii_u32__struct s); + inline wuffs_base__rect_ii_u32__struct unionz( + wuffs_base__rect_ii_u32__struct s); +#endif // __cplusplus + } wuffs_base__rect_ii_u32; static inline bool wuffs_base__rect_ii_u32__is_empty( @@ -604,6 +773,32 @@ static inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__rect_ii_u32::is_empty() { + return wuffs_base__rect_ii_u32__is_empty(this); +} + +inline bool wuffs_base__rect_ii_u32::equals(wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__equals(this, s); +} + +inline bool wuffs_base__rect_ii_u32::contains(uint32_t x, uint32_t y) { + return wuffs_base__rect_ii_u32__contains(this, x, y); +} + +inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::intersection( + wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__intersection(this, s); +} + +inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::unionz( + wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__union(this, s); +} + +#endif // __cplusplus + // -------- // wuffs_base__rect_ie_u32 is a rectangle (a 2-dimensional range) on the @@ -616,11 +811,24 @@ static inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union( // fields zero. // // The X and Y axes increase right and down. -typedef struct { +typedef struct wuffs_base__rect_ie_u32__struct { uint32_t min_incl_x; uint32_t min_incl_y; uint32_t max_excl_x; uint32_t max_excl_y; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__rect_ie_u32__struct s); + inline bool contains(uint32_t x, uint32_t y); + inline wuffs_base__rect_ie_u32__struct intersection( + wuffs_base__rect_ie_u32__struct s); + inline wuffs_base__rect_ie_u32__struct unionz( + wuffs_base__rect_ie_u32__struct s); + inline uint32_t width(); + inline uint32_t height(); +#endif // __cplusplus + } wuffs_base__rect_ie_u32; static inline bool wuffs_base__rect_ie_u32__is_empty( @@ -681,6 +889,40 @@ static inline uint32_t wuffs_base__rect_ie_u32__height( return wuffs_base__u32__sat_sub(r->max_excl_y, r->min_incl_y); } +#ifdef __cplusplus + +inline bool wuffs_base__rect_ie_u32::is_empty() { + return wuffs_base__rect_ie_u32__is_empty(this); +} + +inline bool wuffs_base__rect_ie_u32::equals(wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__equals(this, s); +} + +inline bool wuffs_base__rect_ie_u32::contains(uint32_t x, uint32_t y) { + return wuffs_base__rect_ie_u32__contains(this, x, y); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::intersection( + wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__intersection(this, s); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::unionz( + wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__union(this, s); +} + +inline uint32_t wuffs_base__rect_ie_u32::width() { + return wuffs_base__rect_ie_u32__width(this); +} + +inline uint32_t wuffs_base__rect_ie_u32::height() { + return wuffs_base__rect_ie_u32__height(this); +} + +#endif // __cplusplus + // ---------------- I/O struct wuffs_base__io_buffer__struct; @@ -1046,6 +1288,26 @@ typedef struct { uint32_t num_loops; bool first_frame_is_opaque; } private_impl; + +#ifdef __cplusplus + inline void initialize(wuffs_base__pixel_format pixfmt, + wuffs_base__pixel_subsampling pixsub, + uint32_t width, + uint32_t height, + uint32_t num_loops, + bool first_frame_is_opaque); + inline void invalidate(); + inline bool is_valid(); + inline wuffs_base__pixel_format pixel_format(); + inline wuffs_base__pixel_subsampling pixel_subsampling(); + inline wuffs_base__rect_ie_u32 bounds(); + inline uint32_t width(); + inline uint32_t height(); + inline uint32_t num_loops(); + inline uint32_t first_frame_is_opaque(); + inline size_t pixbuf_size(); +#endif // __cplusplus + } wuffs_base__image_config; // TODO: Should this function return bool? An error type? @@ -1143,6 +1405,62 @@ static inline size_t wuffs_base__image_config__pixbuf_size( return 0; } +#ifdef __cplusplus + +inline void wuffs_base__image_config::initialize( + wuffs_base__pixel_format pixfmt, + wuffs_base__pixel_subsampling pixsub, + uint32_t width, + uint32_t height, + uint32_t num_loops, + bool first_frame_is_opaque) { + wuffs_base__image_config__initialize(this, pixfmt, pixsub, width, height, + num_loops, first_frame_is_opaque); +} + +inline void wuffs_base__image_config::invalidate() { + wuffs_base__image_config__invalidate(this); +} + +inline bool wuffs_base__image_config::is_valid() { + return wuffs_base__image_config__is_valid(this); +} + +inline wuffs_base__pixel_format wuffs_base__image_config::pixel_format() { + return wuffs_base__image_config__pixel_format(this); +} + +inline wuffs_base__pixel_subsampling +wuffs_base__image_config::pixel_subsampling() { + return wuffs_base__image_config__pixel_subsampling(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_config::bounds() { + return wuffs_base__image_config__bounds(this); +} + +inline uint32_t wuffs_base__image_config::width() { + return wuffs_base__image_config__width(this); +} + +inline uint32_t wuffs_base__image_config::height() { + return wuffs_base__image_config__height(this); +} + +inline uint32_t wuffs_base__image_config::num_loops() { + return wuffs_base__image_config__num_loops(this); +} + +inline uint32_t wuffs_base__image_config::first_frame_is_opaque() { + return wuffs_base__image_config__first_frame_is_opaque(this); +} + +inline size_t wuffs_base__image_config::pixbuf_size() { + return wuffs_base__image_config__pixbuf_size(this); +} + +#endif // __cplusplus + // -------- // wuffs_base__animation_disposal encodes, for an animated image, how to @@ -1178,6 +1496,30 @@ typedef struct { bool palette_changed; uint8_t palette[1024]; } private_impl; + +#ifdef __cplusplus + inline wuffs_base__status set_from_pixbuf(wuffs_base__image_config config, + wuffs_base__pixel_buffer pixbuf); + inline wuffs_base__status set_from_slice(wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory); + inline void update(wuffs_base__rect_ie_u32 dirty_rect, + wuffs_base__flicks duration, + bool blend, + wuffs_base__animation_disposal disposal, + wuffs_base__slice_u8 palette); + inline wuffs_base__image_config* image_config(); + inline wuffs_base__rect_ie_u32 bounds(); + inline uint32_t width(); + inline uint32_t height(); + inline wuffs_base__rect_ie_u32 dirty_rect(); + inline wuffs_base__flicks duration(); + inline bool blend(); + inline wuffs_base__animation_disposal disposal(); + inline bool palette_changed(); + inline wuffs_base__slice_u8 palette(); + inline wuffs_base__table_u8 plane(uint32_t p); +#endif // __cplusplus + } wuffs_base__image_buffer; static inline wuffs_base__status wuffs_base__image_buffer__set_from_pixbuf( @@ -1322,6 +1664,76 @@ static inline wuffs_base__table_u8 wuffs_base__image_buffer__plane( : ((wuffs_base__table_u8){}); } +#ifdef __cplusplus + +inline wuffs_base__status wuffs_base__image_buffer::set_from_pixbuf( + wuffs_base__image_config config, + wuffs_base__pixel_buffer pixbuf) { + return wuffs_base__image_buffer__set_from_pixbuf(this, config, pixbuf); +} + +inline wuffs_base__status wuffs_base__image_buffer::set_from_slice( + wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory) { + return wuffs_base__image_buffer__set_from_slice(this, config, pixbuf_memory); +} + +inline void wuffs_base__image_buffer::update( + wuffs_base__rect_ie_u32 dirty_rect, + wuffs_base__flicks duration, + bool blend, + wuffs_base__animation_disposal disposal, + wuffs_base__slice_u8 palette) { + wuffs_base__image_buffer__update(this, dirty_rect, duration, blend, disposal, + palette); +} + +inline wuffs_base__image_config* wuffs_base__image_buffer::image_config() { + return wuffs_base__image_buffer__image_config(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::bounds() { + return wuffs_base__image_buffer__bounds(this); +} + +inline uint32_t wuffs_base__image_buffer::width() { + return wuffs_base__image_buffer__width(this); +} + +inline uint32_t wuffs_base__image_buffer::height() { + return wuffs_base__image_buffer__height(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::dirty_rect() { + return wuffs_base__image_buffer__dirty_rect(this); +} + +inline wuffs_base__flicks wuffs_base__image_buffer::duration() { + return wuffs_base__image_buffer__duration(this); +} + +inline bool wuffs_base__image_buffer::blend() { + return wuffs_base__image_buffer__blend(this); +} + +inline wuffs_base__animation_disposal wuffs_base__image_buffer::disposal() { + return wuffs_base__image_buffer__disposal(this); +} + +inline bool wuffs_base__image_buffer::palette_changed() { + return wuffs_base__image_buffer__palette_changed(this); +} + +inline wuffs_base__slice_u8 wuffs_base__image_buffer::palette() { + return wuffs_base__image_buffer__palette(this); +} + +inline wuffs_base__table_u8 wuffs_base__image_buffer::plane(uint32_t p) { + return wuffs_base__image_buffer__plane(this, p); +} + +#endif // __cplusplus + #ifdef __cplusplus } // extern "C" #endif diff --git a/gen/h/std/gzip.h b/gen/h/std/gzip.h index 3960d758..f38885e3 100644 --- a/gen/h/std/gzip.h +++ b/gen/h/std/gzip.h @@ -330,9 +330,20 @@ typedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64; // in which case the range is empty. There are multiple representations of an // empty range. -typedef struct { +typedef struct wuffs_base__range_ii_u32__struct { uint32_t min_incl; uint32_t max_incl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ii_u32__struct s); + inline bool contains(uint32_t x); + inline wuffs_base__range_ii_u32__struct intersection( + wuffs_base__range_ii_u32__struct s); + inline wuffs_base__range_ii_u32__struct unionz( + wuffs_base__range_ii_u32__struct s); +#endif // __cplusplus + } wuffs_base__range_ii_u32; static inline bool wuffs_base__range_ii_u32__is_empty( @@ -378,11 +389,49 @@ static inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__range_ii_u32::is_empty() { + return wuffs_base__range_ii_u32__is_empty(this); +} + +inline bool wuffs_base__range_ii_u32::equals(wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__equals(this, s); +} + +inline bool wuffs_base__range_ii_u32::contains(uint32_t x) { + return wuffs_base__range_ii_u32__contains(this, x); +} + +inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::intersection( + wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__intersection(this, s); +} + +inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::unionz( + wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__union(this, s); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ie_u32__struct { uint32_t min_incl; uint32_t max_excl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ie_u32__struct s); + inline bool contains(uint32_t x); + inline wuffs_base__range_ie_u32__struct intersection( + wuffs_base__range_ie_u32__struct s); + inline wuffs_base__range_ie_u32__struct unionz( + wuffs_base__range_ie_u32__struct s); + inline uint32_t length(); +#endif // __cplusplus + } wuffs_base__range_ie_u32; static inline bool wuffs_base__range_ie_u32__is_empty( @@ -433,11 +482,52 @@ static inline uint32_t wuffs_base__range_ie_u32__length( return wuffs_base__u32__sat_sub(r->max_excl, r->min_incl); } +#ifdef __cplusplus + +inline bool wuffs_base__range_ie_u32::is_empty() { + return wuffs_base__range_ie_u32__is_empty(this); +} + +inline bool wuffs_base__range_ie_u32::equals(wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__equals(this, s); +} + +inline bool wuffs_base__range_ie_u32::contains(uint32_t x) { + return wuffs_base__range_ie_u32__contains(this, x); +} + +inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::intersection( + wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__intersection(this, s); +} + +inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::unionz( + wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__union(this, s); +} + +inline uint32_t wuffs_base__range_ie_u32::length() { + return wuffs_base__range_ie_u32__length(this); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ii_u64__struct { uint64_t min_incl; uint64_t max_incl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ii_u64__struct s); + inline bool contains(uint64_t x); + inline wuffs_base__range_ii_u64__struct intersection( + wuffs_base__range_ii_u64__struct s); + inline wuffs_base__range_ii_u64__struct unionz( + wuffs_base__range_ii_u64__struct s); +#endif // __cplusplus + } wuffs_base__range_ii_u64; static inline bool wuffs_base__range_ii_u64__is_empty( @@ -483,11 +573,49 @@ static inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__range_ii_u64::is_empty() { + return wuffs_base__range_ii_u64__is_empty(this); +} + +inline bool wuffs_base__range_ii_u64::equals(wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__equals(this, s); +} + +inline bool wuffs_base__range_ii_u64::contains(uint64_t x) { + return wuffs_base__range_ii_u64__contains(this, x); +} + +inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::intersection( + wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__intersection(this, s); +} + +inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::unionz( + wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__union(this, s); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ie_u64__struct { uint64_t min_incl; uint64_t max_excl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ie_u64__struct s); + inline bool contains(uint64_t x); + inline wuffs_base__range_ie_u64__struct intersection( + wuffs_base__range_ie_u64__struct s); + inline wuffs_base__range_ie_u64__struct unionz( + wuffs_base__range_ie_u64__struct s); + inline uint64_t length(); +#endif // __cplusplus + } wuffs_base__range_ie_u64; static inline bool wuffs_base__range_ie_u64__is_empty( @@ -538,6 +666,36 @@ static inline uint64_t wuffs_base__range_ie_u64__length( return wuffs_base__u64__sat_sub(r->max_excl, r->min_incl); } +#ifdef __cplusplus + +inline bool wuffs_base__range_ie_u64::is_empty() { + return wuffs_base__range_ie_u64__is_empty(this); +} + +inline bool wuffs_base__range_ie_u64::equals(wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__equals(this, s); +} + +inline bool wuffs_base__range_ie_u64::contains(uint64_t x) { + return wuffs_base__range_ie_u64__contains(this, x); +} + +inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::intersection( + wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__intersection(this, s); +} + +inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::unionz( + wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__union(this, s); +} + +inline uint64_t wuffs_base__range_ie_u64::length() { + return wuffs_base__range_ie_u64__length(this); +} + +#endif // __cplusplus + // -------- // wuffs_base__rect_ii_u32 is a rectangle (a 2-dimensional range) on the @@ -549,11 +707,22 @@ static inline uint64_t wuffs_base__range_ie_u64__length( // multiple representations of an empty rectangle. // // The X and Y axes increase right and down. -typedef struct { +typedef struct wuffs_base__rect_ii_u32__struct { uint32_t min_incl_x; uint32_t min_incl_y; uint32_t max_incl_x; uint32_t max_incl_y; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__rect_ii_u32__struct s); + inline bool contains(uint32_t x, uint32_t y); + inline wuffs_base__rect_ii_u32__struct intersection( + wuffs_base__rect_ii_u32__struct s); + inline wuffs_base__rect_ii_u32__struct unionz( + wuffs_base__rect_ii_u32__struct s); +#endif // __cplusplus + } wuffs_base__rect_ii_u32; static inline bool wuffs_base__rect_ii_u32__is_empty( @@ -604,6 +773,32 @@ static inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__rect_ii_u32::is_empty() { + return wuffs_base__rect_ii_u32__is_empty(this); +} + +inline bool wuffs_base__rect_ii_u32::equals(wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__equals(this, s); +} + +inline bool wuffs_base__rect_ii_u32::contains(uint32_t x, uint32_t y) { + return wuffs_base__rect_ii_u32__contains(this, x, y); +} + +inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::intersection( + wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__intersection(this, s); +} + +inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::unionz( + wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__union(this, s); +} + +#endif // __cplusplus + // -------- // wuffs_base__rect_ie_u32 is a rectangle (a 2-dimensional range) on the @@ -616,11 +811,24 @@ static inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union( // fields zero. // // The X and Y axes increase right and down. -typedef struct { +typedef struct wuffs_base__rect_ie_u32__struct { uint32_t min_incl_x; uint32_t min_incl_y; uint32_t max_excl_x; uint32_t max_excl_y; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__rect_ie_u32__struct s); + inline bool contains(uint32_t x, uint32_t y); + inline wuffs_base__rect_ie_u32__struct intersection( + wuffs_base__rect_ie_u32__struct s); + inline wuffs_base__rect_ie_u32__struct unionz( + wuffs_base__rect_ie_u32__struct s); + inline uint32_t width(); + inline uint32_t height(); +#endif // __cplusplus + } wuffs_base__rect_ie_u32; static inline bool wuffs_base__rect_ie_u32__is_empty( @@ -681,6 +889,40 @@ static inline uint32_t wuffs_base__rect_ie_u32__height( return wuffs_base__u32__sat_sub(r->max_excl_y, r->min_incl_y); } +#ifdef __cplusplus + +inline bool wuffs_base__rect_ie_u32::is_empty() { + return wuffs_base__rect_ie_u32__is_empty(this); +} + +inline bool wuffs_base__rect_ie_u32::equals(wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__equals(this, s); +} + +inline bool wuffs_base__rect_ie_u32::contains(uint32_t x, uint32_t y) { + return wuffs_base__rect_ie_u32__contains(this, x, y); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::intersection( + wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__intersection(this, s); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::unionz( + wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__union(this, s); +} + +inline uint32_t wuffs_base__rect_ie_u32::width() { + return wuffs_base__rect_ie_u32__width(this); +} + +inline uint32_t wuffs_base__rect_ie_u32::height() { + return wuffs_base__rect_ie_u32__height(this); +} + +#endif // __cplusplus + // ---------------- I/O struct wuffs_base__io_buffer__struct; @@ -1046,6 +1288,26 @@ typedef struct { uint32_t num_loops; bool first_frame_is_opaque; } private_impl; + +#ifdef __cplusplus + inline void initialize(wuffs_base__pixel_format pixfmt, + wuffs_base__pixel_subsampling pixsub, + uint32_t width, + uint32_t height, + uint32_t num_loops, + bool first_frame_is_opaque); + inline void invalidate(); + inline bool is_valid(); + inline wuffs_base__pixel_format pixel_format(); + inline wuffs_base__pixel_subsampling pixel_subsampling(); + inline wuffs_base__rect_ie_u32 bounds(); + inline uint32_t width(); + inline uint32_t height(); + inline uint32_t num_loops(); + inline uint32_t first_frame_is_opaque(); + inline size_t pixbuf_size(); +#endif // __cplusplus + } wuffs_base__image_config; // TODO: Should this function return bool? An error type? @@ -1143,6 +1405,62 @@ static inline size_t wuffs_base__image_config__pixbuf_size( return 0; } +#ifdef __cplusplus + +inline void wuffs_base__image_config::initialize( + wuffs_base__pixel_format pixfmt, + wuffs_base__pixel_subsampling pixsub, + uint32_t width, + uint32_t height, + uint32_t num_loops, + bool first_frame_is_opaque) { + wuffs_base__image_config__initialize(this, pixfmt, pixsub, width, height, + num_loops, first_frame_is_opaque); +} + +inline void wuffs_base__image_config::invalidate() { + wuffs_base__image_config__invalidate(this); +} + +inline bool wuffs_base__image_config::is_valid() { + return wuffs_base__image_config__is_valid(this); +} + +inline wuffs_base__pixel_format wuffs_base__image_config::pixel_format() { + return wuffs_base__image_config__pixel_format(this); +} + +inline wuffs_base__pixel_subsampling +wuffs_base__image_config::pixel_subsampling() { + return wuffs_base__image_config__pixel_subsampling(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_config::bounds() { + return wuffs_base__image_config__bounds(this); +} + +inline uint32_t wuffs_base__image_config::width() { + return wuffs_base__image_config__width(this); +} + +inline uint32_t wuffs_base__image_config::height() { + return wuffs_base__image_config__height(this); +} + +inline uint32_t wuffs_base__image_config::num_loops() { + return wuffs_base__image_config__num_loops(this); +} + +inline uint32_t wuffs_base__image_config::first_frame_is_opaque() { + return wuffs_base__image_config__first_frame_is_opaque(this); +} + +inline size_t wuffs_base__image_config::pixbuf_size() { + return wuffs_base__image_config__pixbuf_size(this); +} + +#endif // __cplusplus + // -------- // wuffs_base__animation_disposal encodes, for an animated image, how to @@ -1178,6 +1496,30 @@ typedef struct { bool palette_changed; uint8_t palette[1024]; } private_impl; + +#ifdef __cplusplus + inline wuffs_base__status set_from_pixbuf(wuffs_base__image_config config, + wuffs_base__pixel_buffer pixbuf); + inline wuffs_base__status set_from_slice(wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory); + inline void update(wuffs_base__rect_ie_u32 dirty_rect, + wuffs_base__flicks duration, + bool blend, + wuffs_base__animation_disposal disposal, + wuffs_base__slice_u8 palette); + inline wuffs_base__image_config* image_config(); + inline wuffs_base__rect_ie_u32 bounds(); + inline uint32_t width(); + inline uint32_t height(); + inline wuffs_base__rect_ie_u32 dirty_rect(); + inline wuffs_base__flicks duration(); + inline bool blend(); + inline wuffs_base__animation_disposal disposal(); + inline bool palette_changed(); + inline wuffs_base__slice_u8 palette(); + inline wuffs_base__table_u8 plane(uint32_t p); +#endif // __cplusplus + } wuffs_base__image_buffer; static inline wuffs_base__status wuffs_base__image_buffer__set_from_pixbuf( @@ -1322,6 +1664,76 @@ static inline wuffs_base__table_u8 wuffs_base__image_buffer__plane( : ((wuffs_base__table_u8){}); } +#ifdef __cplusplus + +inline wuffs_base__status wuffs_base__image_buffer::set_from_pixbuf( + wuffs_base__image_config config, + wuffs_base__pixel_buffer pixbuf) { + return wuffs_base__image_buffer__set_from_pixbuf(this, config, pixbuf); +} + +inline wuffs_base__status wuffs_base__image_buffer::set_from_slice( + wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory) { + return wuffs_base__image_buffer__set_from_slice(this, config, pixbuf_memory); +} + +inline void wuffs_base__image_buffer::update( + wuffs_base__rect_ie_u32 dirty_rect, + wuffs_base__flicks duration, + bool blend, + wuffs_base__animation_disposal disposal, + wuffs_base__slice_u8 palette) { + wuffs_base__image_buffer__update(this, dirty_rect, duration, blend, disposal, + palette); +} + +inline wuffs_base__image_config* wuffs_base__image_buffer::image_config() { + return wuffs_base__image_buffer__image_config(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::bounds() { + return wuffs_base__image_buffer__bounds(this); +} + +inline uint32_t wuffs_base__image_buffer::width() { + return wuffs_base__image_buffer__width(this); +} + +inline uint32_t wuffs_base__image_buffer::height() { + return wuffs_base__image_buffer__height(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::dirty_rect() { + return wuffs_base__image_buffer__dirty_rect(this); +} + +inline wuffs_base__flicks wuffs_base__image_buffer::duration() { + return wuffs_base__image_buffer__duration(this); +} + +inline bool wuffs_base__image_buffer::blend() { + return wuffs_base__image_buffer__blend(this); +} + +inline wuffs_base__animation_disposal wuffs_base__image_buffer::disposal() { + return wuffs_base__image_buffer__disposal(this); +} + +inline bool wuffs_base__image_buffer::palette_changed() { + return wuffs_base__image_buffer__palette_changed(this); +} + +inline wuffs_base__slice_u8 wuffs_base__image_buffer::palette() { + return wuffs_base__image_buffer__palette(this); +} + +inline wuffs_base__table_u8 wuffs_base__image_buffer::plane(uint32_t p) { + return wuffs_base__image_buffer__plane(this, p); +} + +#endif // __cplusplus + #ifdef __cplusplus } // extern "C" #endif diff --git a/gen/h/std/lzw.h b/gen/h/std/lzw.h index d6d324b9..36e47549 100644 --- a/gen/h/std/lzw.h +++ b/gen/h/std/lzw.h @@ -330,9 +330,20 @@ typedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64; // in which case the range is empty. There are multiple representations of an // empty range. -typedef struct { +typedef struct wuffs_base__range_ii_u32__struct { uint32_t min_incl; uint32_t max_incl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ii_u32__struct s); + inline bool contains(uint32_t x); + inline wuffs_base__range_ii_u32__struct intersection( + wuffs_base__range_ii_u32__struct s); + inline wuffs_base__range_ii_u32__struct unionz( + wuffs_base__range_ii_u32__struct s); +#endif // __cplusplus + } wuffs_base__range_ii_u32; static inline bool wuffs_base__range_ii_u32__is_empty( @@ -378,11 +389,49 @@ static inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__range_ii_u32::is_empty() { + return wuffs_base__range_ii_u32__is_empty(this); +} + +inline bool wuffs_base__range_ii_u32::equals(wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__equals(this, s); +} + +inline bool wuffs_base__range_ii_u32::contains(uint32_t x) { + return wuffs_base__range_ii_u32__contains(this, x); +} + +inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::intersection( + wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__intersection(this, s); +} + +inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::unionz( + wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__union(this, s); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ie_u32__struct { uint32_t min_incl; uint32_t max_excl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ie_u32__struct s); + inline bool contains(uint32_t x); + inline wuffs_base__range_ie_u32__struct intersection( + wuffs_base__range_ie_u32__struct s); + inline wuffs_base__range_ie_u32__struct unionz( + wuffs_base__range_ie_u32__struct s); + inline uint32_t length(); +#endif // __cplusplus + } wuffs_base__range_ie_u32; static inline bool wuffs_base__range_ie_u32__is_empty( @@ -433,11 +482,52 @@ static inline uint32_t wuffs_base__range_ie_u32__length( return wuffs_base__u32__sat_sub(r->max_excl, r->min_incl); } +#ifdef __cplusplus + +inline bool wuffs_base__range_ie_u32::is_empty() { + return wuffs_base__range_ie_u32__is_empty(this); +} + +inline bool wuffs_base__range_ie_u32::equals(wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__equals(this, s); +} + +inline bool wuffs_base__range_ie_u32::contains(uint32_t x) { + return wuffs_base__range_ie_u32__contains(this, x); +} + +inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::intersection( + wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__intersection(this, s); +} + +inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::unionz( + wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__union(this, s); +} + +inline uint32_t wuffs_base__range_ie_u32::length() { + return wuffs_base__range_ie_u32__length(this); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ii_u64__struct { uint64_t min_incl; uint64_t max_incl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ii_u64__struct s); + inline bool contains(uint64_t x); + inline wuffs_base__range_ii_u64__struct intersection( + wuffs_base__range_ii_u64__struct s); + inline wuffs_base__range_ii_u64__struct unionz( + wuffs_base__range_ii_u64__struct s); +#endif // __cplusplus + } wuffs_base__range_ii_u64; static inline bool wuffs_base__range_ii_u64__is_empty( @@ -483,11 +573,49 @@ static inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__range_ii_u64::is_empty() { + return wuffs_base__range_ii_u64__is_empty(this); +} + +inline bool wuffs_base__range_ii_u64::equals(wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__equals(this, s); +} + +inline bool wuffs_base__range_ii_u64::contains(uint64_t x) { + return wuffs_base__range_ii_u64__contains(this, x); +} + +inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::intersection( + wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__intersection(this, s); +} + +inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::unionz( + wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__union(this, s); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ie_u64__struct { uint64_t min_incl; uint64_t max_excl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ie_u64__struct s); + inline bool contains(uint64_t x); + inline wuffs_base__range_ie_u64__struct intersection( + wuffs_base__range_ie_u64__struct s); + inline wuffs_base__range_ie_u64__struct unionz( + wuffs_base__range_ie_u64__struct s); + inline uint64_t length(); +#endif // __cplusplus + } wuffs_base__range_ie_u64; static inline bool wuffs_base__range_ie_u64__is_empty( @@ -538,6 +666,36 @@ static inline uint64_t wuffs_base__range_ie_u64__length( return wuffs_base__u64__sat_sub(r->max_excl, r->min_incl); } +#ifdef __cplusplus + +inline bool wuffs_base__range_ie_u64::is_empty() { + return wuffs_base__range_ie_u64__is_empty(this); +} + +inline bool wuffs_base__range_ie_u64::equals(wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__equals(this, s); +} + +inline bool wuffs_base__range_ie_u64::contains(uint64_t x) { + return wuffs_base__range_ie_u64__contains(this, x); +} + +inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::intersection( + wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__intersection(this, s); +} + +inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::unionz( + wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__union(this, s); +} + +inline uint64_t wuffs_base__range_ie_u64::length() { + return wuffs_base__range_ie_u64__length(this); +} + +#endif // __cplusplus + // -------- // wuffs_base__rect_ii_u32 is a rectangle (a 2-dimensional range) on the @@ -549,11 +707,22 @@ static inline uint64_t wuffs_base__range_ie_u64__length( // multiple representations of an empty rectangle. // // The X and Y axes increase right and down. -typedef struct { +typedef struct wuffs_base__rect_ii_u32__struct { uint32_t min_incl_x; uint32_t min_incl_y; uint32_t max_incl_x; uint32_t max_incl_y; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__rect_ii_u32__struct s); + inline bool contains(uint32_t x, uint32_t y); + inline wuffs_base__rect_ii_u32__struct intersection( + wuffs_base__rect_ii_u32__struct s); + inline wuffs_base__rect_ii_u32__struct unionz( + wuffs_base__rect_ii_u32__struct s); +#endif // __cplusplus + } wuffs_base__rect_ii_u32; static inline bool wuffs_base__rect_ii_u32__is_empty( @@ -604,6 +773,32 @@ static inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__rect_ii_u32::is_empty() { + return wuffs_base__rect_ii_u32__is_empty(this); +} + +inline bool wuffs_base__rect_ii_u32::equals(wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__equals(this, s); +} + +inline bool wuffs_base__rect_ii_u32::contains(uint32_t x, uint32_t y) { + return wuffs_base__rect_ii_u32__contains(this, x, y); +} + +inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::intersection( + wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__intersection(this, s); +} + +inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::unionz( + wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__union(this, s); +} + +#endif // __cplusplus + // -------- // wuffs_base__rect_ie_u32 is a rectangle (a 2-dimensional range) on the @@ -616,11 +811,24 @@ static inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union( // fields zero. // // The X and Y axes increase right and down. -typedef struct { +typedef struct wuffs_base__rect_ie_u32__struct { uint32_t min_incl_x; uint32_t min_incl_y; uint32_t max_excl_x; uint32_t max_excl_y; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__rect_ie_u32__struct s); + inline bool contains(uint32_t x, uint32_t y); + inline wuffs_base__rect_ie_u32__struct intersection( + wuffs_base__rect_ie_u32__struct s); + inline wuffs_base__rect_ie_u32__struct unionz( + wuffs_base__rect_ie_u32__struct s); + inline uint32_t width(); + inline uint32_t height(); +#endif // __cplusplus + } wuffs_base__rect_ie_u32; static inline bool wuffs_base__rect_ie_u32__is_empty( @@ -681,6 +889,40 @@ static inline uint32_t wuffs_base__rect_ie_u32__height( return wuffs_base__u32__sat_sub(r->max_excl_y, r->min_incl_y); } +#ifdef __cplusplus + +inline bool wuffs_base__rect_ie_u32::is_empty() { + return wuffs_base__rect_ie_u32__is_empty(this); +} + +inline bool wuffs_base__rect_ie_u32::equals(wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__equals(this, s); +} + +inline bool wuffs_base__rect_ie_u32::contains(uint32_t x, uint32_t y) { + return wuffs_base__rect_ie_u32__contains(this, x, y); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::intersection( + wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__intersection(this, s); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::unionz( + wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__union(this, s); +} + +inline uint32_t wuffs_base__rect_ie_u32::width() { + return wuffs_base__rect_ie_u32__width(this); +} + +inline uint32_t wuffs_base__rect_ie_u32::height() { + return wuffs_base__rect_ie_u32__height(this); +} + +#endif // __cplusplus + // ---------------- I/O struct wuffs_base__io_buffer__struct; @@ -1046,6 +1288,26 @@ typedef struct { uint32_t num_loops; bool first_frame_is_opaque; } private_impl; + +#ifdef __cplusplus + inline void initialize(wuffs_base__pixel_format pixfmt, + wuffs_base__pixel_subsampling pixsub, + uint32_t width, + uint32_t height, + uint32_t num_loops, + bool first_frame_is_opaque); + inline void invalidate(); + inline bool is_valid(); + inline wuffs_base__pixel_format pixel_format(); + inline wuffs_base__pixel_subsampling pixel_subsampling(); + inline wuffs_base__rect_ie_u32 bounds(); + inline uint32_t width(); + inline uint32_t height(); + inline uint32_t num_loops(); + inline uint32_t first_frame_is_opaque(); + inline size_t pixbuf_size(); +#endif // __cplusplus + } wuffs_base__image_config; // TODO: Should this function return bool? An error type? @@ -1143,6 +1405,62 @@ static inline size_t wuffs_base__image_config__pixbuf_size( return 0; } +#ifdef __cplusplus + +inline void wuffs_base__image_config::initialize( + wuffs_base__pixel_format pixfmt, + wuffs_base__pixel_subsampling pixsub, + uint32_t width, + uint32_t height, + uint32_t num_loops, + bool first_frame_is_opaque) { + wuffs_base__image_config__initialize(this, pixfmt, pixsub, width, height, + num_loops, first_frame_is_opaque); +} + +inline void wuffs_base__image_config::invalidate() { + wuffs_base__image_config__invalidate(this); +} + +inline bool wuffs_base__image_config::is_valid() { + return wuffs_base__image_config__is_valid(this); +} + +inline wuffs_base__pixel_format wuffs_base__image_config::pixel_format() { + return wuffs_base__image_config__pixel_format(this); +} + +inline wuffs_base__pixel_subsampling +wuffs_base__image_config::pixel_subsampling() { + return wuffs_base__image_config__pixel_subsampling(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_config::bounds() { + return wuffs_base__image_config__bounds(this); +} + +inline uint32_t wuffs_base__image_config::width() { + return wuffs_base__image_config__width(this); +} + +inline uint32_t wuffs_base__image_config::height() { + return wuffs_base__image_config__height(this); +} + +inline uint32_t wuffs_base__image_config::num_loops() { + return wuffs_base__image_config__num_loops(this); +} + +inline uint32_t wuffs_base__image_config::first_frame_is_opaque() { + return wuffs_base__image_config__first_frame_is_opaque(this); +} + +inline size_t wuffs_base__image_config::pixbuf_size() { + return wuffs_base__image_config__pixbuf_size(this); +} + +#endif // __cplusplus + // -------- // wuffs_base__animation_disposal encodes, for an animated image, how to @@ -1178,6 +1496,30 @@ typedef struct { bool palette_changed; uint8_t palette[1024]; } private_impl; + +#ifdef __cplusplus + inline wuffs_base__status set_from_pixbuf(wuffs_base__image_config config, + wuffs_base__pixel_buffer pixbuf); + inline wuffs_base__status set_from_slice(wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory); + inline void update(wuffs_base__rect_ie_u32 dirty_rect, + wuffs_base__flicks duration, + bool blend, + wuffs_base__animation_disposal disposal, + wuffs_base__slice_u8 palette); + inline wuffs_base__image_config* image_config(); + inline wuffs_base__rect_ie_u32 bounds(); + inline uint32_t width(); + inline uint32_t height(); + inline wuffs_base__rect_ie_u32 dirty_rect(); + inline wuffs_base__flicks duration(); + inline bool blend(); + inline wuffs_base__animation_disposal disposal(); + inline bool palette_changed(); + inline wuffs_base__slice_u8 palette(); + inline wuffs_base__table_u8 plane(uint32_t p); +#endif // __cplusplus + } wuffs_base__image_buffer; static inline wuffs_base__status wuffs_base__image_buffer__set_from_pixbuf( @@ -1322,6 +1664,76 @@ static inline wuffs_base__table_u8 wuffs_base__image_buffer__plane( : ((wuffs_base__table_u8){}); } +#ifdef __cplusplus + +inline wuffs_base__status wuffs_base__image_buffer::set_from_pixbuf( + wuffs_base__image_config config, + wuffs_base__pixel_buffer pixbuf) { + return wuffs_base__image_buffer__set_from_pixbuf(this, config, pixbuf); +} + +inline wuffs_base__status wuffs_base__image_buffer::set_from_slice( + wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory) { + return wuffs_base__image_buffer__set_from_slice(this, config, pixbuf_memory); +} + +inline void wuffs_base__image_buffer::update( + wuffs_base__rect_ie_u32 dirty_rect, + wuffs_base__flicks duration, + bool blend, + wuffs_base__animation_disposal disposal, + wuffs_base__slice_u8 palette) { + wuffs_base__image_buffer__update(this, dirty_rect, duration, blend, disposal, + palette); +} + +inline wuffs_base__image_config* wuffs_base__image_buffer::image_config() { + return wuffs_base__image_buffer__image_config(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::bounds() { + return wuffs_base__image_buffer__bounds(this); +} + +inline uint32_t wuffs_base__image_buffer::width() { + return wuffs_base__image_buffer__width(this); +} + +inline uint32_t wuffs_base__image_buffer::height() { + return wuffs_base__image_buffer__height(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::dirty_rect() { + return wuffs_base__image_buffer__dirty_rect(this); +} + +inline wuffs_base__flicks wuffs_base__image_buffer::duration() { + return wuffs_base__image_buffer__duration(this); +} + +inline bool wuffs_base__image_buffer::blend() { + return wuffs_base__image_buffer__blend(this); +} + +inline wuffs_base__animation_disposal wuffs_base__image_buffer::disposal() { + return wuffs_base__image_buffer__disposal(this); +} + +inline bool wuffs_base__image_buffer::palette_changed() { + return wuffs_base__image_buffer__palette_changed(this); +} + +inline wuffs_base__slice_u8 wuffs_base__image_buffer::palette() { + return wuffs_base__image_buffer__palette(this); +} + +inline wuffs_base__table_u8 wuffs_base__image_buffer::plane(uint32_t p) { + return wuffs_base__image_buffer__plane(this, p); +} + +#endif // __cplusplus + #ifdef __cplusplus } // extern "C" #endif diff --git a/gen/h/std/zlib.h b/gen/h/std/zlib.h index 076200aa..f7019657 100644 --- a/gen/h/std/zlib.h +++ b/gen/h/std/zlib.h @@ -330,9 +330,20 @@ typedef WUFFS_BASE__TABLE(uint64_t) wuffs_base__table_u64; // in which case the range is empty. There are multiple representations of an // empty range. -typedef struct { +typedef struct wuffs_base__range_ii_u32__struct { uint32_t min_incl; uint32_t max_incl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ii_u32__struct s); + inline bool contains(uint32_t x); + inline wuffs_base__range_ii_u32__struct intersection( + wuffs_base__range_ii_u32__struct s); + inline wuffs_base__range_ii_u32__struct unionz( + wuffs_base__range_ii_u32__struct s); +#endif // __cplusplus + } wuffs_base__range_ii_u32; static inline bool wuffs_base__range_ii_u32__is_empty( @@ -378,11 +389,49 @@ static inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__range_ii_u32::is_empty() { + return wuffs_base__range_ii_u32__is_empty(this); +} + +inline bool wuffs_base__range_ii_u32::equals(wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__equals(this, s); +} + +inline bool wuffs_base__range_ii_u32::contains(uint32_t x) { + return wuffs_base__range_ii_u32__contains(this, x); +} + +inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::intersection( + wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__intersection(this, s); +} + +inline wuffs_base__range_ii_u32 wuffs_base__range_ii_u32::unionz( + wuffs_base__range_ii_u32 s) { + return wuffs_base__range_ii_u32__union(this, s); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ie_u32__struct { uint32_t min_incl; uint32_t max_excl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ie_u32__struct s); + inline bool contains(uint32_t x); + inline wuffs_base__range_ie_u32__struct intersection( + wuffs_base__range_ie_u32__struct s); + inline wuffs_base__range_ie_u32__struct unionz( + wuffs_base__range_ie_u32__struct s); + inline uint32_t length(); +#endif // __cplusplus + } wuffs_base__range_ie_u32; static inline bool wuffs_base__range_ie_u32__is_empty( @@ -433,11 +482,52 @@ static inline uint32_t wuffs_base__range_ie_u32__length( return wuffs_base__u32__sat_sub(r->max_excl, r->min_incl); } +#ifdef __cplusplus + +inline bool wuffs_base__range_ie_u32::is_empty() { + return wuffs_base__range_ie_u32__is_empty(this); +} + +inline bool wuffs_base__range_ie_u32::equals(wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__equals(this, s); +} + +inline bool wuffs_base__range_ie_u32::contains(uint32_t x) { + return wuffs_base__range_ie_u32__contains(this, x); +} + +inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::intersection( + wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__intersection(this, s); +} + +inline wuffs_base__range_ie_u32 wuffs_base__range_ie_u32::unionz( + wuffs_base__range_ie_u32 s) { + return wuffs_base__range_ie_u32__union(this, s); +} + +inline uint32_t wuffs_base__range_ie_u32::length() { + return wuffs_base__range_ie_u32__length(this); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ii_u64__struct { uint64_t min_incl; uint64_t max_incl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ii_u64__struct s); + inline bool contains(uint64_t x); + inline wuffs_base__range_ii_u64__struct intersection( + wuffs_base__range_ii_u64__struct s); + inline wuffs_base__range_ii_u64__struct unionz( + wuffs_base__range_ii_u64__struct s); +#endif // __cplusplus + } wuffs_base__range_ii_u64; static inline bool wuffs_base__range_ii_u64__is_empty( @@ -483,11 +573,49 @@ static inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__range_ii_u64::is_empty() { + return wuffs_base__range_ii_u64__is_empty(this); +} + +inline bool wuffs_base__range_ii_u64::equals(wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__equals(this, s); +} + +inline bool wuffs_base__range_ii_u64::contains(uint64_t x) { + return wuffs_base__range_ii_u64__contains(this, x); +} + +inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::intersection( + wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__intersection(this, s); +} + +inline wuffs_base__range_ii_u64 wuffs_base__range_ii_u64::unionz( + wuffs_base__range_ii_u64 s) { + return wuffs_base__range_ii_u64__union(this, s); +} + +#endif // __cplusplus + // -------- -typedef struct { +typedef struct wuffs_base__range_ie_u64__struct { uint64_t min_incl; uint64_t max_excl; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__range_ie_u64__struct s); + inline bool contains(uint64_t x); + inline wuffs_base__range_ie_u64__struct intersection( + wuffs_base__range_ie_u64__struct s); + inline wuffs_base__range_ie_u64__struct unionz( + wuffs_base__range_ie_u64__struct s); + inline uint64_t length(); +#endif // __cplusplus + } wuffs_base__range_ie_u64; static inline bool wuffs_base__range_ie_u64__is_empty( @@ -538,6 +666,36 @@ static inline uint64_t wuffs_base__range_ie_u64__length( return wuffs_base__u64__sat_sub(r->max_excl, r->min_incl); } +#ifdef __cplusplus + +inline bool wuffs_base__range_ie_u64::is_empty() { + return wuffs_base__range_ie_u64__is_empty(this); +} + +inline bool wuffs_base__range_ie_u64::equals(wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__equals(this, s); +} + +inline bool wuffs_base__range_ie_u64::contains(uint64_t x) { + return wuffs_base__range_ie_u64__contains(this, x); +} + +inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::intersection( + wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__intersection(this, s); +} + +inline wuffs_base__range_ie_u64 wuffs_base__range_ie_u64::unionz( + wuffs_base__range_ie_u64 s) { + return wuffs_base__range_ie_u64__union(this, s); +} + +inline uint64_t wuffs_base__range_ie_u64::length() { + return wuffs_base__range_ie_u64__length(this); +} + +#endif // __cplusplus + // -------- // wuffs_base__rect_ii_u32 is a rectangle (a 2-dimensional range) on the @@ -549,11 +707,22 @@ static inline uint64_t wuffs_base__range_ie_u64__length( // multiple representations of an empty rectangle. // // The X and Y axes increase right and down. -typedef struct { +typedef struct wuffs_base__rect_ii_u32__struct { uint32_t min_incl_x; uint32_t min_incl_y; uint32_t max_incl_x; uint32_t max_incl_y; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__rect_ii_u32__struct s); + inline bool contains(uint32_t x, uint32_t y); + inline wuffs_base__rect_ii_u32__struct intersection( + wuffs_base__rect_ii_u32__struct s); + inline wuffs_base__rect_ii_u32__struct unionz( + wuffs_base__rect_ii_u32__struct s); +#endif // __cplusplus + } wuffs_base__rect_ii_u32; static inline bool wuffs_base__rect_ii_u32__is_empty( @@ -604,6 +773,32 @@ static inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union( return t; } +#ifdef __cplusplus + +inline bool wuffs_base__rect_ii_u32::is_empty() { + return wuffs_base__rect_ii_u32__is_empty(this); +} + +inline bool wuffs_base__rect_ii_u32::equals(wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__equals(this, s); +} + +inline bool wuffs_base__rect_ii_u32::contains(uint32_t x, uint32_t y) { + return wuffs_base__rect_ii_u32__contains(this, x, y); +} + +inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::intersection( + wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__intersection(this, s); +} + +inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32::unionz( + wuffs_base__rect_ii_u32 s) { + return wuffs_base__rect_ii_u32__union(this, s); +} + +#endif // __cplusplus + // -------- // wuffs_base__rect_ie_u32 is a rectangle (a 2-dimensional range) on the @@ -616,11 +811,24 @@ static inline wuffs_base__rect_ii_u32 wuffs_base__rect_ii_u32__union( // fields zero. // // The X and Y axes increase right and down. -typedef struct { +typedef struct wuffs_base__rect_ie_u32__struct { uint32_t min_incl_x; uint32_t min_incl_y; uint32_t max_excl_x; uint32_t max_excl_y; + +#ifdef __cplusplus + inline bool is_empty(); + inline bool equals(wuffs_base__rect_ie_u32__struct s); + inline bool contains(uint32_t x, uint32_t y); + inline wuffs_base__rect_ie_u32__struct intersection( + wuffs_base__rect_ie_u32__struct s); + inline wuffs_base__rect_ie_u32__struct unionz( + wuffs_base__rect_ie_u32__struct s); + inline uint32_t width(); + inline uint32_t height(); +#endif // __cplusplus + } wuffs_base__rect_ie_u32; static inline bool wuffs_base__rect_ie_u32__is_empty( @@ -681,6 +889,40 @@ static inline uint32_t wuffs_base__rect_ie_u32__height( return wuffs_base__u32__sat_sub(r->max_excl_y, r->min_incl_y); } +#ifdef __cplusplus + +inline bool wuffs_base__rect_ie_u32::is_empty() { + return wuffs_base__rect_ie_u32__is_empty(this); +} + +inline bool wuffs_base__rect_ie_u32::equals(wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__equals(this, s); +} + +inline bool wuffs_base__rect_ie_u32::contains(uint32_t x, uint32_t y) { + return wuffs_base__rect_ie_u32__contains(this, x, y); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::intersection( + wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__intersection(this, s); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__rect_ie_u32::unionz( + wuffs_base__rect_ie_u32 s) { + return wuffs_base__rect_ie_u32__union(this, s); +} + +inline uint32_t wuffs_base__rect_ie_u32::width() { + return wuffs_base__rect_ie_u32__width(this); +} + +inline uint32_t wuffs_base__rect_ie_u32::height() { + return wuffs_base__rect_ie_u32__height(this); +} + +#endif // __cplusplus + // ---------------- I/O struct wuffs_base__io_buffer__struct; @@ -1046,6 +1288,26 @@ typedef struct { uint32_t num_loops; bool first_frame_is_opaque; } private_impl; + +#ifdef __cplusplus + inline void initialize(wuffs_base__pixel_format pixfmt, + wuffs_base__pixel_subsampling pixsub, + uint32_t width, + uint32_t height, + uint32_t num_loops, + bool first_frame_is_opaque); + inline void invalidate(); + inline bool is_valid(); + inline wuffs_base__pixel_format pixel_format(); + inline wuffs_base__pixel_subsampling pixel_subsampling(); + inline wuffs_base__rect_ie_u32 bounds(); + inline uint32_t width(); + inline uint32_t height(); + inline uint32_t num_loops(); + inline uint32_t first_frame_is_opaque(); + inline size_t pixbuf_size(); +#endif // __cplusplus + } wuffs_base__image_config; // TODO: Should this function return bool? An error type? @@ -1143,6 +1405,62 @@ static inline size_t wuffs_base__image_config__pixbuf_size( return 0; } +#ifdef __cplusplus + +inline void wuffs_base__image_config::initialize( + wuffs_base__pixel_format pixfmt, + wuffs_base__pixel_subsampling pixsub, + uint32_t width, + uint32_t height, + uint32_t num_loops, + bool first_frame_is_opaque) { + wuffs_base__image_config__initialize(this, pixfmt, pixsub, width, height, + num_loops, first_frame_is_opaque); +} + +inline void wuffs_base__image_config::invalidate() { + wuffs_base__image_config__invalidate(this); +} + +inline bool wuffs_base__image_config::is_valid() { + return wuffs_base__image_config__is_valid(this); +} + +inline wuffs_base__pixel_format wuffs_base__image_config::pixel_format() { + return wuffs_base__image_config__pixel_format(this); +} + +inline wuffs_base__pixel_subsampling +wuffs_base__image_config::pixel_subsampling() { + return wuffs_base__image_config__pixel_subsampling(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_config::bounds() { + return wuffs_base__image_config__bounds(this); +} + +inline uint32_t wuffs_base__image_config::width() { + return wuffs_base__image_config__width(this); +} + +inline uint32_t wuffs_base__image_config::height() { + return wuffs_base__image_config__height(this); +} + +inline uint32_t wuffs_base__image_config::num_loops() { + return wuffs_base__image_config__num_loops(this); +} + +inline uint32_t wuffs_base__image_config::first_frame_is_opaque() { + return wuffs_base__image_config__first_frame_is_opaque(this); +} + +inline size_t wuffs_base__image_config::pixbuf_size() { + return wuffs_base__image_config__pixbuf_size(this); +} + +#endif // __cplusplus + // -------- // wuffs_base__animation_disposal encodes, for an animated image, how to @@ -1178,6 +1496,30 @@ typedef struct { bool palette_changed; uint8_t palette[1024]; } private_impl; + +#ifdef __cplusplus + inline wuffs_base__status set_from_pixbuf(wuffs_base__image_config config, + wuffs_base__pixel_buffer pixbuf); + inline wuffs_base__status set_from_slice(wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory); + inline void update(wuffs_base__rect_ie_u32 dirty_rect, + wuffs_base__flicks duration, + bool blend, + wuffs_base__animation_disposal disposal, + wuffs_base__slice_u8 palette); + inline wuffs_base__image_config* image_config(); + inline wuffs_base__rect_ie_u32 bounds(); + inline uint32_t width(); + inline uint32_t height(); + inline wuffs_base__rect_ie_u32 dirty_rect(); + inline wuffs_base__flicks duration(); + inline bool blend(); + inline wuffs_base__animation_disposal disposal(); + inline bool palette_changed(); + inline wuffs_base__slice_u8 palette(); + inline wuffs_base__table_u8 plane(uint32_t p); +#endif // __cplusplus + } wuffs_base__image_buffer; static inline wuffs_base__status wuffs_base__image_buffer__set_from_pixbuf( @@ -1322,6 +1664,76 @@ static inline wuffs_base__table_u8 wuffs_base__image_buffer__plane( : ((wuffs_base__table_u8){}); } +#ifdef __cplusplus + +inline wuffs_base__status wuffs_base__image_buffer::set_from_pixbuf( + wuffs_base__image_config config, + wuffs_base__pixel_buffer pixbuf) { + return wuffs_base__image_buffer__set_from_pixbuf(this, config, pixbuf); +} + +inline wuffs_base__status wuffs_base__image_buffer::set_from_slice( + wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory) { + return wuffs_base__image_buffer__set_from_slice(this, config, pixbuf_memory); +} + +inline void wuffs_base__image_buffer::update( + wuffs_base__rect_ie_u32 dirty_rect, + wuffs_base__flicks duration, + bool blend, + wuffs_base__animation_disposal disposal, + wuffs_base__slice_u8 palette) { + wuffs_base__image_buffer__update(this, dirty_rect, duration, blend, disposal, + palette); +} + +inline wuffs_base__image_config* wuffs_base__image_buffer::image_config() { + return wuffs_base__image_buffer__image_config(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::bounds() { + return wuffs_base__image_buffer__bounds(this); +} + +inline uint32_t wuffs_base__image_buffer::width() { + return wuffs_base__image_buffer__width(this); +} + +inline uint32_t wuffs_base__image_buffer::height() { + return wuffs_base__image_buffer__height(this); +} + +inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer::dirty_rect() { + return wuffs_base__image_buffer__dirty_rect(this); +} + +inline wuffs_base__flicks wuffs_base__image_buffer::duration() { + return wuffs_base__image_buffer__duration(this); +} + +inline bool wuffs_base__image_buffer::blend() { + return wuffs_base__image_buffer__blend(this); +} + +inline wuffs_base__animation_disposal wuffs_base__image_buffer::disposal() { + return wuffs_base__image_buffer__disposal(this); +} + +inline bool wuffs_base__image_buffer::palette_changed() { + return wuffs_base__image_buffer__palette_changed(this); +} + +inline wuffs_base__slice_u8 wuffs_base__image_buffer::palette() { + return wuffs_base__image_buffer__palette(this); +} + +inline wuffs_base__table_u8 wuffs_base__image_buffer::plane(uint32_t p) { + return wuffs_base__image_buffer__plane(this, p); +} + +#endif // __cplusplus + #ifdef __cplusplus } // extern "C" #endif