From 3ff7c707af88185ce6ba6dd3faaf90f6c603f374 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 20 Apr 2019 07:50:09 +1000 Subject: [PATCH] Have some base types' methods accept const this --- internal/cgen/base/image-impl.c | 2 +- internal/cgen/base/image-public.h | 122 ++++---- internal/cgen/base/io-public.h | 12 +- internal/cgen/base/range-public.h | 244 ++++++++-------- internal/cgen/data.go | 119 ++++---- release/c/wuffs-unsupported-snapshot.c | 380 +++++++++++++------------ 6 files changed, 446 insertions(+), 433 deletions(-) diff --git a/internal/cgen/base/image-impl.c b/internal/cgen/base/image-impl.c index 6674c4ae..654710d6 100644 --- a/internal/cgen/base/image-impl.c +++ b/internal/cgen/base/image-impl.c @@ -156,7 +156,7 @@ wuffs_base__pixel_swizzler__prepare(wuffs_base__pixel_swizzler* p, } uint64_t // -wuffs_base__pixel_swizzler__swizzle_packed(wuffs_base__pixel_swizzler* p, +wuffs_base__pixel_swizzler__swizzle_packed(const wuffs_base__pixel_swizzler* p, wuffs_base__slice_u8 dst, wuffs_base__slice_u8 dst_palette, wuffs_base__slice_u8 src) { diff --git a/internal/cgen/base/image-public.h b/internal/cgen/base/image-public.h index f452b3bb..ec65b09f 100644 --- a/internal/cgen/base/image-public.h +++ b/internal/cgen/base/image-public.h @@ -336,13 +336,13 @@ typedef struct { uint32_t width, uint32_t height); 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 uint64_t pixbuf_len(); + inline bool is_valid() const; + inline wuffs_base__pixel_format pixel_format() const; + inline wuffs_base__pixel_subsampling pixel_subsampling() const; + inline wuffs_base__rect_ie_u32 bounds() const; + inline uint32_t width() const; + inline uint32_t height() const; + inline uint64_t pixbuf_len() const; #endif // __cplusplus } wuffs_base__pixel_config; @@ -396,22 +396,22 @@ wuffs_base__pixel_config__invalidate(wuffs_base__pixel_config* c) { } static inline bool // -wuffs_base__pixel_config__is_valid(wuffs_base__pixel_config* c) { +wuffs_base__pixel_config__is_valid(const wuffs_base__pixel_config* c) { return c && c->private_impl.pixfmt; } static inline wuffs_base__pixel_format // -wuffs_base__pixel_config__pixel_format(wuffs_base__pixel_config* c) { +wuffs_base__pixel_config__pixel_format(const wuffs_base__pixel_config* c) { return c ? c->private_impl.pixfmt : 0; } static inline wuffs_base__pixel_subsampling // -wuffs_base__pixel_config__pixel_subsampling(wuffs_base__pixel_config* c) { +wuffs_base__pixel_config__pixel_subsampling(const wuffs_base__pixel_config* c) { return c ? c->private_impl.pixsub : 0; } static inline wuffs_base__rect_ie_u32 // -wuffs_base__pixel_config__bounds(wuffs_base__pixel_config* c) { +wuffs_base__pixel_config__bounds(const wuffs_base__pixel_config* c) { if (c) { wuffs_base__rect_ie_u32 ret; ret.min_incl_x = 0; @@ -430,12 +430,12 @@ wuffs_base__pixel_config__bounds(wuffs_base__pixel_config* c) { } static inline uint32_t // -wuffs_base__pixel_config__width(wuffs_base__pixel_config* c) { +wuffs_base__pixel_config__width(const wuffs_base__pixel_config* c) { return c ? c->private_impl.width : 0; } static inline uint32_t // -wuffs_base__pixel_config__height(wuffs_base__pixel_config* c) { +wuffs_base__pixel_config__height(const wuffs_base__pixel_config* c) { return c ? c->private_impl.height : 0; } @@ -443,7 +443,7 @@ wuffs_base__pixel_config__height(wuffs_base__pixel_config* c) { // decoding into a color model different from the format's intrinsic one? For // example, decoding a JPEG image straight to RGBA instead of to YCbCr? static inline uint64_t // -wuffs_base__pixel_config__pixbuf_len(wuffs_base__pixel_config* c) { +wuffs_base__pixel_config__pixbuf_len(const wuffs_base__pixel_config* c) { if (!c) { return 0; } @@ -492,37 +492,37 @@ wuffs_base__pixel_config::invalidate() { } inline bool // -wuffs_base__pixel_config::is_valid() { +wuffs_base__pixel_config::is_valid() const { return wuffs_base__pixel_config__is_valid(this); } inline wuffs_base__pixel_format // -wuffs_base__pixel_config::pixel_format() { +wuffs_base__pixel_config::pixel_format() const { return wuffs_base__pixel_config__pixel_format(this); } inline wuffs_base__pixel_subsampling // -wuffs_base__pixel_config::pixel_subsampling() { +wuffs_base__pixel_config::pixel_subsampling() const { return wuffs_base__pixel_config__pixel_subsampling(this); } inline wuffs_base__rect_ie_u32 // -wuffs_base__pixel_config::bounds() { +wuffs_base__pixel_config::bounds() const { return wuffs_base__pixel_config__bounds(this); } inline uint32_t // -wuffs_base__pixel_config::width() { +wuffs_base__pixel_config::width() const { return wuffs_base__pixel_config__width(this); } inline uint32_t // -wuffs_base__pixel_config::height() { +wuffs_base__pixel_config::height() const { return wuffs_base__pixel_config__height(this); } inline uint64_t // -wuffs_base__pixel_config::pixbuf_len() { +wuffs_base__pixel_config::pixbuf_len() const { return wuffs_base__pixel_config__pixbuf_len(this); } @@ -548,9 +548,9 @@ typedef struct { uint64_t first_frame_io_position, bool first_frame_is_opaque); inline void invalidate(); - inline bool is_valid(); - inline uint64_t first_frame_io_position(); - inline bool first_frame_is_opaque(); + inline bool is_valid() const; + inline uint64_t first_frame_io_position() const; + inline bool first_frame_is_opaque() const; #endif // __cplusplus } wuffs_base__image_config; @@ -607,17 +607,19 @@ wuffs_base__image_config__invalidate(wuffs_base__image_config* c) { } static inline bool // -wuffs_base__image_config__is_valid(wuffs_base__image_config* c) { +wuffs_base__image_config__is_valid(const wuffs_base__image_config* c) { return c && wuffs_base__pixel_config__is_valid(&(c->pixcfg)); } static inline uint64_t // -wuffs_base__image_config__first_frame_io_position(wuffs_base__image_config* c) { +wuffs_base__image_config__first_frame_io_position( + const wuffs_base__image_config* c) { return c ? c->private_impl.first_frame_io_position : 0; } static inline bool // -wuffs_base__image_config__first_frame_is_opaque(wuffs_base__image_config* c) { +wuffs_base__image_config__first_frame_is_opaque( + const wuffs_base__image_config* c) { return c ? c->private_impl.first_frame_is_opaque : false; } @@ -640,17 +642,17 @@ wuffs_base__image_config::invalidate() { } inline bool // -wuffs_base__image_config::is_valid() { +wuffs_base__image_config::is_valid() const { return wuffs_base__image_config__is_valid(this); } inline uint64_t // -wuffs_base__image_config::first_frame_io_position() { +wuffs_base__image_config::first_frame_io_position() const { return wuffs_base__image_config__first_frame_io_position(this); } inline bool // -wuffs_base__image_config::first_frame_is_opaque() { +wuffs_base__image_config::first_frame_is_opaque() const { return wuffs_base__image_config__first_frame_is_opaque(this); } @@ -715,14 +717,14 @@ typedef struct { uint64_t io_position, wuffs_base__animation_blend blend, wuffs_base__animation_disposal disposal); - inline wuffs_base__rect_ie_u32 bounds(); - inline uint32_t width(); - inline uint32_t height(); - inline wuffs_base__flicks duration(); - inline uint64_t index(); - inline uint64_t io_position(); - inline wuffs_base__animation_blend blend(); - inline wuffs_base__animation_disposal disposal(); + inline wuffs_base__rect_ie_u32 bounds() const; + inline uint32_t width() const; + inline uint32_t height() const; + inline wuffs_base__flicks duration() const; + inline uint64_t index() const; + inline uint64_t io_position() const; + inline wuffs_base__animation_blend blend() const; + inline wuffs_base__animation_disposal disposal() const; #endif // __cplusplus } wuffs_base__frame_config; @@ -760,7 +762,7 @@ wuffs_base__frame_config__update(wuffs_base__frame_config* c, } static inline wuffs_base__rect_ie_u32 // -wuffs_base__frame_config__bounds(wuffs_base__frame_config* c) { +wuffs_base__frame_config__bounds(const wuffs_base__frame_config* c) { if (c) { return c->private_impl.bounds; } @@ -774,47 +776,47 @@ wuffs_base__frame_config__bounds(wuffs_base__frame_config* c) { } static inline uint32_t // -wuffs_base__frame_config__width(wuffs_base__frame_config* c) { +wuffs_base__frame_config__width(const wuffs_base__frame_config* c) { return c ? wuffs_base__rect_ie_u32__width(&c->private_impl.bounds) : 0; } static inline uint32_t // -wuffs_base__frame_config__height(wuffs_base__frame_config* c) { +wuffs_base__frame_config__height(const wuffs_base__frame_config* c) { return c ? wuffs_base__rect_ie_u32__height(&c->private_impl.bounds) : 0; } // wuffs_base__frame_config__duration returns the amount of time to display // this frame. Zero means to display forever - a still (non-animated) image. static inline wuffs_base__flicks // -wuffs_base__frame_config__duration(wuffs_base__frame_config* c) { +wuffs_base__frame_config__duration(const wuffs_base__frame_config* c) { return c ? c->private_impl.duration : 0; } // wuffs_base__frame_config__index returns the index of this frame. The first // frame in an image has index 0, the second frame has index 1, and so on. static inline uint64_t // -wuffs_base__frame_config__index(wuffs_base__frame_config* c) { +wuffs_base__frame_config__index(const wuffs_base__frame_config* c) { return c ? c->private_impl.index : 0; } // wuffs_base__frame_config__io_position returns the I/O stream position before // the frame config. static inline uint64_t // -wuffs_base__frame_config__io_position(wuffs_base__frame_config* c) { +wuffs_base__frame_config__io_position(const wuffs_base__frame_config* c) { return c ? c->private_impl.io_position : 0; } // wuffs_base__frame_config__blend returns, for an animated image, how to blend // the transparent pixels of this frame with the existing canvas. static inline wuffs_base__animation_blend // -wuffs_base__frame_config__blend(wuffs_base__frame_config* c) { +wuffs_base__frame_config__blend(const wuffs_base__frame_config* c) { return c ? c->private_impl.blend : 0; } // wuffs_base__frame_config__disposal returns, for an animated image, how to // dispose of this frame after displaying it. static inline wuffs_base__animation_disposal // -wuffs_base__frame_config__disposal(wuffs_base__frame_config* c) { +wuffs_base__frame_config__disposal(const wuffs_base__frame_config* c) { return c ? c->private_impl.disposal : 0; } @@ -832,42 +834,42 @@ wuffs_base__frame_config::update(wuffs_base__rect_ie_u32 bounds, } inline wuffs_base__rect_ie_u32 // -wuffs_base__frame_config::bounds() { +wuffs_base__frame_config::bounds() const { return wuffs_base__frame_config__bounds(this); } inline uint32_t // -wuffs_base__frame_config::width() { +wuffs_base__frame_config::width() const { return wuffs_base__frame_config__width(this); } inline uint32_t // -wuffs_base__frame_config::height() { +wuffs_base__frame_config::height() const { return wuffs_base__frame_config__height(this); } inline wuffs_base__flicks // -wuffs_base__frame_config::duration() { +wuffs_base__frame_config::duration() const { return wuffs_base__frame_config__duration(this); } inline uint64_t // -wuffs_base__frame_config::index() { +wuffs_base__frame_config::index() const { return wuffs_base__frame_config__index(this); } inline uint64_t // -wuffs_base__frame_config::io_position() { +wuffs_base__frame_config::io_position() const { return wuffs_base__frame_config__io_position(this); } inline wuffs_base__animation_blend // -wuffs_base__frame_config::blend() { +wuffs_base__frame_config::blend() const { return wuffs_base__frame_config__blend(this); } inline wuffs_base__animation_disposal // -wuffs_base__frame_config::disposal() { +wuffs_base__frame_config::disposal() const { return wuffs_base__frame_config__disposal(this); } @@ -889,7 +891,7 @@ typedef struct { inline wuffs_base__status set_from_slice(wuffs_base__pixel_config* pixcfg, wuffs_base__slice_u8 pixbuf_memory); inline wuffs_base__slice_u8 palette(); - inline wuffs_base__pixel_format pixel_format(); + inline wuffs_base__pixel_format pixel_format() const; inline wuffs_base__table_u8 plane(uint32_t p); #endif // __cplusplus @@ -986,7 +988,7 @@ wuffs_base__pixel_buffer__palette(wuffs_base__pixel_buffer* b) { } static inline wuffs_base__pixel_format // -wuffs_base__pixel_buffer__pixel_format(wuffs_base__pixel_buffer* b) { +wuffs_base__pixel_buffer__pixel_format(const wuffs_base__pixel_buffer* b) { if (b) { return b->pixcfg.private_impl.pixfmt; } @@ -1021,7 +1023,7 @@ wuffs_base__pixel_buffer::palette() { } inline wuffs_base__pixel_format // -wuffs_base__pixel_buffer::pixel_format() { +wuffs_base__pixel_buffer::pixel_format() const { return wuffs_base__pixel_buffer__pixel_format(this); } @@ -1069,7 +1071,7 @@ typedef struct { wuffs_base__slice_u8 src_palette); inline uint64_t swizzle_packed(wuffs_base__slice_u8 dst, wuffs_base__slice_u8 dst_palette, - wuffs_base__slice_u8 src); + wuffs_base__slice_u8 src) const; #endif // __cplusplus } wuffs_base__pixel_swizzler; @@ -1084,7 +1086,7 @@ wuffs_base__pixel_swizzler__prepare(wuffs_base__pixel_swizzler* p, wuffs_base__slice_u8 src_palette); uint64_t // -wuffs_base__pixel_swizzler__swizzle_packed(wuffs_base__pixel_swizzler* p, +wuffs_base__pixel_swizzler__swizzle_packed(const wuffs_base__pixel_swizzler* p, wuffs_base__slice_u8 dst, wuffs_base__slice_u8 dst_palette, wuffs_base__slice_u8 src); @@ -1103,7 +1105,7 @@ wuffs_base__pixel_swizzler::prepare(wuffs_base__pixel_format dst_format, uint64_t // wuffs_base__pixel_swizzler::swizzle_packed(wuffs_base__slice_u8 dst, wuffs_base__slice_u8 dst_palette, - wuffs_base__slice_u8 src) { + wuffs_base__slice_u8 src) const { return wuffs_base__pixel_swizzler__swizzle_packed(this, dst, dst_palette, src); } diff --git a/internal/cgen/base/io-public.h b/internal/cgen/base/io-public.h index 6e9bb589..285c08f8 100644 --- a/internal/cgen/base/io-public.h +++ b/internal/cgen/base/io-public.h @@ -65,8 +65,8 @@ typedef struct wuffs_base__io_buffer__struct { inline void compact(); inline wuffs_base__io_reader reader(); inline wuffs_base__io_writer writer(); - inline uint64_t reader_io_position(); - inline uint64_t writer_io_position(); + inline uint64_t reader_io_position() const; + inline uint64_t writer_io_position() const; #endif // __cplusplus } wuffs_base__io_buffer; @@ -168,12 +168,12 @@ wuffs_base__io_buffer__writer(wuffs_base__io_buffer* buf) { } static inline uint64_t // -wuffs_base__io_buffer__reader_io_position(wuffs_base__io_buffer* buf) { +wuffs_base__io_buffer__reader_io_position(const wuffs_base__io_buffer* buf) { return buf ? wuffs_base__u64__sat_add(buf->meta.pos, buf->meta.ri) : 0; } static inline uint64_t // -wuffs_base__io_buffer__writer_io_position(wuffs_base__io_buffer* buf) { +wuffs_base__io_buffer__writer_io_position(const wuffs_base__io_buffer* buf) { return buf ? wuffs_base__u64__sat_add(buf->meta.pos, buf->meta.wi) : 0; } @@ -195,12 +195,12 @@ wuffs_base__io_buffer__struct::writer() { } inline uint64_t // -wuffs_base__io_buffer__struct::reader_io_position() { +wuffs_base__io_buffer__struct::reader_io_position() const { return wuffs_base__io_buffer__reader_io_position(this); } inline uint64_t // -wuffs_base__io_buffer__struct::writer_io_position() { +wuffs_base__io_buffer__struct::writer_io_position() const { return wuffs_base__io_buffer__writer_io_position(this); } diff --git a/internal/cgen/base/range-public.h b/internal/cgen/base/range-public.h index 69d6ecb7..b6f6be72 100644 --- a/internal/cgen/base/range-public.h +++ b/internal/cgen/base/range-public.h @@ -52,14 +52,14 @@ typedef struct wuffs_base__range_ii_u32__struct { uint32_t max_incl; #ifdef __cplusplus - inline bool is_empty(); - inline bool equals(wuffs_base__range_ii_u32__struct s); + inline bool is_empty() const; + inline bool equals(wuffs_base__range_ii_u32__struct s) const; inline wuffs_base__range_ii_u32__struct intersect( - wuffs_base__range_ii_u32__struct s); + wuffs_base__range_ii_u32__struct s) const; inline wuffs_base__range_ii_u32__struct unite( - wuffs_base__range_ii_u32__struct s); - inline bool contains(uint32_t x); - inline bool contains_range(wuffs_base__range_ii_u32__struct s); + wuffs_base__range_ii_u32__struct s) const; + inline bool contains(uint32_t x) const; + inline bool contains_range(wuffs_base__range_ii_u32__struct s) const; #endif // __cplusplus } wuffs_base__range_ii_u32; @@ -73,12 +73,12 @@ wuffs_base__make_range_ii_u32(uint32_t min_incl, uint32_t max_incl) { } static inline bool // -wuffs_base__range_ii_u32__is_empty(wuffs_base__range_ii_u32* r) { +wuffs_base__range_ii_u32__is_empty(const wuffs_base__range_ii_u32* r) { return r->min_incl > r->max_incl; } static inline bool // -wuffs_base__range_ii_u32__equals(wuffs_base__range_ii_u32* r, +wuffs_base__range_ii_u32__equals(const wuffs_base__range_ii_u32* r, wuffs_base__range_ii_u32 s) { return (r->min_incl == s.min_incl && r->max_incl == s.max_incl) || (wuffs_base__range_ii_u32__is_empty(r) && @@ -86,7 +86,7 @@ wuffs_base__range_ii_u32__equals(wuffs_base__range_ii_u32* r, } static inline wuffs_base__range_ii_u32 // -wuffs_base__range_ii_u32__intersect(wuffs_base__range_ii_u32* r, +wuffs_base__range_ii_u32__intersect(const wuffs_base__range_ii_u32* r, wuffs_base__range_ii_u32 s) { wuffs_base__range_ii_u32 t; t.min_incl = wuffs_base__u32__max(r->min_incl, s.min_incl); @@ -95,7 +95,7 @@ wuffs_base__range_ii_u32__intersect(wuffs_base__range_ii_u32* r, } static inline wuffs_base__range_ii_u32 // -wuffs_base__range_ii_u32__unite(wuffs_base__range_ii_u32* r, +wuffs_base__range_ii_u32__unite(const wuffs_base__range_ii_u32* r, wuffs_base__range_ii_u32 s) { if (wuffs_base__range_ii_u32__is_empty(r)) { return s; @@ -110,12 +110,13 @@ wuffs_base__range_ii_u32__unite(wuffs_base__range_ii_u32* r, } static inline bool // -wuffs_base__range_ii_u32__contains(wuffs_base__range_ii_u32* r, uint32_t x) { +wuffs_base__range_ii_u32__contains(const wuffs_base__range_ii_u32* r, + uint32_t x) { return (r->min_incl <= x) && (x <= r->max_incl); } static inline bool // -wuffs_base__range_ii_u32__contains_range(wuffs_base__range_ii_u32* r, +wuffs_base__range_ii_u32__contains_range(const wuffs_base__range_ii_u32* r, wuffs_base__range_ii_u32 s) { return wuffs_base__range_ii_u32__equals( &s, wuffs_base__range_ii_u32__intersect(r, s)); @@ -124,32 +125,32 @@ wuffs_base__range_ii_u32__contains_range(wuffs_base__range_ii_u32* r, #ifdef __cplusplus inline bool // -wuffs_base__range_ii_u32::is_empty() { +wuffs_base__range_ii_u32::is_empty() const { return wuffs_base__range_ii_u32__is_empty(this); } inline bool // -wuffs_base__range_ii_u32::equals(wuffs_base__range_ii_u32 s) { +wuffs_base__range_ii_u32::equals(wuffs_base__range_ii_u32 s) const { return wuffs_base__range_ii_u32__equals(this, s); } inline wuffs_base__range_ii_u32 // -wuffs_base__range_ii_u32::intersect(wuffs_base__range_ii_u32 s) { +wuffs_base__range_ii_u32::intersect(wuffs_base__range_ii_u32 s) const { return wuffs_base__range_ii_u32__intersect(this, s); } inline wuffs_base__range_ii_u32 // -wuffs_base__range_ii_u32::unite(wuffs_base__range_ii_u32 s) { +wuffs_base__range_ii_u32::unite(wuffs_base__range_ii_u32 s) const { return wuffs_base__range_ii_u32__unite(this, s); } inline bool // -wuffs_base__range_ii_u32::contains(uint32_t x) { +wuffs_base__range_ii_u32::contains(uint32_t x) const { return wuffs_base__range_ii_u32__contains(this, x); } inline bool // -wuffs_base__range_ii_u32::contains_range(wuffs_base__range_ii_u32 s) { +wuffs_base__range_ii_u32::contains_range(wuffs_base__range_ii_u32 s) const { return wuffs_base__range_ii_u32__contains_range(this, s); } @@ -162,15 +163,15 @@ typedef struct wuffs_base__range_ie_u32__struct { uint32_t max_excl; #ifdef __cplusplus - inline bool is_empty(); - inline bool equals(wuffs_base__range_ie_u32__struct s); + inline bool is_empty() const; + inline bool equals(wuffs_base__range_ie_u32__struct s) const; inline wuffs_base__range_ie_u32__struct intersect( - wuffs_base__range_ie_u32__struct s); + wuffs_base__range_ie_u32__struct s) const; inline wuffs_base__range_ie_u32__struct unite( - wuffs_base__range_ie_u32__struct s); - inline bool contains(uint32_t x); - inline bool contains_range(wuffs_base__range_ie_u32__struct s); - inline uint32_t length(); + wuffs_base__range_ie_u32__struct s) const; + inline bool contains(uint32_t x) const; + inline bool contains_range(wuffs_base__range_ie_u32__struct s) const; + inline uint32_t length() const; #endif // __cplusplus } wuffs_base__range_ie_u32; @@ -184,12 +185,12 @@ wuffs_base__make_range_ie_u32(uint32_t min_incl, uint32_t max_excl) { } static inline bool // -wuffs_base__range_ie_u32__is_empty(wuffs_base__range_ie_u32* r) { +wuffs_base__range_ie_u32__is_empty(const wuffs_base__range_ie_u32* r) { return r->min_incl >= r->max_excl; } static inline bool // -wuffs_base__range_ie_u32__equals(wuffs_base__range_ie_u32* r, +wuffs_base__range_ie_u32__equals(const wuffs_base__range_ie_u32* r, wuffs_base__range_ie_u32 s) { return (r->min_incl == s.min_incl && r->max_excl == s.max_excl) || (wuffs_base__range_ie_u32__is_empty(r) && @@ -197,7 +198,7 @@ wuffs_base__range_ie_u32__equals(wuffs_base__range_ie_u32* r, } static inline wuffs_base__range_ie_u32 // -wuffs_base__range_ie_u32__intersect(wuffs_base__range_ie_u32* r, +wuffs_base__range_ie_u32__intersect(const wuffs_base__range_ie_u32* r, wuffs_base__range_ie_u32 s) { wuffs_base__range_ie_u32 t; t.min_incl = wuffs_base__u32__max(r->min_incl, s.min_incl); @@ -206,7 +207,7 @@ wuffs_base__range_ie_u32__intersect(wuffs_base__range_ie_u32* r, } static inline wuffs_base__range_ie_u32 // -wuffs_base__range_ie_u32__unite(wuffs_base__range_ie_u32* r, +wuffs_base__range_ie_u32__unite(const wuffs_base__range_ie_u32* r, wuffs_base__range_ie_u32 s) { if (wuffs_base__range_ie_u32__is_empty(r)) { return s; @@ -221,56 +222,57 @@ wuffs_base__range_ie_u32__unite(wuffs_base__range_ie_u32* r, } static inline bool // -wuffs_base__range_ie_u32__contains(wuffs_base__range_ie_u32* r, uint32_t x) { +wuffs_base__range_ie_u32__contains(const wuffs_base__range_ie_u32* r, + uint32_t x) { return (r->min_incl <= x) && (x < r->max_excl); } static inline bool // -wuffs_base__range_ie_u32__contains_range(wuffs_base__range_ie_u32* r, +wuffs_base__range_ie_u32__contains_range(const wuffs_base__range_ie_u32* r, wuffs_base__range_ie_u32 s) { return wuffs_base__range_ie_u32__equals( &s, wuffs_base__range_ie_u32__intersect(r, s)); } static inline uint32_t // -wuffs_base__range_ie_u32__length(wuffs_base__range_ie_u32* r) { +wuffs_base__range_ie_u32__length(const wuffs_base__range_ie_u32* r) { return wuffs_base__u32__sat_sub(r->max_excl, r->min_incl); } #ifdef __cplusplus inline bool // -wuffs_base__range_ie_u32::is_empty() { +wuffs_base__range_ie_u32::is_empty() const { return wuffs_base__range_ie_u32__is_empty(this); } inline bool // -wuffs_base__range_ie_u32::equals(wuffs_base__range_ie_u32 s) { +wuffs_base__range_ie_u32::equals(wuffs_base__range_ie_u32 s) const { return wuffs_base__range_ie_u32__equals(this, s); } inline wuffs_base__range_ie_u32 // -wuffs_base__range_ie_u32::intersect(wuffs_base__range_ie_u32 s) { +wuffs_base__range_ie_u32::intersect(wuffs_base__range_ie_u32 s) const { return wuffs_base__range_ie_u32__intersect(this, s); } inline wuffs_base__range_ie_u32 // -wuffs_base__range_ie_u32::unite(wuffs_base__range_ie_u32 s) { +wuffs_base__range_ie_u32::unite(wuffs_base__range_ie_u32 s) const { return wuffs_base__range_ie_u32__unite(this, s); } inline bool // -wuffs_base__range_ie_u32::contains(uint32_t x) { +wuffs_base__range_ie_u32::contains(uint32_t x) const { return wuffs_base__range_ie_u32__contains(this, x); } inline bool // -wuffs_base__range_ie_u32::contains_range(wuffs_base__range_ie_u32 s) { +wuffs_base__range_ie_u32::contains_range(wuffs_base__range_ie_u32 s) const { return wuffs_base__range_ie_u32__contains_range(this, s); } inline uint32_t // -wuffs_base__range_ie_u32::length() { +wuffs_base__range_ie_u32::length() const { return wuffs_base__range_ie_u32__length(this); } @@ -283,14 +285,14 @@ typedef struct wuffs_base__range_ii_u64__struct { uint64_t max_incl; #ifdef __cplusplus - inline bool is_empty(); - inline bool equals(wuffs_base__range_ii_u64__struct s); + inline bool is_empty() const; + inline bool equals(wuffs_base__range_ii_u64__struct s) const; inline wuffs_base__range_ii_u64__struct intersect( - wuffs_base__range_ii_u64__struct s); + wuffs_base__range_ii_u64__struct s) const; inline wuffs_base__range_ii_u64__struct unite( - wuffs_base__range_ii_u64__struct s); - inline bool contains(uint64_t x); - inline bool contains_range(wuffs_base__range_ii_u64__struct s); + wuffs_base__range_ii_u64__struct s) const; + inline bool contains(uint64_t x) const; + inline bool contains_range(wuffs_base__range_ii_u64__struct s) const; #endif // __cplusplus } wuffs_base__range_ii_u64; @@ -304,12 +306,12 @@ wuffs_base__make_range_ii_u64(uint64_t min_incl, uint64_t max_incl) { } static inline bool // -wuffs_base__range_ii_u64__is_empty(wuffs_base__range_ii_u64* r) { +wuffs_base__range_ii_u64__is_empty(const wuffs_base__range_ii_u64* r) { return r->min_incl > r->max_incl; } static inline bool // -wuffs_base__range_ii_u64__equals(wuffs_base__range_ii_u64* r, +wuffs_base__range_ii_u64__equals(const wuffs_base__range_ii_u64* r, wuffs_base__range_ii_u64 s) { return (r->min_incl == s.min_incl && r->max_incl == s.max_incl) || (wuffs_base__range_ii_u64__is_empty(r) && @@ -317,7 +319,7 @@ wuffs_base__range_ii_u64__equals(wuffs_base__range_ii_u64* r, } static inline wuffs_base__range_ii_u64 // -wuffs_base__range_ii_u64__intersect(wuffs_base__range_ii_u64* r, +wuffs_base__range_ii_u64__intersect(const wuffs_base__range_ii_u64* r, wuffs_base__range_ii_u64 s) { wuffs_base__range_ii_u64 t; t.min_incl = wuffs_base__u64__max(r->min_incl, s.min_incl); @@ -326,7 +328,7 @@ wuffs_base__range_ii_u64__intersect(wuffs_base__range_ii_u64* r, } static inline wuffs_base__range_ii_u64 // -wuffs_base__range_ii_u64__unite(wuffs_base__range_ii_u64* r, +wuffs_base__range_ii_u64__unite(const wuffs_base__range_ii_u64* r, wuffs_base__range_ii_u64 s) { if (wuffs_base__range_ii_u64__is_empty(r)) { return s; @@ -341,12 +343,13 @@ wuffs_base__range_ii_u64__unite(wuffs_base__range_ii_u64* r, } static inline bool // -wuffs_base__range_ii_u64__contains(wuffs_base__range_ii_u64* r, uint64_t x) { +wuffs_base__range_ii_u64__contains(const wuffs_base__range_ii_u64* r, + uint64_t x) { return (r->min_incl <= x) && (x <= r->max_incl); } static inline bool // -wuffs_base__range_ii_u64__contains_range(wuffs_base__range_ii_u64* r, +wuffs_base__range_ii_u64__contains_range(const wuffs_base__range_ii_u64* r, wuffs_base__range_ii_u64 s) { return wuffs_base__range_ii_u64__equals( &s, wuffs_base__range_ii_u64__intersect(r, s)); @@ -355,32 +358,32 @@ wuffs_base__range_ii_u64__contains_range(wuffs_base__range_ii_u64* r, #ifdef __cplusplus inline bool // -wuffs_base__range_ii_u64::is_empty() { +wuffs_base__range_ii_u64::is_empty() const { return wuffs_base__range_ii_u64__is_empty(this); } inline bool // -wuffs_base__range_ii_u64::equals(wuffs_base__range_ii_u64 s) { +wuffs_base__range_ii_u64::equals(wuffs_base__range_ii_u64 s) const { return wuffs_base__range_ii_u64__equals(this, s); } inline wuffs_base__range_ii_u64 // -wuffs_base__range_ii_u64::intersect(wuffs_base__range_ii_u64 s) { +wuffs_base__range_ii_u64::intersect(wuffs_base__range_ii_u64 s) const { return wuffs_base__range_ii_u64__intersect(this, s); } inline wuffs_base__range_ii_u64 // -wuffs_base__range_ii_u64::unite(wuffs_base__range_ii_u64 s) { +wuffs_base__range_ii_u64::unite(wuffs_base__range_ii_u64 s) const { return wuffs_base__range_ii_u64__unite(this, s); } inline bool // -wuffs_base__range_ii_u64::contains(uint64_t x) { +wuffs_base__range_ii_u64::contains(uint64_t x) const { return wuffs_base__range_ii_u64__contains(this, x); } inline bool // -wuffs_base__range_ii_u64::contains_range(wuffs_base__range_ii_u64 s) { +wuffs_base__range_ii_u64::contains_range(wuffs_base__range_ii_u64 s) const { return wuffs_base__range_ii_u64__contains_range(this, s); } @@ -393,15 +396,15 @@ typedef struct wuffs_base__range_ie_u64__struct { uint64_t max_excl; #ifdef __cplusplus - inline bool is_empty(); - inline bool equals(wuffs_base__range_ie_u64__struct s); + inline bool is_empty() const; + inline bool equals(wuffs_base__range_ie_u64__struct s) const; inline wuffs_base__range_ie_u64__struct intersect( - wuffs_base__range_ie_u64__struct s); + wuffs_base__range_ie_u64__struct s) const; inline wuffs_base__range_ie_u64__struct unite( - wuffs_base__range_ie_u64__struct s); - inline bool contains(uint64_t x); - inline bool contains_range(wuffs_base__range_ie_u64__struct s); - inline uint64_t length(); + wuffs_base__range_ie_u64__struct s) const; + inline bool contains(uint64_t x) const; + inline bool contains_range(wuffs_base__range_ie_u64__struct s) const; + inline uint64_t length() const; #endif // __cplusplus } wuffs_base__range_ie_u64; @@ -415,12 +418,12 @@ wuffs_base__make_range_ie_u64(uint64_t min_incl, uint64_t max_excl) { } static inline bool // -wuffs_base__range_ie_u64__is_empty(wuffs_base__range_ie_u64* r) { +wuffs_base__range_ie_u64__is_empty(const wuffs_base__range_ie_u64* r) { return r->min_incl >= r->max_excl; } static inline bool // -wuffs_base__range_ie_u64__equals(wuffs_base__range_ie_u64* r, +wuffs_base__range_ie_u64__equals(const wuffs_base__range_ie_u64* r, wuffs_base__range_ie_u64 s) { return (r->min_incl == s.min_incl && r->max_excl == s.max_excl) || (wuffs_base__range_ie_u64__is_empty(r) && @@ -428,7 +431,7 @@ wuffs_base__range_ie_u64__equals(wuffs_base__range_ie_u64* r, } static inline wuffs_base__range_ie_u64 // -wuffs_base__range_ie_u64__intersect(wuffs_base__range_ie_u64* r, +wuffs_base__range_ie_u64__intersect(const wuffs_base__range_ie_u64* r, wuffs_base__range_ie_u64 s) { wuffs_base__range_ie_u64 t; t.min_incl = wuffs_base__u64__max(r->min_incl, s.min_incl); @@ -437,7 +440,7 @@ wuffs_base__range_ie_u64__intersect(wuffs_base__range_ie_u64* r, } static inline wuffs_base__range_ie_u64 // -wuffs_base__range_ie_u64__unite(wuffs_base__range_ie_u64* r, +wuffs_base__range_ie_u64__unite(const wuffs_base__range_ie_u64* r, wuffs_base__range_ie_u64 s) { if (wuffs_base__range_ie_u64__is_empty(r)) { return s; @@ -452,56 +455,57 @@ wuffs_base__range_ie_u64__unite(wuffs_base__range_ie_u64* r, } static inline bool // -wuffs_base__range_ie_u64__contains(wuffs_base__range_ie_u64* r, uint64_t x) { +wuffs_base__range_ie_u64__contains(const wuffs_base__range_ie_u64* r, + uint64_t x) { return (r->min_incl <= x) && (x < r->max_excl); } static inline bool // -wuffs_base__range_ie_u64__contains_range(wuffs_base__range_ie_u64* r, +wuffs_base__range_ie_u64__contains_range(const wuffs_base__range_ie_u64* r, wuffs_base__range_ie_u64 s) { return wuffs_base__range_ie_u64__equals( &s, wuffs_base__range_ie_u64__intersect(r, s)); } static inline uint64_t // -wuffs_base__range_ie_u64__length(wuffs_base__range_ie_u64* r) { +wuffs_base__range_ie_u64__length(const wuffs_base__range_ie_u64* r) { return wuffs_base__u64__sat_sub(r->max_excl, r->min_incl); } #ifdef __cplusplus inline bool // -wuffs_base__range_ie_u64::is_empty() { +wuffs_base__range_ie_u64::is_empty() const { return wuffs_base__range_ie_u64__is_empty(this); } inline bool // -wuffs_base__range_ie_u64::equals(wuffs_base__range_ie_u64 s) { +wuffs_base__range_ie_u64::equals(wuffs_base__range_ie_u64 s) const { return wuffs_base__range_ie_u64__equals(this, s); } inline wuffs_base__range_ie_u64 // -wuffs_base__range_ie_u64::intersect(wuffs_base__range_ie_u64 s) { +wuffs_base__range_ie_u64::intersect(wuffs_base__range_ie_u64 s) const { return wuffs_base__range_ie_u64__intersect(this, s); } inline wuffs_base__range_ie_u64 // -wuffs_base__range_ie_u64::unite(wuffs_base__range_ie_u64 s) { +wuffs_base__range_ie_u64::unite(wuffs_base__range_ie_u64 s) const { return wuffs_base__range_ie_u64__unite(this, s); } inline bool // -wuffs_base__range_ie_u64::contains(uint64_t x) { +wuffs_base__range_ie_u64::contains(uint64_t x) const { return wuffs_base__range_ie_u64__contains(this, x); } inline bool // -wuffs_base__range_ie_u64::contains_range(wuffs_base__range_ie_u64 s) { +wuffs_base__range_ie_u64::contains_range(wuffs_base__range_ie_u64 s) const { return wuffs_base__range_ie_u64__contains_range(this, s); } inline uint64_t // -wuffs_base__range_ie_u64::length() { +wuffs_base__range_ie_u64::length() const { return wuffs_base__range_ie_u64__length(this); } @@ -525,14 +529,14 @@ typedef struct wuffs_base__rect_ii_u32__struct { uint32_t max_incl_y; #ifdef __cplusplus - inline bool is_empty(); - inline bool equals(wuffs_base__rect_ii_u32__struct s); + inline bool is_empty() const; + inline bool equals(wuffs_base__rect_ii_u32__struct s) const; inline wuffs_base__rect_ii_u32__struct intersect( - wuffs_base__rect_ii_u32__struct s); + wuffs_base__rect_ii_u32__struct s) const; inline wuffs_base__rect_ii_u32__struct unite( - wuffs_base__rect_ii_u32__struct s); - inline bool contains(uint32_t x, uint32_t y); - inline bool contains_rect(wuffs_base__rect_ii_u32__struct s); + wuffs_base__rect_ii_u32__struct s) const; + inline bool contains(uint32_t x, uint32_t y) const; + inline bool contains_rect(wuffs_base__rect_ii_u32__struct s) const; #endif // __cplusplus } wuffs_base__rect_ii_u32; @@ -551,12 +555,12 @@ wuffs_base__make_rect_ii_u32(uint32_t min_incl_x, } static inline bool // -wuffs_base__rect_ii_u32__is_empty(wuffs_base__rect_ii_u32* r) { +wuffs_base__rect_ii_u32__is_empty(const wuffs_base__rect_ii_u32* r) { return (r->min_incl_x > r->max_incl_x) || (r->min_incl_y > r->max_incl_y); } static inline bool // -wuffs_base__rect_ii_u32__equals(wuffs_base__rect_ii_u32* r, +wuffs_base__rect_ii_u32__equals(const wuffs_base__rect_ii_u32* r, wuffs_base__rect_ii_u32 s) { return (r->min_incl_x == s.min_incl_x && r->min_incl_y == s.min_incl_y && r->max_incl_x == s.max_incl_x && r->max_incl_y == s.max_incl_y) || @@ -565,7 +569,7 @@ wuffs_base__rect_ii_u32__equals(wuffs_base__rect_ii_u32* r, } static inline wuffs_base__rect_ii_u32 // -wuffs_base__rect_ii_u32__intersect(wuffs_base__rect_ii_u32* r, +wuffs_base__rect_ii_u32__intersect(const wuffs_base__rect_ii_u32* r, wuffs_base__rect_ii_u32 s) { wuffs_base__rect_ii_u32 t; t.min_incl_x = wuffs_base__u32__max(r->min_incl_x, s.min_incl_x); @@ -576,7 +580,7 @@ wuffs_base__rect_ii_u32__intersect(wuffs_base__rect_ii_u32* r, } static inline wuffs_base__rect_ii_u32 // -wuffs_base__rect_ii_u32__unite(wuffs_base__rect_ii_u32* r, +wuffs_base__rect_ii_u32__unite(const wuffs_base__rect_ii_u32* r, wuffs_base__rect_ii_u32 s) { if (wuffs_base__rect_ii_u32__is_empty(r)) { return s; @@ -593,7 +597,7 @@ wuffs_base__rect_ii_u32__unite(wuffs_base__rect_ii_u32* r, } static inline bool // -wuffs_base__rect_ii_u32__contains(wuffs_base__rect_ii_u32* r, +wuffs_base__rect_ii_u32__contains(const wuffs_base__rect_ii_u32* r, uint32_t x, uint32_t y) { return (r->min_incl_x <= x) && (x <= r->max_incl_x) && (r->min_incl_y <= y) && @@ -601,7 +605,7 @@ wuffs_base__rect_ii_u32__contains(wuffs_base__rect_ii_u32* r, } static inline bool // -wuffs_base__rect_ii_u32__contains_rect(wuffs_base__rect_ii_u32* r, +wuffs_base__rect_ii_u32__contains_rect(const wuffs_base__rect_ii_u32* r, wuffs_base__rect_ii_u32 s) { return wuffs_base__rect_ii_u32__equals( &s, wuffs_base__rect_ii_u32__intersect(r, s)); @@ -610,32 +614,32 @@ wuffs_base__rect_ii_u32__contains_rect(wuffs_base__rect_ii_u32* r, #ifdef __cplusplus inline bool // -wuffs_base__rect_ii_u32::is_empty() { +wuffs_base__rect_ii_u32::is_empty() const { return wuffs_base__rect_ii_u32__is_empty(this); } inline bool // -wuffs_base__rect_ii_u32::equals(wuffs_base__rect_ii_u32 s) { +wuffs_base__rect_ii_u32::equals(wuffs_base__rect_ii_u32 s) const { return wuffs_base__rect_ii_u32__equals(this, s); } inline wuffs_base__rect_ii_u32 // -wuffs_base__rect_ii_u32::intersect(wuffs_base__rect_ii_u32 s) { +wuffs_base__rect_ii_u32::intersect(wuffs_base__rect_ii_u32 s) const { return wuffs_base__rect_ii_u32__intersect(this, s); } inline wuffs_base__rect_ii_u32 // -wuffs_base__rect_ii_u32::unite(wuffs_base__rect_ii_u32 s) { +wuffs_base__rect_ii_u32::unite(wuffs_base__rect_ii_u32 s) const { return wuffs_base__rect_ii_u32__unite(this, s); } inline bool // -wuffs_base__rect_ii_u32::contains(uint32_t x, uint32_t y) { +wuffs_base__rect_ii_u32::contains(uint32_t x, uint32_t y) const { return wuffs_base__rect_ii_u32__contains(this, x, y); } inline bool // -wuffs_base__rect_ii_u32::contains_rect(wuffs_base__rect_ii_u32 s) { +wuffs_base__rect_ii_u32::contains_rect(wuffs_base__rect_ii_u32 s) const { return wuffs_base__rect_ii_u32__contains_rect(this, s); } @@ -660,16 +664,16 @@ typedef struct wuffs_base__rect_ie_u32__struct { uint32_t max_excl_y; #ifdef __cplusplus - inline bool is_empty(); - inline bool equals(wuffs_base__rect_ie_u32__struct s); + inline bool is_empty() const; + inline bool equals(wuffs_base__rect_ie_u32__struct s) const; inline wuffs_base__rect_ie_u32__struct intersect( - wuffs_base__rect_ie_u32__struct s); + wuffs_base__rect_ie_u32__struct s) const; inline wuffs_base__rect_ie_u32__struct unite( - wuffs_base__rect_ie_u32__struct s); - inline bool contains(uint32_t x, uint32_t y); - inline bool contains_rect(wuffs_base__rect_ie_u32__struct s); - inline uint32_t width(); - inline uint32_t height(); + wuffs_base__rect_ie_u32__struct s) const; + inline bool contains(uint32_t x, uint32_t y) const; + inline bool contains_rect(wuffs_base__rect_ie_u32__struct s) const; + inline uint32_t width() const; + inline uint32_t height() const; #endif // __cplusplus } wuffs_base__rect_ie_u32; @@ -688,12 +692,12 @@ wuffs_base__make_rect_ie_u32(uint32_t min_incl_x, } static inline bool // -wuffs_base__rect_ie_u32__is_empty(wuffs_base__rect_ie_u32* r) { +wuffs_base__rect_ie_u32__is_empty(const wuffs_base__rect_ie_u32* r) { return (r->min_incl_x >= r->max_excl_x) || (r->min_incl_y >= r->max_excl_y); } static inline bool // -wuffs_base__rect_ie_u32__equals(wuffs_base__rect_ie_u32* r, +wuffs_base__rect_ie_u32__equals(const wuffs_base__rect_ie_u32* r, wuffs_base__rect_ie_u32 s) { return (r->min_incl_x == s.min_incl_x && r->min_incl_y == s.min_incl_y && r->max_excl_x == s.max_excl_x && r->max_excl_y == s.max_excl_y) || @@ -702,7 +706,7 @@ wuffs_base__rect_ie_u32__equals(wuffs_base__rect_ie_u32* r, } static inline wuffs_base__rect_ie_u32 // -wuffs_base__rect_ie_u32__intersect(wuffs_base__rect_ie_u32* r, +wuffs_base__rect_ie_u32__intersect(const wuffs_base__rect_ie_u32* r, wuffs_base__rect_ie_u32 s) { wuffs_base__rect_ie_u32 t; t.min_incl_x = wuffs_base__u32__max(r->min_incl_x, s.min_incl_x); @@ -713,7 +717,7 @@ wuffs_base__rect_ie_u32__intersect(wuffs_base__rect_ie_u32* r, } static inline wuffs_base__rect_ie_u32 // -wuffs_base__rect_ie_u32__unite(wuffs_base__rect_ie_u32* r, +wuffs_base__rect_ie_u32__unite(const wuffs_base__rect_ie_u32* r, wuffs_base__rect_ie_u32 s) { if (wuffs_base__rect_ie_u32__is_empty(r)) { return s; @@ -730,7 +734,7 @@ wuffs_base__rect_ie_u32__unite(wuffs_base__rect_ie_u32* r, } static inline bool // -wuffs_base__rect_ie_u32__contains(wuffs_base__rect_ie_u32* r, +wuffs_base__rect_ie_u32__contains(const wuffs_base__rect_ie_u32* r, uint32_t x, uint32_t y) { return (r->min_incl_x <= x) && (x < r->max_excl_x) && (r->min_incl_y <= y) && @@ -738,61 +742,61 @@ wuffs_base__rect_ie_u32__contains(wuffs_base__rect_ie_u32* r, } static inline bool // -wuffs_base__rect_ie_u32__contains_rect(wuffs_base__rect_ie_u32* r, +wuffs_base__rect_ie_u32__contains_rect(const wuffs_base__rect_ie_u32* r, wuffs_base__rect_ie_u32 s) { return wuffs_base__rect_ie_u32__equals( &s, wuffs_base__rect_ie_u32__intersect(r, s)); } static inline uint32_t // -wuffs_base__rect_ie_u32__width(wuffs_base__rect_ie_u32* r) { +wuffs_base__rect_ie_u32__width(const wuffs_base__rect_ie_u32* r) { return wuffs_base__u32__sat_sub(r->max_excl_x, r->min_incl_x); } static inline uint32_t // -wuffs_base__rect_ie_u32__height(wuffs_base__rect_ie_u32* r) { +wuffs_base__rect_ie_u32__height(const wuffs_base__rect_ie_u32* r) { 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() { +wuffs_base__rect_ie_u32::is_empty() const { return wuffs_base__rect_ie_u32__is_empty(this); } inline bool // -wuffs_base__rect_ie_u32::equals(wuffs_base__rect_ie_u32 s) { +wuffs_base__rect_ie_u32::equals(wuffs_base__rect_ie_u32 s) const { return wuffs_base__rect_ie_u32__equals(this, s); } inline wuffs_base__rect_ie_u32 // -wuffs_base__rect_ie_u32::intersect(wuffs_base__rect_ie_u32 s) { +wuffs_base__rect_ie_u32::intersect(wuffs_base__rect_ie_u32 s) const { return wuffs_base__rect_ie_u32__intersect(this, s); } inline wuffs_base__rect_ie_u32 // -wuffs_base__rect_ie_u32::unite(wuffs_base__rect_ie_u32 s) { +wuffs_base__rect_ie_u32::unite(wuffs_base__rect_ie_u32 s) const { return wuffs_base__rect_ie_u32__unite(this, s); } inline bool // -wuffs_base__rect_ie_u32::contains(uint32_t x, uint32_t y) { +wuffs_base__rect_ie_u32::contains(uint32_t x, uint32_t y) const { return wuffs_base__rect_ie_u32__contains(this, x, y); } inline bool // -wuffs_base__rect_ie_u32::contains_rect(wuffs_base__rect_ie_u32 s) { +wuffs_base__rect_ie_u32::contains_rect(wuffs_base__rect_ie_u32 s) const { return wuffs_base__rect_ie_u32__contains_rect(this, s); } inline uint32_t // -wuffs_base__rect_ie_u32::width() { +wuffs_base__rect_ie_u32::width() const { return wuffs_base__rect_ie_u32__width(this); } inline uint32_t // -wuffs_base__rect_ie_u32::height() { +wuffs_base__rect_ie_u32::height() const { return wuffs_base__rect_ie_u32__height(this); } diff --git a/internal/cgen/data.go b/internal/cgen/data.go index 9b91b5e1..79613d58 100644 --- a/internal/cgen/data.go +++ b/internal/cgen/data.go @@ -28,7 +28,7 @@ const baseImageImplC = "" + "2le(dst_palette.ptr + ((uint32_t)(s[0]) * 4)));\n wuffs_base__store_u32le(\n d + (1 * 4),\n wuffs_base__load_u32le(dst_palette.ptr + ((uint32_t)(s[1]) * 4)));\n wuffs_base__store_u32le(\n d + (2 * 4),\n wuffs_base__load_u32le(dst_palette.ptr + ((uint32_t)(s[2]) * 4)));\n wuffs_base__store_u32le(\n d + (3 * 4),\n wuffs_base__load_u32le(dst_palette.ptr + ((uint32_t)(s[3]) * 4)));\n\n s += 1 * N;\n d += 4 * N;\n n -= (size_t)(1 * N);\n }\n\n while (n >= 1) {\n wuffs_base__store_u32le(\n d + (0 * 4),\n wuffs_base__load_u32le(dst_palette.ptr + ((uint32_t)(s[0]) * 4)));\n\n s += 1 * 1;\n d += 4 * 1;\n n -= (size_t)(1 * 1);\n }\n\n return len;\n}\n\nstatic uint64_t //\nwuffs_base__pixel_swizzler__swap_rgbx_bgrx(wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 src) {\n size_t len4 = (dst.len < src.len ? dst.len : src.len) / 4;\n uint8_t* d = dst.ptr;\n uint8_t* s = src.ptr;\n\n size_t n = len4;\n while (n--) {\n uin" + "t8_t b0 = s[0];\n uint8_t b1 = s[1];\n uint8_t b2 = s[2];\n uint8_t b3 = s[3];\n d[0] = b2;\n d[1] = b1;\n d[2] = b0;\n d[3] = b3;\n s += 4;\n d += 4;\n }\n return len4 * 4;\n}\n\nvoid //\nwuffs_base__pixel_swizzler__prepare(wuffs_base__pixel_swizzler* p,\n wuffs_base__pixel_format dst_format,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__pixel_format src_format,\n wuffs_base__slice_u8 src_palette) {\n if (!p) {\n return;\n }\n\n // TODO: support many more formats.\n\n uint64_t (*func)(wuffs_base__slice_u8 dst, wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src) = NULL;\n\n switch (src_format) {\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY:\n switch (dst_format) {\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL:\n case WUFFS_BASE__PIXEL" + "_FORMAT__INDEXED__BGRA_BINARY:\n if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=\n 1024) {\n break;\n }\n func = wuffs_base__pixel_swizzler__copy_1_1;\n break;\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:\n if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=\n 1024) {\n break;\n }\n func = wuffs_base__pixel_swizzler__copy_4_1;\n break;\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:\n if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(dst_palette,\n src_palette) != 1024) {\n break;\n }\n func = wuffs_base__pixel_swizzler__copy_4_1;\n break;\n d" + - "efault:\n break;\n }\n break;\n\n default:\n break;\n }\n\n p->private_impl.func = func;\n}\n\nuint64_t //\nwuffs_base__pixel_swizzler__swizzle_packed(wuffs_base__pixel_swizzler* p,\n wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src) {\n if (p && p->private_impl.func) {\n return (*(p->private_impl.func))(dst, dst_palette, src);\n }\n return 0;\n}\n" + + "efault:\n break;\n }\n break;\n\n default:\n break;\n }\n\n p->private_impl.func = func;\n}\n\nuint64_t //\nwuffs_base__pixel_swizzler__swizzle_packed(const wuffs_base__pixel_swizzler* p,\n wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src) {\n if (p && p->private_impl.func) {\n return (*(p->private_impl.func))(dst, dst_palette, src);\n }\n return 0;\n}\n" + "" const baseCorePrivateH = "" + @@ -117,41 +117,42 @@ const baseImagePublicH = "" + "XEL_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 //\nwuffs_base__pixel_subsampling__bias_x(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 //\nwuffs_base__pixel_subsampling__shift_x(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 //\nwuffs_base__pixel_subsampling__bias_y(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 //\nwuffs_base__pixel_subsampling__shift_y(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 } private_impl;\n\n#ifdef __cplusplus\n inline void set(wuffs_base__pixel_format pixfmt,\n wuffs_base__pixel_subsampling pixsub,\n uint32_t width,\n uint32_t height);\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 uint64_t pixbuf_len();\n#endif // __cplusplus\n\n} wuffs_base__pixel_config;\n\nstatic inline wuffs_base__pixel_config //\nwuffs_base__null_pixel_config() {\n wuffs_base__pixel_config ret;\n ret.private_impl.pixfmt = 0;\n ret.private_impl.pixsub = 0;\n " + - "ret.private_impl.width = 0;\n ret.private_impl.height = 0;\n return ret;\n}\n\n// TODO: Should this function return bool? An error type?\nstatic inline void //\nwuffs_base__pixel_config__set(wuffs_base__pixel_config* c,\n wuffs_base__pixel_format pixfmt,\n wuffs_base__pixel_subsampling pixsub,\n uint32_t width,\n uint32_t height) {\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 return;\n }\n }\n\n c->private_impl.pixfmt = 0;\n c->private_impl.pixsub = 0;\n c->private_impl.width = 0;\n c->private_impl.height = 0;\n}\n\nstatic inline void //\nwuffs_base__pixel_config__invalidate(wuffs_base__pixel_config*" + - " c) {\n if (c) {\n c->private_impl.pixfmt = 0;\n c->private_impl.pixsub = 0;\n c->private_impl.width = 0;\n c->private_impl.height = 0;\n }\n}\n\nstatic inline bool //\nwuffs_base__pixel_config__is_valid(wuffs_base__pixel_config* c) {\n return c && c->private_impl.pixfmt;\n}\n\nstatic inline wuffs_base__pixel_format //\nwuffs_base__pixel_config__pixel_format(wuffs_base__pixel_config* c) {\n return c ? c->private_impl.pixfmt : 0;\n}\n\nstatic inline wuffs_base__pixel_subsampling //\nwuffs_base__pixel_config__pixel_subsampling(wuffs_base__pixel_config* c) {\n return c ? c->private_impl.pixsub : 0;\n}\n\nstatic inline wuffs_base__rect_ie_u32 //\nwuffs_base__pixel_config__bounds(wuffs_base__pixel_config* c) {\n if (c) {\n wuffs_base__rect_ie_u32 ret;\n ret.min_incl_x = 0;\n ret.min_incl_y = 0;\n ret.max_excl_x = c->private_impl.width;\n ret.max_excl_y = c->private_impl.height;\n return ret;\n }\n\n wuffs_base__rect_ie_u32 ret;\n ret.min_incl_x = 0;\n ret.min_incl_y = 0;\n ret.max_excl_x = 0;\n ret.max_excl" + - "_y = 0;\n return ret;\n}\n\nstatic inline uint32_t //\nwuffs_base__pixel_config__width(wuffs_base__pixel_config* c) {\n return c ? c->private_impl.width : 0;\n}\n\nstatic inline uint32_t //\nwuffs_base__pixel_config__height(wuffs_base__pixel_config* c) {\n return c ? c->private_impl.height : 0;\n}\n\n// TODO: this is the right API for planar (not packed) pixbufs? Should it allow\n// decoding into a color model different from the format's intrinsic one? For\n// example, decoding a JPEG image straight to RGBA instead of to YCbCr?\nstatic inline uint64_t //\nwuffs_base__pixel_config__pixbuf_len(wuffs_base__pixel_config* c) {\n if (!c) {\n return 0;\n }\n if (wuffs_base__pixel_format__is_planar(c->private_impl.pixfmt)) {\n // TODO: support planar pixel formats, concious of pixel subsampling.\n return 0;\n }\n uint32_t bits_per_pixel =\n wuffs_base__pixel_format__bits_per_pixel(c->private_impl.pixfmt);\n if ((bits_per_pixel == 0) || ((bits_per_pixel % 8) != 0)) {\n // TODO: support fraction-of-byte pixels, e.g. 1 " + - "bit per pixel?\n return 0;\n }\n uint64_t bytes_per_pixel = bits_per_pixel / 8;\n\n uint64_t n =\n ((uint64_t)c->private_impl.width) * ((uint64_t)c->private_impl.height);\n if (n > (UINT64_MAX / bytes_per_pixel)) {\n return 0;\n }\n n *= bytes_per_pixel;\n\n if (wuffs_base__pixel_format__is_indexed(c->private_impl.pixfmt)) {\n if (n > (UINT64_MAX - 1024)) {\n return 0;\n }\n n += 1024;\n }\n\n return n;\n}\n\n#ifdef __cplusplus\n\ninline void //\nwuffs_base__pixel_config::set(wuffs_base__pixel_format pixfmt,\n wuffs_base__pixel_subsampling pixsub,\n uint32_t width,\n uint32_t height) {\n wuffs_base__pixel_config__set(this, pixfmt, pixsub, width, height);\n}\n\ninline void //\nwuffs_base__pixel_config::invalidate() {\n wuffs_base__pixel_config__invalidate(this);\n}\n\ninline bool //\nwuffs_base__pixel_config::is_valid() {\n return wuffs_base__pixel_config__is_valid(this);\n}\n\ninline wuffs_base__pixel_format //\nwuffs_base__p" + - "ixel_config::pixel_format() {\n return wuffs_base__pixel_config__pixel_format(this);\n}\n\ninline wuffs_base__pixel_subsampling //\nwuffs_base__pixel_config::pixel_subsampling() {\n return wuffs_base__pixel_config__pixel_subsampling(this);\n}\n\ninline wuffs_base__rect_ie_u32 //\nwuffs_base__pixel_config::bounds() {\n return wuffs_base__pixel_config__bounds(this);\n}\n\ninline uint32_t //\nwuffs_base__pixel_config::width() {\n return wuffs_base__pixel_config__width(this);\n}\n\ninline uint32_t //\nwuffs_base__pixel_config::height() {\n return wuffs_base__pixel_config__height(this);\n}\n\ninline uint64_t //\nwuffs_base__pixel_config::pixbuf_len() {\n return wuffs_base__pixel_config__pixbuf_len(this);\n}\n\n#endif // __cplusplus\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 } private_impl;\n\n#ifdef __cplusplus\n inline void set(wuffs_base__pixel_format pixfmt,\n wuffs_base__pixel_subsampling pixsub,\n uint32_t width,\n uint32_t height);\n inline void invalidate();\n inline bool is_valid() const;\n inline wuffs_base__pixel_format pixel_format() const;\n inline wuffs_base__pixel_subsampling pixel_subsampling() const;\n inline wuffs_base__rect_ie_u32 bounds() const;\n inline uint32_t width() const;\n inline uint32_t height() const;\n inline uint64_t pixbuf_len() const;\n#endif // __cplusplus\n\n} wuffs_base__pixel_config;\n\nstatic inline wuffs_base__pixel_config //\nwuffs_base__null_pixel_config() {\n wuffs_base__pixel_config ret;\n ret.private_impl.pix" + + "fmt = 0;\n ret.private_impl.pixsub = 0;\n ret.private_impl.width = 0;\n ret.private_impl.height = 0;\n return ret;\n}\n\n// TODO: Should this function return bool? An error type?\nstatic inline void //\nwuffs_base__pixel_config__set(wuffs_base__pixel_config* c,\n wuffs_base__pixel_format pixfmt,\n wuffs_base__pixel_subsampling pixsub,\n uint32_t width,\n uint32_t height) {\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 return;\n }\n }\n\n c->private_impl.pixfmt = 0;\n c->private_impl.pixsub = 0;\n c->private_impl.width = 0;\n c->private_impl.height = 0;\n}\n\nstatic inline void //\nwuffs_base__pixel_co" + + "nfig__invalidate(wuffs_base__pixel_config* c) {\n if (c) {\n c->private_impl.pixfmt = 0;\n c->private_impl.pixsub = 0;\n c->private_impl.width = 0;\n c->private_impl.height = 0;\n }\n}\n\nstatic inline bool //\nwuffs_base__pixel_config__is_valid(const wuffs_base__pixel_config* c) {\n return c && c->private_impl.pixfmt;\n}\n\nstatic inline wuffs_base__pixel_format //\nwuffs_base__pixel_config__pixel_format(const wuffs_base__pixel_config* c) {\n return c ? c->private_impl.pixfmt : 0;\n}\n\nstatic inline wuffs_base__pixel_subsampling //\nwuffs_base__pixel_config__pixel_subsampling(const wuffs_base__pixel_config* c) {\n return c ? c->private_impl.pixsub : 0;\n}\n\nstatic inline wuffs_base__rect_ie_u32 //\nwuffs_base__pixel_config__bounds(const wuffs_base__pixel_config* c) {\n if (c) {\n wuffs_base__rect_ie_u32 ret;\n ret.min_incl_x = 0;\n ret.min_incl_y = 0;\n ret.max_excl_x = c->private_impl.width;\n ret.max_excl_y = c->private_impl.height;\n return ret;\n }\n\n wuffs_base__rect_ie_u32 ret;\n ret.min_incl" + + "_x = 0;\n ret.min_incl_y = 0;\n ret.max_excl_x = 0;\n ret.max_excl_y = 0;\n return ret;\n}\n\nstatic inline uint32_t //\nwuffs_base__pixel_config__width(const wuffs_base__pixel_config* c) {\n return c ? c->private_impl.width : 0;\n}\n\nstatic inline uint32_t //\nwuffs_base__pixel_config__height(const wuffs_base__pixel_config* c) {\n return c ? c->private_impl.height : 0;\n}\n\n// TODO: this is the right API for planar (not packed) pixbufs? Should it allow\n// decoding into a color model different from the format's intrinsic one? For\n// example, decoding a JPEG image straight to RGBA instead of to YCbCr?\nstatic inline uint64_t //\nwuffs_base__pixel_config__pixbuf_len(const wuffs_base__pixel_config* c) {\n if (!c) {\n return 0;\n }\n if (wuffs_base__pixel_format__is_planar(c->private_impl.pixfmt)) {\n // TODO: support planar pixel formats, concious of pixel subsampling.\n return 0;\n }\n uint32_t bits_per_pixel =\n wuffs_base__pixel_format__bits_per_pixel(c->private_impl.pixfmt);\n if ((bits_per_pixel == 0) || " + + "((bits_per_pixel % 8) != 0)) {\n // TODO: support fraction-of-byte pixels, e.g. 1 bit per pixel?\n return 0;\n }\n uint64_t bytes_per_pixel = bits_per_pixel / 8;\n\n uint64_t n =\n ((uint64_t)c->private_impl.width) * ((uint64_t)c->private_impl.height);\n if (n > (UINT64_MAX / bytes_per_pixel)) {\n return 0;\n }\n n *= bytes_per_pixel;\n\n if (wuffs_base__pixel_format__is_indexed(c->private_impl.pixfmt)) {\n if (n > (UINT64_MAX - 1024)) {\n return 0;\n }\n n += 1024;\n }\n\n return n;\n}\n\n#ifdef __cplusplus\n\ninline void //\nwuffs_base__pixel_config::set(wuffs_base__pixel_format pixfmt,\n wuffs_base__pixel_subsampling pixsub,\n uint32_t width,\n uint32_t height) {\n wuffs_base__pixel_config__set(this, pixfmt, pixsub, width, height);\n}\n\ninline void //\nwuffs_base__pixel_config::invalidate() {\n wuffs_base__pixel_config__invalidate(this);\n}\n\ninline bool //\nwuffs_base__pixel_config::is_valid() const {\n return wuff" + + "s_base__pixel_config__is_valid(this);\n}\n\ninline wuffs_base__pixel_format //\nwuffs_base__pixel_config::pixel_format() const {\n return wuffs_base__pixel_config__pixel_format(this);\n}\n\ninline wuffs_base__pixel_subsampling //\nwuffs_base__pixel_config::pixel_subsampling() const {\n return wuffs_base__pixel_config__pixel_subsampling(this);\n}\n\ninline wuffs_base__rect_ie_u32 //\nwuffs_base__pixel_config::bounds() const {\n return wuffs_base__pixel_config__bounds(this);\n}\n\ninline uint32_t //\nwuffs_base__pixel_config::width() const {\n return wuffs_base__pixel_config__width(this);\n}\n\ninline uint32_t //\nwuffs_base__pixel_config::height() const {\n return wuffs_base__pixel_config__height(this);\n}\n\ninline uint64_t //\nwuffs_base__pixel_config::pixbuf_len() const {\n return wuffs_base__pixel_config__pixbuf_len(this);\n}\n\n#endif // __cplusplus\n\n" + "" + - "// --------\n\ntypedef struct {\n wuffs_base__pixel_config pixcfg;\n\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 uint64_t first_frame_io_position;\n bool first_frame_is_opaque;\n } private_impl;\n\n#ifdef __cplusplus\n inline void set(wuffs_base__pixel_format pixfmt,\n wuffs_base__pixel_subsampling pixsub,\n uint32_t width,\n uint32_t height,\n uint64_t first_frame_io_position,\n bool first_frame_is_opaque);\n inline void invalidate();\n inline bool is_valid();\n inline uint64_t first_frame_io_position();\n inline bool first_frame_is_opaque();\n#endif // __cplusplus\n\n} wuffs_base__image_config;\n\nstatic inline wuffs_base__image_config //\nwuffs_base__null_image_config() {\n wuffs_base__image_config ret;\n ret.pixcfg = wuffs_base__null_pixel_config();\n ret.private_impl.first_frame_io_position = 0;\n ret.private_impl.first_frame_is_opaque" + - " = false;\n return ret;\n}\n\n// TODO: Should this function return bool? An error type?\nstatic inline void //\nwuffs_base__image_config__set(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 uint64_t first_frame_io_position,\n bool first_frame_is_opaque) {\n if (!c) {\n return;\n }\n if (wuffs_base__pixel_format__is_valid(pixfmt)) {\n c->pixcfg.private_impl.pixfmt = pixfmt;\n c->pixcfg.private_impl.pixsub = pixsub;\n c->pixcfg.private_impl.width = width;\n c->pixcfg.private_impl.height = height;\n c->private_impl.first_frame_io_position = first_frame_io_position;\n c->private_impl.first_frame_is_opaque = first_frame_is_opaque;\n return;\n }\n\n c->pixcfg.private_impl.pixfmt = 0;\n c->pixcfg.private_impl.pixsub = 0;\n c->pixcfg.private_impl.w" + - "idth = 0;\n c->pixcfg.private_impl.height = 0;\n c->private_impl.first_frame_io_position = 0;\n c->private_impl.first_frame_is_opaque = 0;\n}\n\nstatic inline void //\nwuffs_base__image_config__invalidate(wuffs_base__image_config* c) {\n if (c) {\n c->pixcfg.private_impl.pixfmt = 0;\n c->pixcfg.private_impl.pixsub = 0;\n c->pixcfg.private_impl.width = 0;\n c->pixcfg.private_impl.height = 0;\n c->private_impl.first_frame_io_position = 0;\n c->private_impl.first_frame_is_opaque = 0;\n }\n}\n\nstatic inline bool //\nwuffs_base__image_config__is_valid(wuffs_base__image_config* c) {\n return c && wuffs_base__pixel_config__is_valid(&(c->pixcfg));\n}\n\nstatic inline uint64_t //\nwuffs_base__image_config__first_frame_io_position(wuffs_base__image_config* c) {\n return c ? c->private_impl.first_frame_io_position : 0;\n}\n\nstatic inline bool //\nwuffs_base__image_config__first_frame_is_opaque(wuffs_base__image_config* c) {\n return c ? c->private_impl.first_frame_is_opaque : false;\n}\n\n#ifdef __cplusplus\n\ninline void " + - " //\nwuffs_base__image_config::set(wuffs_base__pixel_format pixfmt,\n wuffs_base__pixel_subsampling pixsub,\n uint32_t width,\n uint32_t height,\n uint64_t first_frame_io_position,\n bool first_frame_is_opaque) {\n wuffs_base__image_config__set(this, pixfmt, pixsub, width, height,\n first_frame_io_position, first_frame_is_opaque);\n}\n\ninline void //\nwuffs_base__image_config::invalidate() {\n wuffs_base__image_config__invalidate(this);\n}\n\ninline bool //\nwuffs_base__image_config::is_valid() {\n return wuffs_base__image_config__is_valid(this);\n}\n\ninline uint64_t //\nwuffs_base__image_config::first_frame_io_position() {\n return wuffs_base__image_config__first_frame_io_position(this);\n}\n\ninline bool //\nwuffs_base__image_config::first_frame_is_opaque() {\n return wuffs_base__image_config__first_frame_is_opaque(this);\n}\n\n#endif // __cplusplus\n\n" + + "// --------\n\ntypedef struct {\n wuffs_base__pixel_config pixcfg;\n\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 uint64_t first_frame_io_position;\n bool first_frame_is_opaque;\n } private_impl;\n\n#ifdef __cplusplus\n inline void set(wuffs_base__pixel_format pixfmt,\n wuffs_base__pixel_subsampling pixsub,\n uint32_t width,\n uint32_t height,\n uint64_t first_frame_io_position,\n bool first_frame_is_opaque);\n inline void invalidate();\n inline bool is_valid() const;\n inline uint64_t first_frame_io_position() const;\n inline bool first_frame_is_opaque() const;\n#endif // __cplusplus\n\n} wuffs_base__image_config;\n\nstatic inline wuffs_base__image_config //\nwuffs_base__null_image_config() {\n wuffs_base__image_config ret;\n ret.pixcfg = wuffs_base__null_pixel_config();\n ret.private_impl.first_frame_io_position = 0;\n ret.private_impl.fir" + + "st_frame_is_opaque = false;\n return ret;\n}\n\n// TODO: Should this function return bool? An error type?\nstatic inline void //\nwuffs_base__image_config__set(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 uint64_t first_frame_io_position,\n bool first_frame_is_opaque) {\n if (!c) {\n return;\n }\n if (wuffs_base__pixel_format__is_valid(pixfmt)) {\n c->pixcfg.private_impl.pixfmt = pixfmt;\n c->pixcfg.private_impl.pixsub = pixsub;\n c->pixcfg.private_impl.width = width;\n c->pixcfg.private_impl.height = height;\n c->private_impl.first_frame_io_position = first_frame_io_position;\n c->private_impl.first_frame_is_opaque = first_frame_is_opaque;\n return;\n }\n\n c->pixcfg.private_impl.pixfmt = 0;\n c->pixcfg.private_impl.pixsub = 0;\n c->pix" + + "cfg.private_impl.width = 0;\n c->pixcfg.private_impl.height = 0;\n c->private_impl.first_frame_io_position = 0;\n c->private_impl.first_frame_is_opaque = 0;\n}\n\nstatic inline void //\nwuffs_base__image_config__invalidate(wuffs_base__image_config* c) {\n if (c) {\n c->pixcfg.private_impl.pixfmt = 0;\n c->pixcfg.private_impl.pixsub = 0;\n c->pixcfg.private_impl.width = 0;\n c->pixcfg.private_impl.height = 0;\n c->private_impl.first_frame_io_position = 0;\n c->private_impl.first_frame_is_opaque = 0;\n }\n}\n\nstatic inline bool //\nwuffs_base__image_config__is_valid(const wuffs_base__image_config* c) {\n return c && wuffs_base__pixel_config__is_valid(&(c->pixcfg));\n}\n\nstatic inline uint64_t //\nwuffs_base__image_config__first_frame_io_position(\n const wuffs_base__image_config* c) {\n return c ? c->private_impl.first_frame_io_position : 0;\n}\n\nstatic inline bool //\nwuffs_base__image_config__first_frame_is_opaque(\n const wuffs_base__image_config* c) {\n return c ? c->private_impl.first_frame_is_opaqu" + + "e : false;\n}\n\n#ifdef __cplusplus\n\ninline void //\nwuffs_base__image_config::set(wuffs_base__pixel_format pixfmt,\n wuffs_base__pixel_subsampling pixsub,\n uint32_t width,\n uint32_t height,\n uint64_t first_frame_io_position,\n bool first_frame_is_opaque) {\n wuffs_base__image_config__set(this, pixfmt, pixsub, width, height,\n first_frame_io_position, first_frame_is_opaque);\n}\n\ninline void //\nwuffs_base__image_config::invalidate() {\n wuffs_base__image_config__invalidate(this);\n}\n\ninline bool //\nwuffs_base__image_config::is_valid() const {\n return wuffs_base__image_config__is_valid(this);\n}\n\ninline uint64_t //\nwuffs_base__image_config::first_frame_io_position() const {\n return wuffs_base__image_config__first_frame_io_position(this);\n}\n\ninline bool //\nwuffs_base__image_config::first_frame_is_opaque() const {\n return wuffs_base__image_co" + + "nfig__first_frame_is_opaque(this);\n}\n\n#endif // __cplusplus\n\n" + "" + "// --------\n\n// wuffs_base__animation_blend encodes, for an animated image, how to blend the\n// transparent pixels of this frame with the existing canvas. In Porter-Duff\n// compositing operator terminology:\n// - 0 means the frame may be transparent, and should be blended \"src over\n// dst\", also known as just \"over\".\n// - 1 means the frame may be transparent, and should be blended \"src\".\n// - 2 means the frame is completely opaque, so that \"src over dst\" and \"src\"\n// are equivalent.\n//\n// These semantics are conservative. It is valid for a completely opaque frame\n// to have a blend value other than 2.\ntypedef uint8_t wuffs_base__animation_blend;\n\n#define WUFFS_BASE__ANIMATION_BLEND__SRC_OVER_DST \\\n ((wuffs_base__animation_blend)0)\n#define WUFFS_BASE__ANIMATION_BLEND__SRC ((wuffs_base__animation_blend)1)\n#define WUFFS_BASE__ANIMATION_BLEND__OPAQUE ((wuffs_base__animation_blend)2)\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__rect_ie_u32 bounds;\n wuffs_base__flicks duration;\n uint64_t index;\n uint64_t io_position;\n wuffs_base__animation_blend blend;\n wuffs_base__animation_disposal disposal;\n } private_impl;\n\n#ifdef __cplusplus\n inline void update(wuffs_base__rect_ie_u32 bounds,\n wuffs_base__flicks duration,\n uint64_t index,\n uint64_t io_position,\n wuffs_base__animation_blend blend,\n wuffs_base__animation_disposal disposal);\n inline wuffs_base__rect_ie_u32 bounds();\n inline uint32_t width();\n inline uint32_t height();\n inline wuffs_base__flicks duration();\n inline uint64_t index();\n inline uint64_t io_position();\n inline wuffs_base__animation_blend blend();\n inline wuffs_base__animation_disposal disposal();\n#endif // __cpluspl" + - "us\n\n} wuffs_base__frame_config;\n\nstatic inline wuffs_base__frame_config //\nwuffs_base__null_frame_config() {\n wuffs_base__frame_config ret;\n ret.private_impl.bounds = wuffs_base__make_rect_ie_u32(0, 0, 0, 0);\n ret.private_impl.duration = 0;\n ret.private_impl.index = 0;\n ret.private_impl.io_position = 0;\n ret.private_impl.blend = 0;\n ret.private_impl.disposal = 0;\n return ret;\n}\n\nstatic inline void //\nwuffs_base__frame_config__update(wuffs_base__frame_config* c,\n wuffs_base__rect_ie_u32 bounds,\n wuffs_base__flicks duration,\n uint64_t index,\n uint64_t io_position,\n wuffs_base__animation_blend blend,\n wuffs_base__animation_disposal disposal) {\n if (!c) {\n return;\n }\n\n c->private_impl.bounds = bounds;\n c->private_impl.duration = duration;\n c->private_impl.index = index;\n c->private_impl.io_position = io_po" + - "sition;\n c->private_impl.blend = blend;\n c->private_impl.disposal = disposal;\n}\n\nstatic inline wuffs_base__rect_ie_u32 //\nwuffs_base__frame_config__bounds(wuffs_base__frame_config* c) {\n if (c) {\n return c->private_impl.bounds;\n }\n\n wuffs_base__rect_ie_u32 ret;\n ret.min_incl_x = 0;\n ret.min_incl_y = 0;\n ret.max_excl_x = 0;\n ret.max_excl_y = 0;\n return ret;\n}\n\nstatic inline uint32_t //\nwuffs_base__frame_config__width(wuffs_base__frame_config* c) {\n return c ? wuffs_base__rect_ie_u32__width(&c->private_impl.bounds) : 0;\n}\n\nstatic inline uint32_t //\nwuffs_base__frame_config__height(wuffs_base__frame_config* c) {\n return c ? wuffs_base__rect_ie_u32__height(&c->private_impl.bounds) : 0;\n}\n\n// wuffs_base__frame_config__duration returns the amount of time to display\n// this frame. Zero means to display forever - a still (non-animated) image.\nstatic inline wuffs_base__flicks //\nwuffs_base__frame_config__duration(wuffs_base__frame_config* c) {\n return c ? c->private_impl.duration : 0;\n}\n\n// wuffs_b" + - "ase__frame_config__index returns the index of this frame. The first\n// frame in an image has index 0, the second frame has index 1, and so on.\nstatic inline uint64_t //\nwuffs_base__frame_config__index(wuffs_base__frame_config* c) {\n return c ? c->private_impl.index : 0;\n}\n\n// wuffs_base__frame_config__io_position returns the I/O stream position before\n// the frame config.\nstatic inline uint64_t //\nwuffs_base__frame_config__io_position(wuffs_base__frame_config* c) {\n return c ? c->private_impl.io_position : 0;\n}\n\n// wuffs_base__frame_config__blend returns, for an animated image, how to blend\n// the transparent pixels of this frame with the existing canvas.\nstatic inline wuffs_base__animation_blend //\nwuffs_base__frame_config__blend(wuffs_base__frame_config* c) {\n return c ? c->private_impl.blend : 0;\n}\n\n// wuffs_base__frame_config__disposal returns, for an animated image, how to\n// dispose of this frame after displaying it.\nstatic inline wuffs_base__animation_disposal //\nwuffs_base__frame_config__dispos" + - "al(wuffs_base__frame_config* c) {\n return c ? c->private_impl.disposal : 0;\n}\n\n#ifdef __cplusplus\n\ninline void //\nwuffs_base__frame_config::update(wuffs_base__rect_ie_u32 bounds,\n wuffs_base__flicks duration,\n uint64_t index,\n uint64_t io_position,\n wuffs_base__animation_blend blend,\n wuffs_base__animation_disposal disposal) {\n wuffs_base__frame_config__update(this, bounds, duration, index, io_position,\n blend, disposal);\n}\n\ninline wuffs_base__rect_ie_u32 //\nwuffs_base__frame_config::bounds() {\n return wuffs_base__frame_config__bounds(this);\n}\n\ninline uint32_t //\nwuffs_base__frame_config::width() {\n return wuffs_base__frame_config__width(this);\n}\n\ninline uint32_t //\nwuffs_base__frame_config::height() {\n return wuffs_base__frame_config__height(this);\n}\n\ninline wuffs_base__flicks //\nwuffs_base__frame_config::du" + - "ration() {\n return wuffs_base__frame_config__duration(this);\n}\n\ninline uint64_t //\nwuffs_base__frame_config::index() {\n return wuffs_base__frame_config__index(this);\n}\n\ninline uint64_t //\nwuffs_base__frame_config::io_position() {\n return wuffs_base__frame_config__io_position(this);\n}\n\ninline wuffs_base__animation_blend //\nwuffs_base__frame_config::blend() {\n return wuffs_base__frame_config__blend(this);\n}\n\ninline wuffs_base__animation_disposal //\nwuffs_base__frame_config::disposal() {\n return wuffs_base__frame_config__disposal(this);\n}\n\n#endif // __cplusplus\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__rect_ie_u32 bounds;\n wuffs_base__flicks duration;\n uint64_t index;\n uint64_t io_position;\n wuffs_base__animation_blend blend;\n wuffs_base__animation_disposal disposal;\n } private_impl;\n\n#ifdef __cplusplus\n inline void update(wuffs_base__rect_ie_u32 bounds,\n wuffs_base__flicks duration,\n uint64_t index,\n uint64_t io_position,\n wuffs_base__animation_blend blend,\n wuffs_base__animation_disposal disposal);\n inline wuffs_base__rect_ie_u32 bounds() const;\n inline uint32_t width() const;\n inline uint32_t height() const;\n inline wuffs_base__flicks duration() const;\n inline uint64_t index() const;\n inline uint64_t io_position() const;\n inline wuffs_base__animation_blend blend() const;\n inline wuffs_base__animation" + + "_disposal disposal() const;\n#endif // __cplusplus\n\n} wuffs_base__frame_config;\n\nstatic inline wuffs_base__frame_config //\nwuffs_base__null_frame_config() {\n wuffs_base__frame_config ret;\n ret.private_impl.bounds = wuffs_base__make_rect_ie_u32(0, 0, 0, 0);\n ret.private_impl.duration = 0;\n ret.private_impl.index = 0;\n ret.private_impl.io_position = 0;\n ret.private_impl.blend = 0;\n ret.private_impl.disposal = 0;\n return ret;\n}\n\nstatic inline void //\nwuffs_base__frame_config__update(wuffs_base__frame_config* c,\n wuffs_base__rect_ie_u32 bounds,\n wuffs_base__flicks duration,\n uint64_t index,\n uint64_t io_position,\n wuffs_base__animation_blend blend,\n wuffs_base__animation_disposal disposal) {\n if (!c) {\n return;\n }\n\n c->private_impl.bounds = bounds;\n c->private_impl.duration = duration;\n c->private_impl.inde" + + "x = index;\n c->private_impl.io_position = io_position;\n c->private_impl.blend = blend;\n c->private_impl.disposal = disposal;\n}\n\nstatic inline wuffs_base__rect_ie_u32 //\nwuffs_base__frame_config__bounds(const wuffs_base__frame_config* c) {\n if (c) {\n return c->private_impl.bounds;\n }\n\n wuffs_base__rect_ie_u32 ret;\n ret.min_incl_x = 0;\n ret.min_incl_y = 0;\n ret.max_excl_x = 0;\n ret.max_excl_y = 0;\n return ret;\n}\n\nstatic inline uint32_t //\nwuffs_base__frame_config__width(const wuffs_base__frame_config* c) {\n return c ? wuffs_base__rect_ie_u32__width(&c->private_impl.bounds) : 0;\n}\n\nstatic inline uint32_t //\nwuffs_base__frame_config__height(const wuffs_base__frame_config* c) {\n return c ? wuffs_base__rect_ie_u32__height(&c->private_impl.bounds) : 0;\n}\n\n// wuffs_base__frame_config__duration returns the amount of time to display\n// this frame. Zero means to display forever - a still (non-animated) image.\nstatic inline wuffs_base__flicks //\nwuffs_base__frame_config__duration(const wuffs_base__fra" + + "me_config* c) {\n return c ? c->private_impl.duration : 0;\n}\n\n// wuffs_base__frame_config__index returns the index of this frame. The first\n// frame in an image has index 0, the second frame has index 1, and so on.\nstatic inline uint64_t //\nwuffs_base__frame_config__index(const wuffs_base__frame_config* c) {\n return c ? c->private_impl.index : 0;\n}\n\n// wuffs_base__frame_config__io_position returns the I/O stream position before\n// the frame config.\nstatic inline uint64_t //\nwuffs_base__frame_config__io_position(const wuffs_base__frame_config* c) {\n return c ? c->private_impl.io_position : 0;\n}\n\n// wuffs_base__frame_config__blend returns, for an animated image, how to blend\n// the transparent pixels of this frame with the existing canvas.\nstatic inline wuffs_base__animation_blend //\nwuffs_base__frame_config__blend(const wuffs_base__frame_config* c) {\n return c ? c->private_impl.blend : 0;\n}\n\n// wuffs_base__frame_config__disposal returns, for an animated image, how to\n// dispose of this frame after displa" + + "ying it.\nstatic inline wuffs_base__animation_disposal //\nwuffs_base__frame_config__disposal(const wuffs_base__frame_config* c) {\n return c ? c->private_impl.disposal : 0;\n}\n\n#ifdef __cplusplus\n\ninline void //\nwuffs_base__frame_config::update(wuffs_base__rect_ie_u32 bounds,\n wuffs_base__flicks duration,\n uint64_t index,\n uint64_t io_position,\n wuffs_base__animation_blend blend,\n wuffs_base__animation_disposal disposal) {\n wuffs_base__frame_config__update(this, bounds, duration, index, io_position,\n blend, disposal);\n}\n\ninline wuffs_base__rect_ie_u32 //\nwuffs_base__frame_config::bounds() const {\n return wuffs_base__frame_config__bounds(this);\n}\n\ninline uint32_t //\nwuffs_base__frame_config::width() const {\n return wuffs_base__frame_config__width(this);\n}\n\ninline uint32_t //\nwuffs_base__frame_config::height() cons" + + "t {\n return wuffs_base__frame_config__height(this);\n}\n\ninline wuffs_base__flicks //\nwuffs_base__frame_config::duration() const {\n return wuffs_base__frame_config__duration(this);\n}\n\ninline uint64_t //\nwuffs_base__frame_config::index() const {\n return wuffs_base__frame_config__index(this);\n}\n\ninline uint64_t //\nwuffs_base__frame_config::io_position() const {\n return wuffs_base__frame_config__io_position(this);\n}\n\ninline wuffs_base__animation_blend //\nwuffs_base__frame_config::blend() const {\n return wuffs_base__frame_config__blend(this);\n}\n\ninline wuffs_base__animation_disposal //\nwuffs_base__frame_config::disposal() const {\n return wuffs_base__frame_config__disposal(this);\n}\n\n#endif // __cplusplus\n\n" + "" + - "// --------\n\ntypedef struct {\n wuffs_base__pixel_config pixcfg;\n\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__table_u8 planes[WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX];\n // TODO: color spaces.\n } private_impl;\n\n#ifdef __cplusplus\n inline wuffs_base__status set_from_slice(wuffs_base__pixel_config* pixcfg,\n wuffs_base__slice_u8 pixbuf_memory);\n inline wuffs_base__slice_u8 palette();\n inline wuffs_base__pixel_format pixel_format();\n inline wuffs_base__table_u8 plane(uint32_t p);\n#endif // __cplusplus\n\n} wuffs_base__pixel_buffer;\n\nstatic inline wuffs_base__pixel_buffer //\nwuffs_base__null_pixel_buffer() {\n wuffs_base__pixel_buffer ret;\n ret.pixcfg = wuffs_base__null_pixel_config();\n ret.private_impl.planes[0] = wuffs_base__null_table_u8();\n ret.private_impl.planes[1] = wuffs_base__null_table_u8();\n ret.private_impl.planes[2] = wuffs_base__null_tabl" + - "e_u8();\n ret.private_impl.planes[3] = wuffs_base__null_table_u8();\n return ret;\n}\n\nstatic inline wuffs_base__status //\nwuffs_base__pixel_buffer__set_from_slice(wuffs_base__pixel_buffer* b,\n wuffs_base__pixel_config* pixcfg,\n wuffs_base__slice_u8 pixbuf_memory) {\n if (!b) {\n return wuffs_base__error__bad_receiver;\n }\n memset(b, 0, sizeof(*b));\n if (!pixcfg) {\n return wuffs_base__error__bad_argument;\n }\n if (wuffs_base__pixel_format__is_planar(pixcfg->private_impl.pixfmt)) {\n // TODO: support planar pixel formats, concious of pixel subsampling.\n return wuffs_base__error__bad_argument;\n }\n uint32_t bits_per_pixel =\n wuffs_base__pixel_format__bits_per_pixel(pixcfg->private_impl.pixfmt);\n if ((bits_per_pixel == 0) || ((bits_per_pixel % 8) != 0)) {\n return wuffs_base__error__bad_argument;\n }\n uint64_t bytes_per_pixel = bits_per_pixel / 8;\n\n uint8_t* ptr = pixbuf_memory.ptr;\n uint64_t len = pixbuf_memo" + - "ry.len;\n if (wuffs_base__pixel_format__is_indexed(pixcfg->private_impl.pixfmt)) {\n // Split a 1024 byte chunk (256 palette entries × 4 bytes per entry) from\n // the start of pixbuf_memory. We split from the start, not the end, so\n // that the both chunks' pointers have the same alignment as the original\n // pointer, up to an alignment of 1024.\n if (len < 1024) {\n return wuffs_base__error__bad_argument_length_too_short;\n }\n wuffs_base__table_u8* tab =\n &b->private_impl.planes[WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE];\n tab->ptr = ptr;\n tab->width = 1024;\n tab->height = 1;\n tab->stride = 1024;\n ptr += 1024;\n len -= 1024;\n }\n\n uint64_t wh = ((uint64_t)pixcfg->private_impl.width) *\n ((uint64_t)pixcfg->private_impl.height);\n size_t width = (size_t)(pixcfg->private_impl.width);\n if ((wh > (UINT64_MAX / bytes_per_pixel)) ||\n (width > (SIZE_MAX / bytes_per_pixel))) {\n return wuffs_base__error__bad_argument;\n }\n wh *= bytes_per_pix" + - "el;\n width *= bytes_per_pixel;\n if (wh > len) {\n return wuffs_base__error__bad_argument_length_too_short;\n }\n\n b->pixcfg = *pixcfg;\n wuffs_base__table_u8* tab = &b->private_impl.planes[0];\n tab->ptr = ptr;\n tab->width = width;\n tab->height = pixcfg->private_impl.height;\n tab->stride = width;\n return NULL;\n}\n\n// wuffs_base__pixel_buffer__palette returns the palette color data. If\n// non-empty, it will have length 1024.\nstatic inline wuffs_base__slice_u8 //\nwuffs_base__pixel_buffer__palette(wuffs_base__pixel_buffer* b) {\n if (b &&\n wuffs_base__pixel_format__is_indexed(b->pixcfg.private_impl.pixfmt)) {\n wuffs_base__table_u8* tab =\n &b->private_impl.planes[WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE];\n if ((tab->width == 1024) && (tab->height == 1)) {\n return wuffs_base__make_slice_u8(tab->ptr, 1024);\n }\n }\n return wuffs_base__make_slice_u8(NULL, 0);\n}\n\nstatic inline wuffs_base__pixel_format //\nwuffs_base__pixel_buffer__pixel_format(wuffs_base__pixel_buffer* b) {\n i" + - "f (b) {\n return b->pixcfg.private_impl.pixfmt;\n }\n return WUFFS_BASE__PIXEL_FORMAT__INVALID;\n}\n\nstatic inline wuffs_base__table_u8 //\nwuffs_base__pixel_buffer__plane(wuffs_base__pixel_buffer* b, uint32_t p) {\n if (b && (p < WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX)) {\n return b->private_impl.planes[p];\n }\n\n wuffs_base__table_u8 ret;\n ret.ptr = NULL;\n ret.width = 0;\n ret.height = 0;\n ret.stride = 0;\n return ret;\n}\n\n#ifdef __cplusplus\n\ninline wuffs_base__status //\nwuffs_base__pixel_buffer::set_from_slice(wuffs_base__pixel_config* pixcfg,\n wuffs_base__slice_u8 pixbuf_memory) {\n return wuffs_base__pixel_buffer__set_from_slice(this, pixcfg, pixbuf_memory);\n}\n\ninline wuffs_base__slice_u8 //\nwuffs_base__pixel_buffer::palette() {\n return wuffs_base__pixel_buffer__palette(this);\n}\n\ninline wuffs_base__pixel_format //\nwuffs_base__pixel_buffer::pixel_format() {\n return wuffs_base__pixel_buffer__pixel_format(this);\n}\n\ninline wuffs_base__table_u8 //\nwuffs_base" + - "__pixel_buffer::plane(uint32_t p) {\n return wuffs_base__pixel_buffer__plane(this, p);\n}\n\n#endif // __cplusplus\n\n" + + "// --------\n\ntypedef struct {\n wuffs_base__pixel_config pixcfg;\n\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__table_u8 planes[WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX];\n // TODO: color spaces.\n } private_impl;\n\n#ifdef __cplusplus\n inline wuffs_base__status set_from_slice(wuffs_base__pixel_config* pixcfg,\n wuffs_base__slice_u8 pixbuf_memory);\n inline wuffs_base__slice_u8 palette();\n inline wuffs_base__pixel_format pixel_format() const;\n inline wuffs_base__table_u8 plane(uint32_t p);\n#endif // __cplusplus\n\n} wuffs_base__pixel_buffer;\n\nstatic inline wuffs_base__pixel_buffer //\nwuffs_base__null_pixel_buffer() {\n wuffs_base__pixel_buffer ret;\n ret.pixcfg = wuffs_base__null_pixel_config();\n ret.private_impl.planes[0] = wuffs_base__null_table_u8();\n ret.private_impl.planes[1] = wuffs_base__null_table_u8();\n ret.private_impl.planes[2] = wuffs_base__nul" + + "l_table_u8();\n ret.private_impl.planes[3] = wuffs_base__null_table_u8();\n return ret;\n}\n\nstatic inline wuffs_base__status //\nwuffs_base__pixel_buffer__set_from_slice(wuffs_base__pixel_buffer* b,\n wuffs_base__pixel_config* pixcfg,\n wuffs_base__slice_u8 pixbuf_memory) {\n if (!b) {\n return wuffs_base__error__bad_receiver;\n }\n memset(b, 0, sizeof(*b));\n if (!pixcfg) {\n return wuffs_base__error__bad_argument;\n }\n if (wuffs_base__pixel_format__is_planar(pixcfg->private_impl.pixfmt)) {\n // TODO: support planar pixel formats, concious of pixel subsampling.\n return wuffs_base__error__bad_argument;\n }\n uint32_t bits_per_pixel =\n wuffs_base__pixel_format__bits_per_pixel(pixcfg->private_impl.pixfmt);\n if ((bits_per_pixel == 0) || ((bits_per_pixel % 8) != 0)) {\n return wuffs_base__error__bad_argument;\n }\n uint64_t bytes_per_pixel = bits_per_pixel / 8;\n\n uint8_t* ptr = pixbuf_memory.ptr;\n uint64_t len = pixbu" + + "f_memory.len;\n if (wuffs_base__pixel_format__is_indexed(pixcfg->private_impl.pixfmt)) {\n // Split a 1024 byte chunk (256 palette entries × 4 bytes per entry) from\n // the start of pixbuf_memory. We split from the start, not the end, so\n // that the both chunks' pointers have the same alignment as the original\n // pointer, up to an alignment of 1024.\n if (len < 1024) {\n return wuffs_base__error__bad_argument_length_too_short;\n }\n wuffs_base__table_u8* tab =\n &b->private_impl.planes[WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE];\n tab->ptr = ptr;\n tab->width = 1024;\n tab->height = 1;\n tab->stride = 1024;\n ptr += 1024;\n len -= 1024;\n }\n\n uint64_t wh = ((uint64_t)pixcfg->private_impl.width) *\n ((uint64_t)pixcfg->private_impl.height);\n size_t width = (size_t)(pixcfg->private_impl.width);\n if ((wh > (UINT64_MAX / bytes_per_pixel)) ||\n (width > (SIZE_MAX / bytes_per_pixel))) {\n return wuffs_base__error__bad_argument;\n }\n wh *= bytes_p" + + "er_pixel;\n width *= bytes_per_pixel;\n if (wh > len) {\n return wuffs_base__error__bad_argument_length_too_short;\n }\n\n b->pixcfg = *pixcfg;\n wuffs_base__table_u8* tab = &b->private_impl.planes[0];\n tab->ptr = ptr;\n tab->width = width;\n tab->height = pixcfg->private_impl.height;\n tab->stride = width;\n return NULL;\n}\n\n// wuffs_base__pixel_buffer__palette returns the palette color data. If\n// non-empty, it will have length 1024.\nstatic inline wuffs_base__slice_u8 //\nwuffs_base__pixel_buffer__palette(wuffs_base__pixel_buffer* b) {\n if (b &&\n wuffs_base__pixel_format__is_indexed(b->pixcfg.private_impl.pixfmt)) {\n wuffs_base__table_u8* tab =\n &b->private_impl.planes[WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE];\n if ((tab->width == 1024) && (tab->height == 1)) {\n return wuffs_base__make_slice_u8(tab->ptr, 1024);\n }\n }\n return wuffs_base__make_slice_u8(NULL, 0);\n}\n\nstatic inline wuffs_base__pixel_format //\nwuffs_base__pixel_buffer__pixel_format(const wuffs_base__pixel_buff" + + "er* b) {\n if (b) {\n return b->pixcfg.private_impl.pixfmt;\n }\n return WUFFS_BASE__PIXEL_FORMAT__INVALID;\n}\n\nstatic inline wuffs_base__table_u8 //\nwuffs_base__pixel_buffer__plane(wuffs_base__pixel_buffer* b, uint32_t p) {\n if (b && (p < WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX)) {\n return b->private_impl.planes[p];\n }\n\n wuffs_base__table_u8 ret;\n ret.ptr = NULL;\n ret.width = 0;\n ret.height = 0;\n ret.stride = 0;\n return ret;\n}\n\n#ifdef __cplusplus\n\ninline wuffs_base__status //\nwuffs_base__pixel_buffer::set_from_slice(wuffs_base__pixel_config* pixcfg,\n wuffs_base__slice_u8 pixbuf_memory) {\n return wuffs_base__pixel_buffer__set_from_slice(this, pixcfg, pixbuf_memory);\n}\n\ninline wuffs_base__slice_u8 //\nwuffs_base__pixel_buffer::palette() {\n return wuffs_base__pixel_buffer__palette(this);\n}\n\ninline wuffs_base__pixel_format //\nwuffs_base__pixel_buffer::pixel_format() const {\n return wuffs_base__pixel_buffer__pixel_format(this);\n}\n\ninline wuffs_base__table" + + "_u8 //\nwuffs_base__pixel_buffer::plane(uint32_t p) {\n return wuffs_base__pixel_buffer__plane(this, p);\n}\n\n#endif // __cplusplus\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 uint8_t TODO;\n } private_impl;\n\n#ifdef __cplusplus\n#endif // __cplusplus\n\n} wuffs_base__decode_frame_options;\n\n#ifdef __cplusplus\n\n#endif // __cplusplus\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 // TODO: should the func type take restrict pointers?\n uint64_t (*func)(wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src);\n } private_impl;\n\n#ifdef __cplusplus\n inline void prepare(wuffs_base__pixel_format dst_format,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__pixel_format src_format,\n wuffs_base__slice_u8 src_palette);\n inline uint64_t swizzle_packed(wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src);\n#endif // __cplusplus\n\n} wuffs_base__pixel_swizzler;\n\n// TODO: should prepare (both the C and C++ methods) return a status?\n\nvoid //\nwuffs_base__pixel_swizzler__prepare(wuffs_base__pixel_swi" + - "zzler* p,\n wuffs_base__pixel_format dst_format,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__pixel_format src_format,\n wuffs_base__slice_u8 src_palette);\n\nuint64_t //\nwuffs_base__pixel_swizzler__swizzle_packed(wuffs_base__pixel_swizzler* p,\n wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src);\n\n#ifdef __cplusplus\n\ninline void //\nwuffs_base__pixel_swizzler::prepare(wuffs_base__pixel_format dst_format,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__pixel_format src_format,\n wuffs_base__slice_u8 src_palette) {\n wuffs_base__pixel_swizzler__prepare(this, dst_format, dst_palette, src_format,\n " + - " src_palette);\n}\n\nuint64_t //\nwuffs_base__pixel_swizzler::swizzle_packed(wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src) {\n return wuffs_base__pixel_swizzler__swizzle_packed(this, dst, dst_palette,\n src);\n}\n\n#endif // __cplusplus\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 // TODO: should the func type take restrict pointers?\n uint64_t (*func)(wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src);\n } private_impl;\n\n#ifdef __cplusplus\n inline void prepare(wuffs_base__pixel_format dst_format,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__pixel_format src_format,\n wuffs_base__slice_u8 src_palette);\n inline uint64_t swizzle_packed(wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src) const;\n#endif // __cplusplus\n\n} wuffs_base__pixel_swizzler;\n\n// TODO: should prepare (both the C and C++ methods) return a status?\n\nvoid //\nwuffs_base__pixel_swizzler__prepare(wuffs_base__pix" + + "el_swizzler* p,\n wuffs_base__pixel_format dst_format,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__pixel_format src_format,\n wuffs_base__slice_u8 src_palette);\n\nuint64_t //\nwuffs_base__pixel_swizzler__swizzle_packed(const wuffs_base__pixel_swizzler* p,\n wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src);\n\n#ifdef __cplusplus\n\ninline void //\nwuffs_base__pixel_swizzler::prepare(wuffs_base__pixel_format dst_format,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__pixel_format src_format,\n wuffs_base__slice_u8 src_palette) {\n wuffs_base__pixel_swizzler__prepare(this, dst_format, dst_palette, src_format,\n " + + " src_palette);\n}\n\nuint64_t //\nwuffs_base__pixel_swizzler::swizzle_packed(wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src) const {\n return wuffs_base__pixel_swizzler__swizzle_packed(this, dst, dst_palette,\n src);\n}\n\n#endif // __cplusplus\n" + "" const baseIOPrivateH = "" + @@ -170,11 +171,11 @@ const baseIOPrivateH = "" + const baseIOPublicH = "" + "// ---------------- 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* mark;\n uint8_t* limit;\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* mark;\n uint8_t* limit;\n } private_impl;\n} wuffs_base__io_writer;\n\n// wuffs_base__io_buffer_meta is the met" + - "adata for a wuffs_base__io_buffer's\n// data.\ntypedef struct {\n size_t wi; // Write index. Invariant: wi <= len.\n size_t ri; // Read index. Invariant: ri <= wi.\n uint64_t pos; // Position of the buffer start relative to the stream start.\n bool closed; // No further writes are expected.\n} wuffs_base__io_buffer_meta;\n\n// wuffs_base__io_buffer is a 1-dimensional buffer (a pointer and length) plus\n// additional metadata.\n//\n// A value with all fields zero is a valid, empty buffer.\ntypedef struct wuffs_base__io_buffer__struct {\n wuffs_base__slice_u8 data;\n wuffs_base__io_buffer_meta meta;\n\n#ifdef __cplusplus\n inline void compact();\n inline wuffs_base__io_reader reader();\n inline wuffs_base__io_writer writer();\n inline uint64_t reader_io_position();\n inline uint64_t writer_io_position();\n#endif // __cplusplus\n\n} wuffs_base__io_buffer;\n\nstatic inline wuffs_base__io_buffer //\nwuffs_base__make_io_buffer(wuffs_base__slice_u8 data,\n wuffs_base__io_buffer_meta meta) {\n w" + - "uffs_base__io_buffer ret;\n ret.data = data;\n ret.meta = meta;\n return ret;\n}\n\nstatic inline wuffs_base__io_buffer_meta //\nwuffs_base__make_io_buffer_meta(size_t wi,\n size_t ri,\n uint64_t pos,\n bool closed) {\n wuffs_base__io_buffer_meta ret;\n ret.wi = wi;\n ret.ri = ri;\n ret.pos = pos;\n ret.closed = closed;\n return ret;\n}\n\nstatic inline wuffs_base__io_buffer //\nwuffs_base__null_io_buffer() {\n wuffs_base__io_buffer ret;\n ret.data.ptr = NULL;\n ret.data.len = 0;\n ret.meta.wi = 0;\n ret.meta.ri = 0;\n ret.meta.pos = 0;\n ret.meta.closed = false;\n return ret;\n}\n\nstatic inline wuffs_base__io_buffer_meta //\nwuffs_base__null_io_buffer_meta() {\n wuffs_base__io_buffer_meta ret;\n ret.wi = 0;\n ret.ri = 0;\n ret.pos = 0;\n ret.closed = false;\n return ret;\n}\n\nstatic inline wuffs_base__io_reader //\nwuffs_base__null_io_reader() {\n wuffs_base__io_reader ret;\n ret.private_impl.buf = NULL;\n ret.private_impl.mark =" + - " NULL;\n ret.private_impl.limit = NULL;\n return ret;\n}\n\nstatic inline wuffs_base__io_writer //\nwuffs_base__null_io_writer() {\n wuffs_base__io_writer ret;\n ret.private_impl.buf = NULL;\n ret.private_impl.mark = NULL;\n ret.private_impl.limit = NULL;\n return ret;\n}\n\n// wuffs_base__io_buffer__compact moves any written but unread bytes to the\n// start of the buffer.\nstatic inline void //\nwuffs_base__io_buffer__compact(wuffs_base__io_buffer* buf) {\n if (!buf || (buf->meta.ri == 0)) {\n return;\n }\n buf->meta.pos = wuffs_base__u64__sat_add(buf->meta.pos, buf->meta.ri);\n size_t n = buf->meta.wi - buf->meta.ri;\n if (n != 0) {\n memmove(buf->data.ptr, buf->data.ptr + buf->meta.ri, n);\n }\n buf->meta.wi = n;\n buf->meta.ri = 0;\n}\n\nstatic inline wuffs_base__io_reader //\nwuffs_base__io_buffer__reader(wuffs_base__io_buffer* buf) {\n wuffs_base__io_reader ret;\n ret.private_impl.buf = buf;\n ret.private_impl.mark = NULL;\n ret.private_impl.limit = NULL;\n return ret;\n}\n\nstatic inline wuffs_base__io_writer " + - "//\nwuffs_base__io_buffer__writer(wuffs_base__io_buffer* buf) {\n wuffs_base__io_writer ret;\n ret.private_impl.buf = buf;\n ret.private_impl.mark = NULL;\n ret.private_impl.limit = NULL;\n return ret;\n}\n\nstatic inline uint64_t //\nwuffs_base__io_buffer__reader_io_position(wuffs_base__io_buffer* buf) {\n return buf ? wuffs_base__u64__sat_add(buf->meta.pos, buf->meta.ri) : 0;\n}\n\nstatic inline uint64_t //\nwuffs_base__io_buffer__writer_io_position(wuffs_base__io_buffer* buf) {\n return buf ? wuffs_base__u64__sat_add(buf->meta.pos, buf->meta.wi) : 0;\n}\n\n#ifdef __cplusplus\n\ninline void //\nwuffs_base__io_buffer__struct::compact() {\n wuffs_base__io_buffer__compact(this);\n}\n\ninline wuffs_base__io_reader //\nwuffs_base__io_buffer__struct::reader() {\n return wuffs_base__io_buffer__reader(this);\n}\n\ninline wuffs_base__io_writer //\nwuffs_base__io_buffer__struct::writer() {\n return wuffs_base__io_buffer__writer(this);\n}\n\ninline uint64_t //\nwuffs_base__io_buffer__struct::reader_io_position() {\n return wuffs_base__io_" + - "buffer__reader_io_position(this);\n}\n\ninline uint64_t //\nwuffs_base__io_buffer__struct::writer_io_position() {\n return wuffs_base__io_buffer__writer_io_position(this);\n}\n\n#endif // __cplusplus\n" + + "adata for a wuffs_base__io_buffer's\n// data.\ntypedef struct {\n size_t wi; // Write index. Invariant: wi <= len.\n size_t ri; // Read index. Invariant: ri <= wi.\n uint64_t pos; // Position of the buffer start relative to the stream start.\n bool closed; // No further writes are expected.\n} wuffs_base__io_buffer_meta;\n\n// wuffs_base__io_buffer is a 1-dimensional buffer (a pointer and length) plus\n// additional metadata.\n//\n// A value with all fields zero is a valid, empty buffer.\ntypedef struct wuffs_base__io_buffer__struct {\n wuffs_base__slice_u8 data;\n wuffs_base__io_buffer_meta meta;\n\n#ifdef __cplusplus\n inline void compact();\n inline wuffs_base__io_reader reader();\n inline wuffs_base__io_writer writer();\n inline uint64_t reader_io_position() const;\n inline uint64_t writer_io_position() const;\n#endif // __cplusplus\n\n} wuffs_base__io_buffer;\n\nstatic inline wuffs_base__io_buffer //\nwuffs_base__make_io_buffer(wuffs_base__slice_u8 data,\n wuffs_base__io_buffer_meta" + + " meta) {\n wuffs_base__io_buffer ret;\n ret.data = data;\n ret.meta = meta;\n return ret;\n}\n\nstatic inline wuffs_base__io_buffer_meta //\nwuffs_base__make_io_buffer_meta(size_t wi,\n size_t ri,\n uint64_t pos,\n bool closed) {\n wuffs_base__io_buffer_meta ret;\n ret.wi = wi;\n ret.ri = ri;\n ret.pos = pos;\n ret.closed = closed;\n return ret;\n}\n\nstatic inline wuffs_base__io_buffer //\nwuffs_base__null_io_buffer() {\n wuffs_base__io_buffer ret;\n ret.data.ptr = NULL;\n ret.data.len = 0;\n ret.meta.wi = 0;\n ret.meta.ri = 0;\n ret.meta.pos = 0;\n ret.meta.closed = false;\n return ret;\n}\n\nstatic inline wuffs_base__io_buffer_meta //\nwuffs_base__null_io_buffer_meta() {\n wuffs_base__io_buffer_meta ret;\n ret.wi = 0;\n ret.ri = 0;\n ret.pos = 0;\n ret.closed = false;\n return ret;\n}\n\nstatic inline wuffs_base__io_reader //\nwuffs_base__null_io_reader() {\n wuffs_base__io_reader ret;\n ret.private_impl.buf = NULL;\n ret.private" + + "_impl.mark = NULL;\n ret.private_impl.limit = NULL;\n return ret;\n}\n\nstatic inline wuffs_base__io_writer //\nwuffs_base__null_io_writer() {\n wuffs_base__io_writer ret;\n ret.private_impl.buf = NULL;\n ret.private_impl.mark = NULL;\n ret.private_impl.limit = NULL;\n return ret;\n}\n\n// wuffs_base__io_buffer__compact moves any written but unread bytes to the\n// start of the buffer.\nstatic inline void //\nwuffs_base__io_buffer__compact(wuffs_base__io_buffer* buf) {\n if (!buf || (buf->meta.ri == 0)) {\n return;\n }\n buf->meta.pos = wuffs_base__u64__sat_add(buf->meta.pos, buf->meta.ri);\n size_t n = buf->meta.wi - buf->meta.ri;\n if (n != 0) {\n memmove(buf->data.ptr, buf->data.ptr + buf->meta.ri, n);\n }\n buf->meta.wi = n;\n buf->meta.ri = 0;\n}\n\nstatic inline wuffs_base__io_reader //\nwuffs_base__io_buffer__reader(wuffs_base__io_buffer* buf) {\n wuffs_base__io_reader ret;\n ret.private_impl.buf = buf;\n ret.private_impl.mark = NULL;\n ret.private_impl.limit = NULL;\n return ret;\n}\n\nstatic inline wuffs_base_" + + "_io_writer //\nwuffs_base__io_buffer__writer(wuffs_base__io_buffer* buf) {\n wuffs_base__io_writer ret;\n ret.private_impl.buf = buf;\n ret.private_impl.mark = NULL;\n ret.private_impl.limit = NULL;\n return ret;\n}\n\nstatic inline uint64_t //\nwuffs_base__io_buffer__reader_io_position(const wuffs_base__io_buffer* buf) {\n return buf ? wuffs_base__u64__sat_add(buf->meta.pos, buf->meta.ri) : 0;\n}\n\nstatic inline uint64_t //\nwuffs_base__io_buffer__writer_io_position(const wuffs_base__io_buffer* buf) {\n return buf ? wuffs_base__u64__sat_add(buf->meta.pos, buf->meta.wi) : 0;\n}\n\n#ifdef __cplusplus\n\ninline void //\nwuffs_base__io_buffer__struct::compact() {\n wuffs_base__io_buffer__compact(this);\n}\n\ninline wuffs_base__io_reader //\nwuffs_base__io_buffer__struct::reader() {\n return wuffs_base__io_buffer__reader(this);\n}\n\ninline wuffs_base__io_writer //\nwuffs_base__io_buffer__struct::writer() {\n return wuffs_base__io_buffer__writer(this);\n}\n\ninline uint64_t //\nwuffs_base__io_buffer__struct::reader_io_position() co" + + "nst {\n return wuffs_base__io_buffer__reader_io_position(this);\n}\n\ninline uint64_t //\nwuffs_base__io_buffer__struct::writer_io_position() const {\n return wuffs_base__io_buffer__writer_io_position(this);\n}\n\n#endif // __cplusplus\n" + "" const baseRangePrivateH = "" + @@ -186,39 +187,39 @@ const baseRangePrivateH = "" + const baseRangePublicH = "" + "// ---------------- 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 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 wuffs_base__range_" + - "ii_u32__struct intersect(\n wuffs_base__range_ii_u32__struct s);\n inline wuffs_base__range_ii_u32__struct unite(\n wuffs_base__range_ii_u32__struct s);\n inline bool contains(uint32_t x);\n inline bool contains_range(wuffs_base__range_ii_u32__struct s);\n#endif // __cplusplus\n\n} wuffs_base__range_ii_u32;\n\nstatic inline wuffs_base__range_ii_u32 //\nwuffs_base__make_range_ii_u32(uint32_t min_incl, uint32_t max_incl) {\n wuffs_base__range_ii_u32 ret;\n ret.min_incl = min_incl;\n ret.max_incl = max_incl;\n return ret;\n}\n\nstatic inline bool //\nwuffs_base__range_ii_u32__is_empty(wuffs_base__range_ii_u32* r) {\n return r->min_incl > r->max_incl;\n}\n\nstatic inline bool //\nwuffs_base__range_ii_u32__equals(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 wuffs_base__range_ii_u32 //" + - "\nwuffs_base__range_ii_u32__intersect(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 //\nwuffs_base__range_ii_u32__unite(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\nstatic inline bool //\nwuffs_base__range_ii_u32__contains(wuffs_base__range_ii_u32* r, uint32_t x) {\n return (r->min_incl <= x) && (x <= r->max_incl);\n}\n\nstatic inline bool //\nwuffs_base__range_ii_u32__contains_range(wuffs_base__range_ii_u32* r,\n " + - " wuffs_base__range_ii_u32 s) {\n return wuffs_base__range_ii_u32__equals(\n &s, wuffs_base__range_ii_u32__intersect(r, s));\n}\n\n#ifdef __cplusplus\n\ninline bool //\nwuffs_base__range_ii_u32::is_empty() {\n return wuffs_base__range_ii_u32__is_empty(this);\n}\n\ninline bool //\nwuffs_base__range_ii_u32::equals(wuffs_base__range_ii_u32 s) {\n return wuffs_base__range_ii_u32__equals(this, s);\n}\n\ninline wuffs_base__range_ii_u32 //\nwuffs_base__range_ii_u32::intersect(wuffs_base__range_ii_u32 s) {\n return wuffs_base__range_ii_u32__intersect(this, s);\n}\n\ninline wuffs_base__range_ii_u32 //\nwuffs_base__range_ii_u32::unite(wuffs_base__range_ii_u32 s) {\n return wuffs_base__range_ii_u32__unite(this, s);\n}\n\ninline bool //\nwuffs_base__range_ii_u32::contains(uint32_t x) {\n return wuffs_base__range_ii_u32__contains(this, x);\n}\n\ninline bool //\nwuffs_base__range_ii_u32::contains_range(wuffs_base__range_ii_u32 s) {\n return wuffs_base__range_ii_u32__contains_range(this, s);\n}\n\n#endif // __c" + - "plusplus\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() const;\n inline bool equals(wuffs_base__range_ii_u32__struct s) const;\n inline wuffs_" + + "base__range_ii_u32__struct intersect(\n wuffs_base__range_ii_u32__struct s) const;\n inline wuffs_base__range_ii_u32__struct unite(\n wuffs_base__range_ii_u32__struct s) const;\n inline bool contains(uint32_t x) const;\n inline bool contains_range(wuffs_base__range_ii_u32__struct s) const;\n#endif // __cplusplus\n\n} wuffs_base__range_ii_u32;\n\nstatic inline wuffs_base__range_ii_u32 //\nwuffs_base__make_range_ii_u32(uint32_t min_incl, uint32_t max_incl) {\n wuffs_base__range_ii_u32 ret;\n ret.min_incl = min_incl;\n ret.max_incl = max_incl;\n return ret;\n}\n\nstatic inline bool //\nwuffs_base__range_ii_u32__is_empty(const wuffs_base__range_ii_u32* r) {\n return r->min_incl > r->max_incl;\n}\n\nstatic inline bool //\nwuffs_base__range_ii_u32__equals(const 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 wuffs_base__range_ii_u32 //\nwuffs_base__range_ii_u32__intersect(const 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 //\nwuffs_base__range_ii_u32__unite(const 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\nstatic inline bool //\nwuffs_base__range_ii_u32__contains(const wuffs_base__range_ii_u32* r,\n uint32_t x) {\n return (r->min_incl <= x) && (x <= r->max_incl);\n}\n\n" + + "static inline bool //\nwuffs_base__range_ii_u32__contains_range(const wuffs_base__range_ii_u32* r,\n wuffs_base__range_ii_u32 s) {\n return wuffs_base__range_ii_u32__equals(\n &s, wuffs_base__range_ii_u32__intersect(r, s));\n}\n\n#ifdef __cplusplus\n\ninline bool //\nwuffs_base__range_ii_u32::is_empty() const {\n return wuffs_base__range_ii_u32__is_empty(this);\n}\n\ninline bool //\nwuffs_base__range_ii_u32::equals(wuffs_base__range_ii_u32 s) const {\n return wuffs_base__range_ii_u32__equals(this, s);\n}\n\ninline wuffs_base__range_ii_u32 //\nwuffs_base__range_ii_u32::intersect(wuffs_base__range_ii_u32 s) const {\n return wuffs_base__range_ii_u32__intersect(this, s);\n}\n\ninline wuffs_base__range_ii_u32 //\nwuffs_base__range_ii_u32::unite(wuffs_base__range_ii_u32 s) const {\n return wuffs_base__range_ii_u32__unite(this, s);\n}\n\ninline bool //\nwuffs_base__range_ii_u32::contains(uint32_t x) const {\n return wuffs_base__range_ii_u32__contains(this, x);\n}\n\ninline bool //\nwuffs_base_" + + "_range_ii_u32::contains_range(wuffs_base__range_ii_u32 s) const {\n return wuffs_base__range_ii_u32__contains_range(this, s);\n}\n\n#endif // __cplusplus\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 wuffs_base__range_ie_u32__struct intersect(\n wuffs_base__range_ie_u32__struct s);\n inline wuffs_base__range_ie_u32__struct unite(\n wuffs_base__range_ie_u32__struct s);\n inline bool contains(uint32_t x);\n inline bool contains_range(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 wuffs_base__range_ie_u32 //\nwuffs_base__make_range_ie_u32(uint32_t min_incl, uint32_t max_excl) {\n wuffs_base__range_ie_u32 ret;\n ret.min_incl = min_incl;\n ret.max_excl = max_excl;\n return ret;\n}\n\nstatic inline bool //\nwuffs_base__range_ie_u32__is_empty(wuffs_base__range_ie_u32* r) {\n return r->min_incl >= r->max_excl;\n}\n\nstatic inline bool //\nwuffs_base__range_ie_u32__equals(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 wuffs_base__range_ie_u32 //\nwuffs_base__range_ie_u32__intersect(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 //\nwuffs_base__range_ie_u32__unite(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 retu" + - "rn t;\n}\n\nstatic inline bool //\nwuffs_base__range_ie_u32__contains(wuffs_base__range_ie_u32* r, uint32_t x) {\n return (r->min_incl <= x) && (x < r->max_excl);\n}\n\nstatic inline bool //\nwuffs_base__range_ie_u32__contains_range(wuffs_base__range_ie_u32* r,\n wuffs_base__range_ie_u32 s) {\n return wuffs_base__range_ie_u32__equals(\n &s, wuffs_base__range_ie_u32__intersect(r, s));\n}\n\nstatic inline uint32_t //\nwuffs_base__range_ie_u32__length(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 //\nwuffs_base__range_ie_u32::is_empty() {\n return wuffs_base__range_ie_u32__is_empty(this);\n}\n\ninline bool //\nwuffs_base__range_ie_u32::equals(wuffs_base__range_ie_u32 s) {\n return wuffs_base__range_ie_u32__equals(this, s);\n}\n\ninline wuffs_base__range_ie_u32 //\nwuffs_base__range_ie_u32::intersect(wuffs_base__range_ie_u32 s) {\n return wuffs_base__range_ie_u32__intersect(this, s);\n}\n\ninline wuffs_base__" + - "range_ie_u32 //\nwuffs_base__range_ie_u32::unite(wuffs_base__range_ie_u32 s) {\n return wuffs_base__range_ie_u32__unite(this, s);\n}\n\ninline bool //\nwuffs_base__range_ie_u32::contains(uint32_t x) {\n return wuffs_base__range_ie_u32__contains(this, x);\n}\n\ninline bool //\nwuffs_base__range_ie_u32::contains_range(wuffs_base__range_ie_u32 s) {\n return wuffs_base__range_ie_u32__contains_range(this, s);\n}\n\ninline uint32_t //\nwuffs_base__range_ie_u32::length() {\n return wuffs_base__range_ie_u32__length(this);\n}\n\n#endif // __cplusplus\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() const;\n inline bool equals(wuffs_base__range_ie_u32__struct s) const;\n inline wuffs_base__range_ie_u32__struct intersect(\n wuffs_base__range_ie_u32__struct s) const;\n inline wuffs_base__range_ie_u32__struct unite(\n wuffs_base__range_ie_u32__struct s) const;\n inline bool contains(uint32_t x) const;\n inline bool contains_range(wuffs_base__range_ie_u32__struct s) const;\n inline uint32_t length() const;\n#endif // __cplusplus\n\n} wuffs_base__range_ie_u32;\n\nstatic inline wuffs_base__range_ie_u32 //\nwuffs_base__make_range_ie_u32(uint32_t min_incl, uint32_t max_excl) {\n wuffs_base__range_ie_u32 ret;\n ret.min_incl = min_incl;\n ret.max_excl = max_excl;\n return ret;\n}\n\nstatic inline bool //\nwuffs_base__range_ie_u32__is_empty(const wuffs_base__range_ie_u32* r) {\n return r->min_incl >= r->max_excl;\n}\n\nstatic inline bool //\nwuffs_base__range_ie_u32__eq" + + "uals(const 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 wuffs_base__range_ie_u32 //\nwuffs_base__range_ie_u32__intersect(const 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 //\nwuffs_base__range_ie_u32__unite(const 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 bool //\nwuffs_base__range_ie_u32__contains(const wuffs_base__range_ie_u32* r,\n uint32_t x) {\n return (r->min_incl <= x) && (x < r->max_excl);\n}\n\nstatic inline bool //\nwuffs_base__range_ie_u32__contains_range(const wuffs_base__range_ie_u32* r,\n wuffs_base__range_ie_u32 s) {\n return wuffs_base__range_ie_u32__equals(\n &s, wuffs_base__range_ie_u32__intersect(r, s));\n}\n\nstatic inline uint32_t //\nwuffs_base__range_ie_u32__length(const 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 //\nwuffs_base__range_ie_u32::is_empty() const {\n return wuffs_base__range_ie_u32__is_empty(this);\n}\n\ninline bool //\nwuffs_base__range_ie_u32::equals(wuffs_base__range_ie_u32 s) const {\n return wuffs_base__range_ie_u32__equals(this, s);\n}\n\ninline wuffs_base__range_ie_u32 //\nwuffs_base__" + + "range_ie_u32::intersect(wuffs_base__range_ie_u32 s) const {\n return wuffs_base__range_ie_u32__intersect(this, s);\n}\n\ninline wuffs_base__range_ie_u32 //\nwuffs_base__range_ie_u32::unite(wuffs_base__range_ie_u32 s) const {\n return wuffs_base__range_ie_u32__unite(this, s);\n}\n\ninline bool //\nwuffs_base__range_ie_u32::contains(uint32_t x) const {\n return wuffs_base__range_ie_u32__contains(this, x);\n}\n\ninline bool //\nwuffs_base__range_ie_u32::contains_range(wuffs_base__range_ie_u32 s) const {\n return wuffs_base__range_ie_u32__contains_range(this, s);\n}\n\ninline uint32_t //\nwuffs_base__range_ie_u32::length() const {\n return wuffs_base__range_ie_u32__length(this);\n}\n\n#endif // __cplusplus\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 wuffs_base__range_ii_u64__struct intersect(\n wuffs_base__range_ii_u64__struct s);\n inline wuffs_base__range_ii_u64__struct unite(\n wuffs_base__range_ii_u64__struct s);\n inline bool contains(uint64_t x);\n inline bool contains_range(wuffs_base__range_ii_u64__struct s);\n#endif // __cplusplus\n\n} wuffs_base__range_ii_u64;\n\nstatic inline wuffs_base__range_ii_u64 //\nwuffs_base__make_range_ii_u64(uint64_t min_incl, uint64_t max_incl) {\n wuffs_base__range_ii_u64 ret;\n ret.min_incl = min_incl;\n ret.max_incl = max_incl;\n return ret;\n}\n\nstatic inline bool //\nwuffs_base__range_ii_u64__is_empty(wuffs_base__range_ii_u64* r) {\n return r->min_incl > r->max_incl;\n}\n\nstatic inline bool //\nwuffs_base__range_ii_u64__equals(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 wuffs_base__range_ii_u64 //\nwuffs_base__range_ii_u64__intersect(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 //\nwuffs_base__range_ii_u64__unite(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\nstatic inline bool " + - "//\nwuffs_base__range_ii_u64__contains(wuffs_base__range_ii_u64* r, uint64_t x) {\n return (r->min_incl <= x) && (x <= r->max_incl);\n}\n\nstatic inline bool //\nwuffs_base__range_ii_u64__contains_range(wuffs_base__range_ii_u64* r,\n wuffs_base__range_ii_u64 s) {\n return wuffs_base__range_ii_u64__equals(\n &s, wuffs_base__range_ii_u64__intersect(r, s));\n}\n\n#ifdef __cplusplus\n\ninline bool //\nwuffs_base__range_ii_u64::is_empty() {\n return wuffs_base__range_ii_u64__is_empty(this);\n}\n\ninline bool //\nwuffs_base__range_ii_u64::equals(wuffs_base__range_ii_u64 s) {\n return wuffs_base__range_ii_u64__equals(this, s);\n}\n\ninline wuffs_base__range_ii_u64 //\nwuffs_base__range_ii_u64::intersect(wuffs_base__range_ii_u64 s) {\n return wuffs_base__range_ii_u64__intersect(this, s);\n}\n\ninline wuffs_base__range_ii_u64 //\nwuffs_base__range_ii_u64::unite(wuffs_base__range_ii_u64 s) {\n return wuffs_base__range_ii_u64__unite(this, s);\n}\n\ninline bool //\nwuffs_base__range_ii_u64::contains" + - "(uint64_t x) {\n return wuffs_base__range_ii_u64__contains(this, x);\n}\n\ninline bool //\nwuffs_base__range_ii_u64::contains_range(wuffs_base__range_ii_u64 s) {\n return wuffs_base__range_ii_u64__contains_range(this, s);\n}\n\n#endif // __cplusplus\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() const;\n inline bool equals(wuffs_base__range_ii_u64__struct s) const;\n inline wuffs_base__range_ii_u64__struct intersect(\n wuffs_base__range_ii_u64__struct s) const;\n inline wuffs_base__range_ii_u64__struct unite(\n wuffs_base__range_ii_u64__struct s) const;\n inline bool contains(uint64_t x) const;\n inline bool contains_range(wuffs_base__range_ii_u64__struct s) const;\n#endif // __cplusplus\n\n} wuffs_base__range_ii_u64;\n\nstatic inline wuffs_base__range_ii_u64 //\nwuffs_base__make_range_ii_u64(uint64_t min_incl, uint64_t max_incl) {\n wuffs_base__range_ii_u64 ret;\n ret.min_incl = min_incl;\n ret.max_incl = max_incl;\n return ret;\n}\n\nstatic inline bool //\nwuffs_base__range_ii_u64__is_empty(const wuffs_base__range_ii_u64* r) {\n return r->min_incl > r->max_incl;\n}\n\nstatic inline bool //\nwuffs_base__range_ii_u64__equals(const 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 wuffs_base__range_ii_u64 //\nwuffs_base__range_ii_u64__intersect(const 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 //\nwuffs_base__range_ii_u64__unite(const 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\nstatic inline bool //\nwuffs_base__range_ii_u64__contains(const wuffs_base__range_ii_u64* r,\n uint64_t x) {\n return (r->min_incl <= x) && (x <= r->max_incl);\n}\n\nstatic inline bool //\nwuffs_base__range_ii_u64__contains_range(const wuffs_base__range_ii_u64* r,\n wuffs_base__range_ii_u64 s) {\n return wuffs_base__range_ii_u64__equals(\n &s, wuffs_base__range_ii_u64__intersect(r, s));\n}\n\n#ifdef __cplusplus\n\ninline bool //\nwuffs_base__range_ii_u64::is_empty() const {\n return wuffs_base__range_ii_u64__is_empty(this);\n}\n\ninline bool //\nwuffs_base__range_ii_u64::equals(wuffs_base__range_ii_u64 s) const {\n return wuffs_base__range_ii_u64__equals(this, s);\n}\n\ninline wuffs_base__range_ii_u64 //\nwuffs_base__range_ii_u64::intersect(wuffs_base__range_ii_u64 s) const {\n return wuffs_base__range_ii_u64__intersect(this, s);\n}\n\ninline wuffs_base__range_ii_u64 //\nwuffs_base__range_ii_u64::unite(wuffs_bas" + + "e__range_ii_u64 s) const {\n return wuffs_base__range_ii_u64__unite(this, s);\n}\n\ninline bool //\nwuffs_base__range_ii_u64::contains(uint64_t x) const {\n return wuffs_base__range_ii_u64__contains(this, x);\n}\n\ninline bool //\nwuffs_base__range_ii_u64::contains_range(wuffs_base__range_ii_u64 s) const {\n return wuffs_base__range_ii_u64__contains_range(this, s);\n}\n\n#endif // __cplusplus\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 wuffs_base__range_ie_u64__struct intersect(\n wuffs_base__range_ie_u64__struct s);\n inline wuffs_base__range_ie_u64__struct unite(\n wuffs_base__range_ie_u64__struct s);\n inline bool contains(uint64_t x);\n inline bool contains_range(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 wuffs_base__range_ie_u64 //\nwuffs_base__make_range_ie_u64(uint64_t min_incl, uint64_t max_excl) {\n wuffs_base__range_ie_u64 ret;\n ret.min_incl = min_incl;\n ret.max_excl = max_excl;\n return ret;\n}\n\nstatic inline bool //\nwuffs_base__range_ie_u64__is_empty(wuffs_base__range_ie_u64* r) {\n return r->min_incl >= r->max_excl;\n}\n\nstatic inline bool //\nwuffs_base__range_ie_u64__equals(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 wuffs_base__range_ie_u64 //\nwuffs_base__range_ie_u64__intersect(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 //\nwuffs_base__range_ie_u64__unite(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 retu" + - "rn t;\n}\n\nstatic inline bool //\nwuffs_base__range_ie_u64__contains(wuffs_base__range_ie_u64* r, uint64_t x) {\n return (r->min_incl <= x) && (x < r->max_excl);\n}\n\nstatic inline bool //\nwuffs_base__range_ie_u64__contains_range(wuffs_base__range_ie_u64* r,\n wuffs_base__range_ie_u64 s) {\n return wuffs_base__range_ie_u64__equals(\n &s, wuffs_base__range_ie_u64__intersect(r, s));\n}\n\nstatic inline uint64_t //\nwuffs_base__range_ie_u64__length(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 //\nwuffs_base__range_ie_u64::is_empty() {\n return wuffs_base__range_ie_u64__is_empty(this);\n}\n\ninline bool //\nwuffs_base__range_ie_u64::equals(wuffs_base__range_ie_u64 s) {\n return wuffs_base__range_ie_u64__equals(this, s);\n}\n\ninline wuffs_base__range_ie_u64 //\nwuffs_base__range_ie_u64::intersect(wuffs_base__range_ie_u64 s) {\n return wuffs_base__range_ie_u64__intersect(this, s);\n}\n\ninline wuffs_base__" + - "range_ie_u64 //\nwuffs_base__range_ie_u64::unite(wuffs_base__range_ie_u64 s) {\n return wuffs_base__range_ie_u64__unite(this, s);\n}\n\ninline bool //\nwuffs_base__range_ie_u64::contains(uint64_t x) {\n return wuffs_base__range_ie_u64__contains(this, x);\n}\n\ninline bool //\nwuffs_base__range_ie_u64::contains_range(wuffs_base__range_ie_u64 s) {\n return wuffs_base__range_ie_u64__contains_range(this, s);\n}\n\ninline uint64_t //\nwuffs_base__range_ie_u64::length() {\n return wuffs_base__range_ie_u64__length(this);\n}\n\n#endif // __cplusplus\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() const;\n inline bool equals(wuffs_base__range_ie_u64__struct s) const;\n inline wuffs_base__range_ie_u64__struct intersect(\n wuffs_base__range_ie_u64__struct s) const;\n inline wuffs_base__range_ie_u64__struct unite(\n wuffs_base__range_ie_u64__struct s) const;\n inline bool contains(uint64_t x) const;\n inline bool contains_range(wuffs_base__range_ie_u64__struct s) const;\n inline uint64_t length() const;\n#endif // __cplusplus\n\n} wuffs_base__range_ie_u64;\n\nstatic inline wuffs_base__range_ie_u64 //\nwuffs_base__make_range_ie_u64(uint64_t min_incl, uint64_t max_excl) {\n wuffs_base__range_ie_u64 ret;\n ret.min_incl = min_incl;\n ret.max_excl = max_excl;\n return ret;\n}\n\nstatic inline bool //\nwuffs_base__range_ie_u64__is_empty(const wuffs_base__range_ie_u64* r) {\n return r->min_incl >= r->max_excl;\n}\n\nstatic inline bool //\nwuffs_base__range_ie_u64__eq" + + "uals(const 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 wuffs_base__range_ie_u64 //\nwuffs_base__range_ie_u64__intersect(const 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 //\nwuffs_base__range_ie_u64__unite(const 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 bool //\nwuffs_base__range_ie_u64__contains(const wuffs_base__range_ie_u64* r,\n uint64_t x) {\n return (r->min_incl <= x) && (x < r->max_excl);\n}\n\nstatic inline bool //\nwuffs_base__range_ie_u64__contains_range(const wuffs_base__range_ie_u64* r,\n wuffs_base__range_ie_u64 s) {\n return wuffs_base__range_ie_u64__equals(\n &s, wuffs_base__range_ie_u64__intersect(r, s));\n}\n\nstatic inline uint64_t //\nwuffs_base__range_ie_u64__length(const 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 //\nwuffs_base__range_ie_u64::is_empty() const {\n return wuffs_base__range_ie_u64__is_empty(this);\n}\n\ninline bool //\nwuffs_base__range_ie_u64::equals(wuffs_base__range_ie_u64 s) const {\n return wuffs_base__range_ie_u64__equals(this, s);\n}\n\ninline wuffs_base__range_ie_u64 //\nwuffs_base__" + + "range_ie_u64::intersect(wuffs_base__range_ie_u64 s) const {\n return wuffs_base__range_ie_u64__intersect(this, s);\n}\n\ninline wuffs_base__range_ie_u64 //\nwuffs_base__range_ie_u64::unite(wuffs_base__range_ie_u64 s) const {\n return wuffs_base__range_ie_u64__unite(this, s);\n}\n\ninline bool //\nwuffs_base__range_ie_u64::contains(uint64_t x) const {\n return wuffs_base__range_ie_u64__contains(this, x);\n}\n\ninline bool //\nwuffs_base__range_ie_u64::contains_range(wuffs_base__range_ie_u64 s) const {\n return wuffs_base__range_ie_u64__contains_range(this, s);\n}\n\ninline uint64_t //\nwuffs_base__range_ie_u64::length() const {\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 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 wuffs_base__rect_ii_u32__struct intersect(\n wuffs_base__rect_ii_u32__struct s);\n inline wuffs_base__rect_ii_u32__struct unite(\n wuffs_base__rect_ii_u32__struct s);\n inline bool contains(uint32_t x, uint32_t y);\n inline bool contains_rect(wuffs_base__rect_ii_u32__struct s);\n#en" + - "dif // __cplusplus\n\n} wuffs_base__rect_ii_u32;\n\nstatic inline wuffs_base__rect_ii_u32 //\nwuffs_base__make_rect_ii_u32(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 ret;\n ret.min_incl_x = min_incl_x;\n ret.min_incl_y = min_incl_y;\n ret.max_incl_x = max_incl_x;\n ret.max_incl_y = max_incl_y;\n return ret;\n}\n\nstatic inline bool //\nwuffs_base__rect_ii_u32__is_empty(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 //\nwuffs_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 wuffs_base__rect_ii_u32 //\nwuffs_base__rect_ii_u32__intersect(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 //\nwuffs_base__rect_ii_u32__unite(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\nstatic inline bool //\nwuffs_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 bool //\nwuffs_base__rect_ii_u32__contains_rect(wuffs_base__rect_ii_u32* r,\n wuffs_base__rect_ii_u32 s) {\n return wuffs_base__rect_ii_u32__equals(\n &s, wuffs_base__rect_ii_u32__intersect(r, s));\n}\n\n#ifdef __cplusplus\n\ninline bool //\nwuffs_base__rect_ii_u32::is_empty() {\n return wuffs_base__rect_ii_u32__is_empty(this);\n}\n\ninline bool //\nwuffs_base__rect_ii_u32::equals(wuffs_base__rect_ii_u32 s) {\n return wuffs_base__rect_ii_u32__equals(this, s);\n}\n\ninline wuffs_base__rect_ii_u32 //\nwuffs_base__rect_ii_u32::intersect(wuffs_base__rect_ii_u32 s) {\n return wuffs_base__rect_ii_u32__interse" + - "ct(this, s);\n}\n\ninline wuffs_base__rect_ii_u32 //\nwuffs_base__rect_ii_u32::unite(wuffs_base__rect_ii_u32 s) {\n return wuffs_base__rect_ii_u32__unite(this, s);\n}\n\ninline bool //\nwuffs_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 bool //\nwuffs_base__rect_ii_u32::contains_rect(wuffs_base__rect_ii_u32 s) {\n return wuffs_base__rect_ii_u32__contains_rect(this, s);\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 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() const;\n inline bool equals(wuffs_base__rect_ii_u32__struct s) const;\n inline wuffs_base__rect_ii_u32__struct intersect(\n wuffs_base__rect_ii_u32__struct s) const;\n inline wuffs_base__rect_ii_u32__struct unite(\n wuffs_base__rect_ii_u32__struct s) const;\n inline bool contains(uint32_t x, uint32_t y) const;\n inline bool contains_rect(wuffs_bas" + + "e__rect_ii_u32__struct s) const;\n#endif // __cplusplus\n\n} wuffs_base__rect_ii_u32;\n\nstatic inline wuffs_base__rect_ii_u32 //\nwuffs_base__make_rect_ii_u32(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 ret;\n ret.min_incl_x = min_incl_x;\n ret.min_incl_y = min_incl_y;\n ret.max_incl_x = max_incl_x;\n ret.max_incl_y = max_incl_y;\n return ret;\n}\n\nstatic inline bool //\nwuffs_base__rect_ii_u32__is_empty(const 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 //\nwuffs_base__rect_ii_u32__equals(const 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 wuffs_base__rect_ii_u32 //\nwuffs_base__rect_ii_u32__intersect(const 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 //\nwuffs_base__rect_ii_u32__unite(const 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\nstatic inline bool //\nwuffs_base__rect_ii_u32__contains(const 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 bool //\nwuffs_base__rect_ii_u32__contains_rect(const wuffs_base__rect_ii_u32* r,\n wuffs_base__rect_ii_u32 s) {\n return wuffs_base__rect_ii_u32__equals(\n &s, wuffs_base__rect_ii_u32__intersect(r, s));\n}\n\n#ifdef __cplusplus\n\ninline bool //\nwuffs_base__rect_ii_u32::is_empty() const {\n return wuffs_base__rect_ii_u32__is_empty(this);\n}\n\ninline bool //\nwuffs_base__rect_ii_u32::equals(wuffs_base__rect_ii_u32 s) const {\n return wuffs_base__rect_ii_u32__equals(this, s);\n}\n\ninline wuffs_base__rect_ii_u32 //\nwuffs_base__rect_ii_u" + + "32::intersect(wuffs_base__rect_ii_u32 s) const {\n return wuffs_base__rect_ii_u32__intersect(this, s);\n}\n\ninline wuffs_base__rect_ii_u32 //\nwuffs_base__rect_ii_u32::unite(wuffs_base__rect_ii_u32 s) const {\n return wuffs_base__rect_ii_u32__unite(this, s);\n}\n\ninline bool //\nwuffs_base__rect_ii_u32::contains(uint32_t x, uint32_t y) const {\n return wuffs_base__rect_ii_u32__contains(this, x, y);\n}\n\ninline bool //\nwuffs_base__rect_ii_u32::contains_rect(wuffs_base__rect_ii_u32 s) const {\n return wuffs_base__rect_ii_u32__contains_rect(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 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 wuffs_base__rect_ie_u32__struct intersect(\n wuffs_base__rect_ie_u32__struct s);\n inline wuffs_base__rect_ie_u32__struct unite(\n wuffs_base__rect_ie_u32__struct s);\n inline bool contains(uint32_t x, uint32_t y);\n inline bool contains_r" + - "ect(wuffs_base__rect_ie_u32__struct s);\n inline uint32_t width();\n inline uint32_t height();\n#endif // __cplusplus\n\n} wuffs_base__rect_ie_u32;\n\nstatic inline wuffs_base__rect_ie_u32 //\nwuffs_base__make_rect_ie_u32(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 ret;\n ret.min_incl_x = min_incl_x;\n ret.min_incl_y = min_incl_y;\n ret.max_excl_x = max_excl_x;\n ret.max_excl_y = max_excl_y;\n return ret;\n}\n\nstatic inline bool //\nwuffs_base__rect_ie_u32__is_empty(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 //\nwuffs_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 wuffs_base__rect_ie_u32 //\nwuffs_base__rect_ie_u32__intersect(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 //\nwuffs_base__rect_ie_u32__unite(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->mi" + - "n_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 bool //\nwuffs_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 bool //\nwuffs_base__rect_ie_u32__contains_rect(wuffs_base__rect_ie_u32* r,\n wuffs_base__rect_ie_u32 s) {\n return wuffs_base__rect_ie_u32__equals(\n &s, wuffs_base__rect_ie_u32__intersect(r, s));\n}\n\nstatic inline uint32_t //\nwuffs_base__rect_ie_u32__width(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 //\nwuffs_base__rect_ie_u32__height(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 //\nwuffs_base__rect_ie_u32::is_empty() {\n return wuffs_base__rect_ie_u32__is_empty(this);\n}\n\ninline bool //\nwuffs_base__rect_ie_u32::equals(wuffs_base__rect_ie_u32 s) {\n return wuffs_base__rect_ie_u32__equals(this, s);\n}\n\ninline wuffs_base__rect_ie_u32 //\nwuffs_base__rect_ie_u32::intersect(wuffs_base__rect_ie_u32 s) {\n return wuffs_base__rect_ie_u32__intersect(this, s);\n}\n\ninline wuffs_base__rect_ie_u32 //\nwuffs_base__rect_ie_u32::unite(wuffs_base__rect_ie_u32 s) {\n return wuffs_base__rect_ie_u32__unite(this, s);\n}\n\ninline bool //\nwuffs_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 bool //\nwuffs_base__rect_ie_u32::contains_rect(wuffs_base__rect_ie_u32 s) {\n return wuffs_base__rect_ie_u32__contains_rect(this, s);\n}\n\ninline uint32_t //\nwuffs_base__rect_ie_u32::width() {\n return wuffs_base__rect_ie_u32__width(this);\n}\n\ninline uint32_t //\nwuffs_base__rect_ie_u32::height() {\n return" + - " wuffs_base__rect_ie_u32__height(this);\n}\n\n#endif // __cplusplus\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() const;\n inline bool equals(wuffs_base__rect_ie_u32__struct s) const;\n inline wuffs_base__rect_ie_u32__struct intersect(\n wuffs_base__rect_ie_u32__struct s) const;\n inline wuffs_base__rect_ie_u32__struct unite(\n wuffs_base__rect_ie_u32__struct s) const;\n inline bool contains(uint32_t x, uint32_t y) c" + + "onst;\n inline bool contains_rect(wuffs_base__rect_ie_u32__struct s) const;\n inline uint32_t width() const;\n inline uint32_t height() const;\n#endif // __cplusplus\n\n} wuffs_base__rect_ie_u32;\n\nstatic inline wuffs_base__rect_ie_u32 //\nwuffs_base__make_rect_ie_u32(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 ret;\n ret.min_incl_x = min_incl_x;\n ret.min_incl_y = min_incl_y;\n ret.max_excl_x = max_excl_x;\n ret.max_excl_y = max_excl_y;\n return ret;\n}\n\nstatic inline bool //\nwuffs_base__rect_ie_u32__is_empty(const 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 //\nwuffs_base__rect_ie_u32__equals(const 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 wuffs_base__rect_ie_u32 //\nwuffs_base__rect_ie_u32__intersect(const 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 //\nwuffs_base__rect_ie_u32__unite(const 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 bool //\nwuffs_base__rect_ie_u32__contains(const 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 bool //\nwuffs_base__rect_ie_u32__contains_rect(const wuffs_base__rect_ie_u32* r,\n wuffs_base__rect_ie_u32 s) {\n return wuffs_base__rect_ie_u32__equals(\n &s, wuffs_base__rect_ie_u32__intersect(r, s));\n}\n\nstatic inline uint32_t //\nwuffs_base__rect_ie_u32__width(const 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 //\nwuffs_base__rect_ie_u32__he" + + "ight(const 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 //\nwuffs_base__rect_ie_u32::is_empty() const {\n return wuffs_base__rect_ie_u32__is_empty(this);\n}\n\ninline bool //\nwuffs_base__rect_ie_u32::equals(wuffs_base__rect_ie_u32 s) const {\n return wuffs_base__rect_ie_u32__equals(this, s);\n}\n\ninline wuffs_base__rect_ie_u32 //\nwuffs_base__rect_ie_u32::intersect(wuffs_base__rect_ie_u32 s) const {\n return wuffs_base__rect_ie_u32__intersect(this, s);\n}\n\ninline wuffs_base__rect_ie_u32 //\nwuffs_base__rect_ie_u32::unite(wuffs_base__rect_ie_u32 s) const {\n return wuffs_base__rect_ie_u32__unite(this, s);\n}\n\ninline bool //\nwuffs_base__rect_ie_u32::contains(uint32_t x, uint32_t y) const {\n return wuffs_base__rect_ie_u32__contains(this, x, y);\n}\n\ninline bool //\nwuffs_base__rect_ie_u32::contains_rect(wuffs_base__rect_ie_u32 s) const {\n return wuffs_base__rect_ie_u32__contains_rect(this, s);\n}\n\ninline uint32_t //\nwuffs_base__rect_" + + "ie_u32::width() const {\n return wuffs_base__rect_ie_u32__width(this);\n}\n\ninline uint32_t //\nwuffs_base__rect_ie_u32::height() const {\n return wuffs_base__rect_ie_u32__height(this);\n}\n\n#endif // __cplusplus\n" + "" const baseCopyright = "" + diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index dc00a84e..08cb4823 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -509,14 +509,14 @@ typedef struct wuffs_base__range_ii_u32__struct { uint32_t max_incl; #ifdef __cplusplus - inline bool is_empty(); - inline bool equals(wuffs_base__range_ii_u32__struct s); + inline bool is_empty() const; + inline bool equals(wuffs_base__range_ii_u32__struct s) const; inline wuffs_base__range_ii_u32__struct intersect( - wuffs_base__range_ii_u32__struct s); + wuffs_base__range_ii_u32__struct s) const; inline wuffs_base__range_ii_u32__struct unite( - wuffs_base__range_ii_u32__struct s); - inline bool contains(uint32_t x); - inline bool contains_range(wuffs_base__range_ii_u32__struct s); + wuffs_base__range_ii_u32__struct s) const; + inline bool contains(uint32_t x) const; + inline bool contains_range(wuffs_base__range_ii_u32__struct s) const; #endif // __cplusplus } wuffs_base__range_ii_u32; @@ -530,12 +530,12 @@ wuffs_base__make_range_ii_u32(uint32_t min_incl, uint32_t max_incl) { } static inline bool // -wuffs_base__range_ii_u32__is_empty(wuffs_base__range_ii_u32* r) { +wuffs_base__range_ii_u32__is_empty(const wuffs_base__range_ii_u32* r) { return r->min_incl > r->max_incl; } static inline bool // -wuffs_base__range_ii_u32__equals(wuffs_base__range_ii_u32* r, +wuffs_base__range_ii_u32__equals(const wuffs_base__range_ii_u32* r, wuffs_base__range_ii_u32 s) { return (r->min_incl == s.min_incl && r->max_incl == s.max_incl) || (wuffs_base__range_ii_u32__is_empty(r) && @@ -543,7 +543,7 @@ wuffs_base__range_ii_u32__equals(wuffs_base__range_ii_u32* r, } static inline wuffs_base__range_ii_u32 // -wuffs_base__range_ii_u32__intersect(wuffs_base__range_ii_u32* r, +wuffs_base__range_ii_u32__intersect(const wuffs_base__range_ii_u32* r, wuffs_base__range_ii_u32 s) { wuffs_base__range_ii_u32 t; t.min_incl = wuffs_base__u32__max(r->min_incl, s.min_incl); @@ -552,7 +552,7 @@ wuffs_base__range_ii_u32__intersect(wuffs_base__range_ii_u32* r, } static inline wuffs_base__range_ii_u32 // -wuffs_base__range_ii_u32__unite(wuffs_base__range_ii_u32* r, +wuffs_base__range_ii_u32__unite(const wuffs_base__range_ii_u32* r, wuffs_base__range_ii_u32 s) { if (wuffs_base__range_ii_u32__is_empty(r)) { return s; @@ -567,12 +567,13 @@ wuffs_base__range_ii_u32__unite(wuffs_base__range_ii_u32* r, } static inline bool // -wuffs_base__range_ii_u32__contains(wuffs_base__range_ii_u32* r, uint32_t x) { +wuffs_base__range_ii_u32__contains(const wuffs_base__range_ii_u32* r, + uint32_t x) { return (r->min_incl <= x) && (x <= r->max_incl); } static inline bool // -wuffs_base__range_ii_u32__contains_range(wuffs_base__range_ii_u32* r, +wuffs_base__range_ii_u32__contains_range(const wuffs_base__range_ii_u32* r, wuffs_base__range_ii_u32 s) { return wuffs_base__range_ii_u32__equals( &s, wuffs_base__range_ii_u32__intersect(r, s)); @@ -581,32 +582,32 @@ wuffs_base__range_ii_u32__contains_range(wuffs_base__range_ii_u32* r, #ifdef __cplusplus inline bool // -wuffs_base__range_ii_u32::is_empty() { +wuffs_base__range_ii_u32::is_empty() const { return wuffs_base__range_ii_u32__is_empty(this); } inline bool // -wuffs_base__range_ii_u32::equals(wuffs_base__range_ii_u32 s) { +wuffs_base__range_ii_u32::equals(wuffs_base__range_ii_u32 s) const { return wuffs_base__range_ii_u32__equals(this, s); } inline wuffs_base__range_ii_u32 // -wuffs_base__range_ii_u32::intersect(wuffs_base__range_ii_u32 s) { +wuffs_base__range_ii_u32::intersect(wuffs_base__range_ii_u32 s) const { return wuffs_base__range_ii_u32__intersect(this, s); } inline wuffs_base__range_ii_u32 // -wuffs_base__range_ii_u32::unite(wuffs_base__range_ii_u32 s) { +wuffs_base__range_ii_u32::unite(wuffs_base__range_ii_u32 s) const { return wuffs_base__range_ii_u32__unite(this, s); } inline bool // -wuffs_base__range_ii_u32::contains(uint32_t x) { +wuffs_base__range_ii_u32::contains(uint32_t x) const { return wuffs_base__range_ii_u32__contains(this, x); } inline bool // -wuffs_base__range_ii_u32::contains_range(wuffs_base__range_ii_u32 s) { +wuffs_base__range_ii_u32::contains_range(wuffs_base__range_ii_u32 s) const { return wuffs_base__range_ii_u32__contains_range(this, s); } @@ -619,15 +620,15 @@ typedef struct wuffs_base__range_ie_u32__struct { uint32_t max_excl; #ifdef __cplusplus - inline bool is_empty(); - inline bool equals(wuffs_base__range_ie_u32__struct s); + inline bool is_empty() const; + inline bool equals(wuffs_base__range_ie_u32__struct s) const; inline wuffs_base__range_ie_u32__struct intersect( - wuffs_base__range_ie_u32__struct s); + wuffs_base__range_ie_u32__struct s) const; inline wuffs_base__range_ie_u32__struct unite( - wuffs_base__range_ie_u32__struct s); - inline bool contains(uint32_t x); - inline bool contains_range(wuffs_base__range_ie_u32__struct s); - inline uint32_t length(); + wuffs_base__range_ie_u32__struct s) const; + inline bool contains(uint32_t x) const; + inline bool contains_range(wuffs_base__range_ie_u32__struct s) const; + inline uint32_t length() const; #endif // __cplusplus } wuffs_base__range_ie_u32; @@ -641,12 +642,12 @@ wuffs_base__make_range_ie_u32(uint32_t min_incl, uint32_t max_excl) { } static inline bool // -wuffs_base__range_ie_u32__is_empty(wuffs_base__range_ie_u32* r) { +wuffs_base__range_ie_u32__is_empty(const wuffs_base__range_ie_u32* r) { return r->min_incl >= r->max_excl; } static inline bool // -wuffs_base__range_ie_u32__equals(wuffs_base__range_ie_u32* r, +wuffs_base__range_ie_u32__equals(const wuffs_base__range_ie_u32* r, wuffs_base__range_ie_u32 s) { return (r->min_incl == s.min_incl && r->max_excl == s.max_excl) || (wuffs_base__range_ie_u32__is_empty(r) && @@ -654,7 +655,7 @@ wuffs_base__range_ie_u32__equals(wuffs_base__range_ie_u32* r, } static inline wuffs_base__range_ie_u32 // -wuffs_base__range_ie_u32__intersect(wuffs_base__range_ie_u32* r, +wuffs_base__range_ie_u32__intersect(const wuffs_base__range_ie_u32* r, wuffs_base__range_ie_u32 s) { wuffs_base__range_ie_u32 t; t.min_incl = wuffs_base__u32__max(r->min_incl, s.min_incl); @@ -663,7 +664,7 @@ wuffs_base__range_ie_u32__intersect(wuffs_base__range_ie_u32* r, } static inline wuffs_base__range_ie_u32 // -wuffs_base__range_ie_u32__unite(wuffs_base__range_ie_u32* r, +wuffs_base__range_ie_u32__unite(const wuffs_base__range_ie_u32* r, wuffs_base__range_ie_u32 s) { if (wuffs_base__range_ie_u32__is_empty(r)) { return s; @@ -678,56 +679,57 @@ wuffs_base__range_ie_u32__unite(wuffs_base__range_ie_u32* r, } static inline bool // -wuffs_base__range_ie_u32__contains(wuffs_base__range_ie_u32* r, uint32_t x) { +wuffs_base__range_ie_u32__contains(const wuffs_base__range_ie_u32* r, + uint32_t x) { return (r->min_incl <= x) && (x < r->max_excl); } static inline bool // -wuffs_base__range_ie_u32__contains_range(wuffs_base__range_ie_u32* r, +wuffs_base__range_ie_u32__contains_range(const wuffs_base__range_ie_u32* r, wuffs_base__range_ie_u32 s) { return wuffs_base__range_ie_u32__equals( &s, wuffs_base__range_ie_u32__intersect(r, s)); } static inline uint32_t // -wuffs_base__range_ie_u32__length(wuffs_base__range_ie_u32* r) { +wuffs_base__range_ie_u32__length(const wuffs_base__range_ie_u32* r) { return wuffs_base__u32__sat_sub(r->max_excl, r->min_incl); } #ifdef __cplusplus inline bool // -wuffs_base__range_ie_u32::is_empty() { +wuffs_base__range_ie_u32::is_empty() const { return wuffs_base__range_ie_u32__is_empty(this); } inline bool // -wuffs_base__range_ie_u32::equals(wuffs_base__range_ie_u32 s) { +wuffs_base__range_ie_u32::equals(wuffs_base__range_ie_u32 s) const { return wuffs_base__range_ie_u32__equals(this, s); } inline wuffs_base__range_ie_u32 // -wuffs_base__range_ie_u32::intersect(wuffs_base__range_ie_u32 s) { +wuffs_base__range_ie_u32::intersect(wuffs_base__range_ie_u32 s) const { return wuffs_base__range_ie_u32__intersect(this, s); } inline wuffs_base__range_ie_u32 // -wuffs_base__range_ie_u32::unite(wuffs_base__range_ie_u32 s) { +wuffs_base__range_ie_u32::unite(wuffs_base__range_ie_u32 s) const { return wuffs_base__range_ie_u32__unite(this, s); } inline bool // -wuffs_base__range_ie_u32::contains(uint32_t x) { +wuffs_base__range_ie_u32::contains(uint32_t x) const { return wuffs_base__range_ie_u32__contains(this, x); } inline bool // -wuffs_base__range_ie_u32::contains_range(wuffs_base__range_ie_u32 s) { +wuffs_base__range_ie_u32::contains_range(wuffs_base__range_ie_u32 s) const { return wuffs_base__range_ie_u32__contains_range(this, s); } inline uint32_t // -wuffs_base__range_ie_u32::length() { +wuffs_base__range_ie_u32::length() const { return wuffs_base__range_ie_u32__length(this); } @@ -740,14 +742,14 @@ typedef struct wuffs_base__range_ii_u64__struct { uint64_t max_incl; #ifdef __cplusplus - inline bool is_empty(); - inline bool equals(wuffs_base__range_ii_u64__struct s); + inline bool is_empty() const; + inline bool equals(wuffs_base__range_ii_u64__struct s) const; inline wuffs_base__range_ii_u64__struct intersect( - wuffs_base__range_ii_u64__struct s); + wuffs_base__range_ii_u64__struct s) const; inline wuffs_base__range_ii_u64__struct unite( - wuffs_base__range_ii_u64__struct s); - inline bool contains(uint64_t x); - inline bool contains_range(wuffs_base__range_ii_u64__struct s); + wuffs_base__range_ii_u64__struct s) const; + inline bool contains(uint64_t x) const; + inline bool contains_range(wuffs_base__range_ii_u64__struct s) const; #endif // __cplusplus } wuffs_base__range_ii_u64; @@ -761,12 +763,12 @@ wuffs_base__make_range_ii_u64(uint64_t min_incl, uint64_t max_incl) { } static inline bool // -wuffs_base__range_ii_u64__is_empty(wuffs_base__range_ii_u64* r) { +wuffs_base__range_ii_u64__is_empty(const wuffs_base__range_ii_u64* r) { return r->min_incl > r->max_incl; } static inline bool // -wuffs_base__range_ii_u64__equals(wuffs_base__range_ii_u64* r, +wuffs_base__range_ii_u64__equals(const wuffs_base__range_ii_u64* r, wuffs_base__range_ii_u64 s) { return (r->min_incl == s.min_incl && r->max_incl == s.max_incl) || (wuffs_base__range_ii_u64__is_empty(r) && @@ -774,7 +776,7 @@ wuffs_base__range_ii_u64__equals(wuffs_base__range_ii_u64* r, } static inline wuffs_base__range_ii_u64 // -wuffs_base__range_ii_u64__intersect(wuffs_base__range_ii_u64* r, +wuffs_base__range_ii_u64__intersect(const wuffs_base__range_ii_u64* r, wuffs_base__range_ii_u64 s) { wuffs_base__range_ii_u64 t; t.min_incl = wuffs_base__u64__max(r->min_incl, s.min_incl); @@ -783,7 +785,7 @@ wuffs_base__range_ii_u64__intersect(wuffs_base__range_ii_u64* r, } static inline wuffs_base__range_ii_u64 // -wuffs_base__range_ii_u64__unite(wuffs_base__range_ii_u64* r, +wuffs_base__range_ii_u64__unite(const wuffs_base__range_ii_u64* r, wuffs_base__range_ii_u64 s) { if (wuffs_base__range_ii_u64__is_empty(r)) { return s; @@ -798,12 +800,13 @@ wuffs_base__range_ii_u64__unite(wuffs_base__range_ii_u64* r, } static inline bool // -wuffs_base__range_ii_u64__contains(wuffs_base__range_ii_u64* r, uint64_t x) { +wuffs_base__range_ii_u64__contains(const wuffs_base__range_ii_u64* r, + uint64_t x) { return (r->min_incl <= x) && (x <= r->max_incl); } static inline bool // -wuffs_base__range_ii_u64__contains_range(wuffs_base__range_ii_u64* r, +wuffs_base__range_ii_u64__contains_range(const wuffs_base__range_ii_u64* r, wuffs_base__range_ii_u64 s) { return wuffs_base__range_ii_u64__equals( &s, wuffs_base__range_ii_u64__intersect(r, s)); @@ -812,32 +815,32 @@ wuffs_base__range_ii_u64__contains_range(wuffs_base__range_ii_u64* r, #ifdef __cplusplus inline bool // -wuffs_base__range_ii_u64::is_empty() { +wuffs_base__range_ii_u64::is_empty() const { return wuffs_base__range_ii_u64__is_empty(this); } inline bool // -wuffs_base__range_ii_u64::equals(wuffs_base__range_ii_u64 s) { +wuffs_base__range_ii_u64::equals(wuffs_base__range_ii_u64 s) const { return wuffs_base__range_ii_u64__equals(this, s); } inline wuffs_base__range_ii_u64 // -wuffs_base__range_ii_u64::intersect(wuffs_base__range_ii_u64 s) { +wuffs_base__range_ii_u64::intersect(wuffs_base__range_ii_u64 s) const { return wuffs_base__range_ii_u64__intersect(this, s); } inline wuffs_base__range_ii_u64 // -wuffs_base__range_ii_u64::unite(wuffs_base__range_ii_u64 s) { +wuffs_base__range_ii_u64::unite(wuffs_base__range_ii_u64 s) const { return wuffs_base__range_ii_u64__unite(this, s); } inline bool // -wuffs_base__range_ii_u64::contains(uint64_t x) { +wuffs_base__range_ii_u64::contains(uint64_t x) const { return wuffs_base__range_ii_u64__contains(this, x); } inline bool // -wuffs_base__range_ii_u64::contains_range(wuffs_base__range_ii_u64 s) { +wuffs_base__range_ii_u64::contains_range(wuffs_base__range_ii_u64 s) const { return wuffs_base__range_ii_u64__contains_range(this, s); } @@ -850,15 +853,15 @@ typedef struct wuffs_base__range_ie_u64__struct { uint64_t max_excl; #ifdef __cplusplus - inline bool is_empty(); - inline bool equals(wuffs_base__range_ie_u64__struct s); + inline bool is_empty() const; + inline bool equals(wuffs_base__range_ie_u64__struct s) const; inline wuffs_base__range_ie_u64__struct intersect( - wuffs_base__range_ie_u64__struct s); + wuffs_base__range_ie_u64__struct s) const; inline wuffs_base__range_ie_u64__struct unite( - wuffs_base__range_ie_u64__struct s); - inline bool contains(uint64_t x); - inline bool contains_range(wuffs_base__range_ie_u64__struct s); - inline uint64_t length(); + wuffs_base__range_ie_u64__struct s) const; + inline bool contains(uint64_t x) const; + inline bool contains_range(wuffs_base__range_ie_u64__struct s) const; + inline uint64_t length() const; #endif // __cplusplus } wuffs_base__range_ie_u64; @@ -872,12 +875,12 @@ wuffs_base__make_range_ie_u64(uint64_t min_incl, uint64_t max_excl) { } static inline bool // -wuffs_base__range_ie_u64__is_empty(wuffs_base__range_ie_u64* r) { +wuffs_base__range_ie_u64__is_empty(const wuffs_base__range_ie_u64* r) { return r->min_incl >= r->max_excl; } static inline bool // -wuffs_base__range_ie_u64__equals(wuffs_base__range_ie_u64* r, +wuffs_base__range_ie_u64__equals(const wuffs_base__range_ie_u64* r, wuffs_base__range_ie_u64 s) { return (r->min_incl == s.min_incl && r->max_excl == s.max_excl) || (wuffs_base__range_ie_u64__is_empty(r) && @@ -885,7 +888,7 @@ wuffs_base__range_ie_u64__equals(wuffs_base__range_ie_u64* r, } static inline wuffs_base__range_ie_u64 // -wuffs_base__range_ie_u64__intersect(wuffs_base__range_ie_u64* r, +wuffs_base__range_ie_u64__intersect(const wuffs_base__range_ie_u64* r, wuffs_base__range_ie_u64 s) { wuffs_base__range_ie_u64 t; t.min_incl = wuffs_base__u64__max(r->min_incl, s.min_incl); @@ -894,7 +897,7 @@ wuffs_base__range_ie_u64__intersect(wuffs_base__range_ie_u64* r, } static inline wuffs_base__range_ie_u64 // -wuffs_base__range_ie_u64__unite(wuffs_base__range_ie_u64* r, +wuffs_base__range_ie_u64__unite(const wuffs_base__range_ie_u64* r, wuffs_base__range_ie_u64 s) { if (wuffs_base__range_ie_u64__is_empty(r)) { return s; @@ -909,56 +912,57 @@ wuffs_base__range_ie_u64__unite(wuffs_base__range_ie_u64* r, } static inline bool // -wuffs_base__range_ie_u64__contains(wuffs_base__range_ie_u64* r, uint64_t x) { +wuffs_base__range_ie_u64__contains(const wuffs_base__range_ie_u64* r, + uint64_t x) { return (r->min_incl <= x) && (x < r->max_excl); } static inline bool // -wuffs_base__range_ie_u64__contains_range(wuffs_base__range_ie_u64* r, +wuffs_base__range_ie_u64__contains_range(const wuffs_base__range_ie_u64* r, wuffs_base__range_ie_u64 s) { return wuffs_base__range_ie_u64__equals( &s, wuffs_base__range_ie_u64__intersect(r, s)); } static inline uint64_t // -wuffs_base__range_ie_u64__length(wuffs_base__range_ie_u64* r) { +wuffs_base__range_ie_u64__length(const wuffs_base__range_ie_u64* r) { return wuffs_base__u64__sat_sub(r->max_excl, r->min_incl); } #ifdef __cplusplus inline bool // -wuffs_base__range_ie_u64::is_empty() { +wuffs_base__range_ie_u64::is_empty() const { return wuffs_base__range_ie_u64__is_empty(this); } inline bool // -wuffs_base__range_ie_u64::equals(wuffs_base__range_ie_u64 s) { +wuffs_base__range_ie_u64::equals(wuffs_base__range_ie_u64 s) const { return wuffs_base__range_ie_u64__equals(this, s); } inline wuffs_base__range_ie_u64 // -wuffs_base__range_ie_u64::intersect(wuffs_base__range_ie_u64 s) { +wuffs_base__range_ie_u64::intersect(wuffs_base__range_ie_u64 s) const { return wuffs_base__range_ie_u64__intersect(this, s); } inline wuffs_base__range_ie_u64 // -wuffs_base__range_ie_u64::unite(wuffs_base__range_ie_u64 s) { +wuffs_base__range_ie_u64::unite(wuffs_base__range_ie_u64 s) const { return wuffs_base__range_ie_u64__unite(this, s); } inline bool // -wuffs_base__range_ie_u64::contains(uint64_t x) { +wuffs_base__range_ie_u64::contains(uint64_t x) const { return wuffs_base__range_ie_u64__contains(this, x); } inline bool // -wuffs_base__range_ie_u64::contains_range(wuffs_base__range_ie_u64 s) { +wuffs_base__range_ie_u64::contains_range(wuffs_base__range_ie_u64 s) const { return wuffs_base__range_ie_u64__contains_range(this, s); } inline uint64_t // -wuffs_base__range_ie_u64::length() { +wuffs_base__range_ie_u64::length() const { return wuffs_base__range_ie_u64__length(this); } @@ -982,14 +986,14 @@ typedef struct wuffs_base__rect_ii_u32__struct { uint32_t max_incl_y; #ifdef __cplusplus - inline bool is_empty(); - inline bool equals(wuffs_base__rect_ii_u32__struct s); + inline bool is_empty() const; + inline bool equals(wuffs_base__rect_ii_u32__struct s) const; inline wuffs_base__rect_ii_u32__struct intersect( - wuffs_base__rect_ii_u32__struct s); + wuffs_base__rect_ii_u32__struct s) const; inline wuffs_base__rect_ii_u32__struct unite( - wuffs_base__rect_ii_u32__struct s); - inline bool contains(uint32_t x, uint32_t y); - inline bool contains_rect(wuffs_base__rect_ii_u32__struct s); + wuffs_base__rect_ii_u32__struct s) const; + inline bool contains(uint32_t x, uint32_t y) const; + inline bool contains_rect(wuffs_base__rect_ii_u32__struct s) const; #endif // __cplusplus } wuffs_base__rect_ii_u32; @@ -1008,12 +1012,12 @@ wuffs_base__make_rect_ii_u32(uint32_t min_incl_x, } static inline bool // -wuffs_base__rect_ii_u32__is_empty(wuffs_base__rect_ii_u32* r) { +wuffs_base__rect_ii_u32__is_empty(const wuffs_base__rect_ii_u32* r) { return (r->min_incl_x > r->max_incl_x) || (r->min_incl_y > r->max_incl_y); } static inline bool // -wuffs_base__rect_ii_u32__equals(wuffs_base__rect_ii_u32* r, +wuffs_base__rect_ii_u32__equals(const wuffs_base__rect_ii_u32* r, wuffs_base__rect_ii_u32 s) { return (r->min_incl_x == s.min_incl_x && r->min_incl_y == s.min_incl_y && r->max_incl_x == s.max_incl_x && r->max_incl_y == s.max_incl_y) || @@ -1022,7 +1026,7 @@ wuffs_base__rect_ii_u32__equals(wuffs_base__rect_ii_u32* r, } static inline wuffs_base__rect_ii_u32 // -wuffs_base__rect_ii_u32__intersect(wuffs_base__rect_ii_u32* r, +wuffs_base__rect_ii_u32__intersect(const wuffs_base__rect_ii_u32* r, wuffs_base__rect_ii_u32 s) { wuffs_base__rect_ii_u32 t; t.min_incl_x = wuffs_base__u32__max(r->min_incl_x, s.min_incl_x); @@ -1033,7 +1037,7 @@ wuffs_base__rect_ii_u32__intersect(wuffs_base__rect_ii_u32* r, } static inline wuffs_base__rect_ii_u32 // -wuffs_base__rect_ii_u32__unite(wuffs_base__rect_ii_u32* r, +wuffs_base__rect_ii_u32__unite(const wuffs_base__rect_ii_u32* r, wuffs_base__rect_ii_u32 s) { if (wuffs_base__rect_ii_u32__is_empty(r)) { return s; @@ -1050,7 +1054,7 @@ wuffs_base__rect_ii_u32__unite(wuffs_base__rect_ii_u32* r, } static inline bool // -wuffs_base__rect_ii_u32__contains(wuffs_base__rect_ii_u32* r, +wuffs_base__rect_ii_u32__contains(const wuffs_base__rect_ii_u32* r, uint32_t x, uint32_t y) { return (r->min_incl_x <= x) && (x <= r->max_incl_x) && (r->min_incl_y <= y) && @@ -1058,7 +1062,7 @@ wuffs_base__rect_ii_u32__contains(wuffs_base__rect_ii_u32* r, } static inline bool // -wuffs_base__rect_ii_u32__contains_rect(wuffs_base__rect_ii_u32* r, +wuffs_base__rect_ii_u32__contains_rect(const wuffs_base__rect_ii_u32* r, wuffs_base__rect_ii_u32 s) { return wuffs_base__rect_ii_u32__equals( &s, wuffs_base__rect_ii_u32__intersect(r, s)); @@ -1067,32 +1071,32 @@ wuffs_base__rect_ii_u32__contains_rect(wuffs_base__rect_ii_u32* r, #ifdef __cplusplus inline bool // -wuffs_base__rect_ii_u32::is_empty() { +wuffs_base__rect_ii_u32::is_empty() const { return wuffs_base__rect_ii_u32__is_empty(this); } inline bool // -wuffs_base__rect_ii_u32::equals(wuffs_base__rect_ii_u32 s) { +wuffs_base__rect_ii_u32::equals(wuffs_base__rect_ii_u32 s) const { return wuffs_base__rect_ii_u32__equals(this, s); } inline wuffs_base__rect_ii_u32 // -wuffs_base__rect_ii_u32::intersect(wuffs_base__rect_ii_u32 s) { +wuffs_base__rect_ii_u32::intersect(wuffs_base__rect_ii_u32 s) const { return wuffs_base__rect_ii_u32__intersect(this, s); } inline wuffs_base__rect_ii_u32 // -wuffs_base__rect_ii_u32::unite(wuffs_base__rect_ii_u32 s) { +wuffs_base__rect_ii_u32::unite(wuffs_base__rect_ii_u32 s) const { return wuffs_base__rect_ii_u32__unite(this, s); } inline bool // -wuffs_base__rect_ii_u32::contains(uint32_t x, uint32_t y) { +wuffs_base__rect_ii_u32::contains(uint32_t x, uint32_t y) const { return wuffs_base__rect_ii_u32__contains(this, x, y); } inline bool // -wuffs_base__rect_ii_u32::contains_rect(wuffs_base__rect_ii_u32 s) { +wuffs_base__rect_ii_u32::contains_rect(wuffs_base__rect_ii_u32 s) const { return wuffs_base__rect_ii_u32__contains_rect(this, s); } @@ -1117,16 +1121,16 @@ typedef struct wuffs_base__rect_ie_u32__struct { uint32_t max_excl_y; #ifdef __cplusplus - inline bool is_empty(); - inline bool equals(wuffs_base__rect_ie_u32__struct s); + inline bool is_empty() const; + inline bool equals(wuffs_base__rect_ie_u32__struct s) const; inline wuffs_base__rect_ie_u32__struct intersect( - wuffs_base__rect_ie_u32__struct s); + wuffs_base__rect_ie_u32__struct s) const; inline wuffs_base__rect_ie_u32__struct unite( - wuffs_base__rect_ie_u32__struct s); - inline bool contains(uint32_t x, uint32_t y); - inline bool contains_rect(wuffs_base__rect_ie_u32__struct s); - inline uint32_t width(); - inline uint32_t height(); + wuffs_base__rect_ie_u32__struct s) const; + inline bool contains(uint32_t x, uint32_t y) const; + inline bool contains_rect(wuffs_base__rect_ie_u32__struct s) const; + inline uint32_t width() const; + inline uint32_t height() const; #endif // __cplusplus } wuffs_base__rect_ie_u32; @@ -1145,12 +1149,12 @@ wuffs_base__make_rect_ie_u32(uint32_t min_incl_x, } static inline bool // -wuffs_base__rect_ie_u32__is_empty(wuffs_base__rect_ie_u32* r) { +wuffs_base__rect_ie_u32__is_empty(const wuffs_base__rect_ie_u32* r) { return (r->min_incl_x >= r->max_excl_x) || (r->min_incl_y >= r->max_excl_y); } static inline bool // -wuffs_base__rect_ie_u32__equals(wuffs_base__rect_ie_u32* r, +wuffs_base__rect_ie_u32__equals(const wuffs_base__rect_ie_u32* r, wuffs_base__rect_ie_u32 s) { return (r->min_incl_x == s.min_incl_x && r->min_incl_y == s.min_incl_y && r->max_excl_x == s.max_excl_x && r->max_excl_y == s.max_excl_y) || @@ -1159,7 +1163,7 @@ wuffs_base__rect_ie_u32__equals(wuffs_base__rect_ie_u32* r, } static inline wuffs_base__rect_ie_u32 // -wuffs_base__rect_ie_u32__intersect(wuffs_base__rect_ie_u32* r, +wuffs_base__rect_ie_u32__intersect(const wuffs_base__rect_ie_u32* r, wuffs_base__rect_ie_u32 s) { wuffs_base__rect_ie_u32 t; t.min_incl_x = wuffs_base__u32__max(r->min_incl_x, s.min_incl_x); @@ -1170,7 +1174,7 @@ wuffs_base__rect_ie_u32__intersect(wuffs_base__rect_ie_u32* r, } static inline wuffs_base__rect_ie_u32 // -wuffs_base__rect_ie_u32__unite(wuffs_base__rect_ie_u32* r, +wuffs_base__rect_ie_u32__unite(const wuffs_base__rect_ie_u32* r, wuffs_base__rect_ie_u32 s) { if (wuffs_base__rect_ie_u32__is_empty(r)) { return s; @@ -1187,7 +1191,7 @@ wuffs_base__rect_ie_u32__unite(wuffs_base__rect_ie_u32* r, } static inline bool // -wuffs_base__rect_ie_u32__contains(wuffs_base__rect_ie_u32* r, +wuffs_base__rect_ie_u32__contains(const wuffs_base__rect_ie_u32* r, uint32_t x, uint32_t y) { return (r->min_incl_x <= x) && (x < r->max_excl_x) && (r->min_incl_y <= y) && @@ -1195,61 +1199,61 @@ wuffs_base__rect_ie_u32__contains(wuffs_base__rect_ie_u32* r, } static inline bool // -wuffs_base__rect_ie_u32__contains_rect(wuffs_base__rect_ie_u32* r, +wuffs_base__rect_ie_u32__contains_rect(const wuffs_base__rect_ie_u32* r, wuffs_base__rect_ie_u32 s) { return wuffs_base__rect_ie_u32__equals( &s, wuffs_base__rect_ie_u32__intersect(r, s)); } static inline uint32_t // -wuffs_base__rect_ie_u32__width(wuffs_base__rect_ie_u32* r) { +wuffs_base__rect_ie_u32__width(const wuffs_base__rect_ie_u32* r) { return wuffs_base__u32__sat_sub(r->max_excl_x, r->min_incl_x); } static inline uint32_t // -wuffs_base__rect_ie_u32__height(wuffs_base__rect_ie_u32* r) { +wuffs_base__rect_ie_u32__height(const wuffs_base__rect_ie_u32* r) { 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() { +wuffs_base__rect_ie_u32::is_empty() const { return wuffs_base__rect_ie_u32__is_empty(this); } inline bool // -wuffs_base__rect_ie_u32::equals(wuffs_base__rect_ie_u32 s) { +wuffs_base__rect_ie_u32::equals(wuffs_base__rect_ie_u32 s) const { return wuffs_base__rect_ie_u32__equals(this, s); } inline wuffs_base__rect_ie_u32 // -wuffs_base__rect_ie_u32::intersect(wuffs_base__rect_ie_u32 s) { +wuffs_base__rect_ie_u32::intersect(wuffs_base__rect_ie_u32 s) const { return wuffs_base__rect_ie_u32__intersect(this, s); } inline wuffs_base__rect_ie_u32 // -wuffs_base__rect_ie_u32::unite(wuffs_base__rect_ie_u32 s) { +wuffs_base__rect_ie_u32::unite(wuffs_base__rect_ie_u32 s) const { return wuffs_base__rect_ie_u32__unite(this, s); } inline bool // -wuffs_base__rect_ie_u32::contains(uint32_t x, uint32_t y) { +wuffs_base__rect_ie_u32::contains(uint32_t x, uint32_t y) const { return wuffs_base__rect_ie_u32__contains(this, x, y); } inline bool // -wuffs_base__rect_ie_u32::contains_rect(wuffs_base__rect_ie_u32 s) { +wuffs_base__rect_ie_u32::contains_rect(wuffs_base__rect_ie_u32 s) const { return wuffs_base__rect_ie_u32__contains_rect(this, s); } inline uint32_t // -wuffs_base__rect_ie_u32::width() { +wuffs_base__rect_ie_u32::width() const { return wuffs_base__rect_ie_u32__width(this); } inline uint32_t // -wuffs_base__rect_ie_u32::height() { +wuffs_base__rect_ie_u32::height() const { return wuffs_base__rect_ie_u32__height(this); } @@ -1306,8 +1310,8 @@ typedef struct wuffs_base__io_buffer__struct { inline void compact(); inline wuffs_base__io_reader reader(); inline wuffs_base__io_writer writer(); - inline uint64_t reader_io_position(); - inline uint64_t writer_io_position(); + inline uint64_t reader_io_position() const; + inline uint64_t writer_io_position() const; #endif // __cplusplus } wuffs_base__io_buffer; @@ -1409,12 +1413,12 @@ wuffs_base__io_buffer__writer(wuffs_base__io_buffer* buf) { } static inline uint64_t // -wuffs_base__io_buffer__reader_io_position(wuffs_base__io_buffer* buf) { +wuffs_base__io_buffer__reader_io_position(const wuffs_base__io_buffer* buf) { return buf ? wuffs_base__u64__sat_add(buf->meta.pos, buf->meta.ri) : 0; } static inline uint64_t // -wuffs_base__io_buffer__writer_io_position(wuffs_base__io_buffer* buf) { +wuffs_base__io_buffer__writer_io_position(const wuffs_base__io_buffer* buf) { return buf ? wuffs_base__u64__sat_add(buf->meta.pos, buf->meta.wi) : 0; } @@ -1436,12 +1440,12 @@ wuffs_base__io_buffer__struct::writer() { } inline uint64_t // -wuffs_base__io_buffer__struct::reader_io_position() { +wuffs_base__io_buffer__struct::reader_io_position() const { return wuffs_base__io_buffer__reader_io_position(this); } inline uint64_t // -wuffs_base__io_buffer__struct::writer_io_position() { +wuffs_base__io_buffer__struct::writer_io_position() const { return wuffs_base__io_buffer__writer_io_position(this); } @@ -1828,13 +1832,13 @@ typedef struct { uint32_t width, uint32_t height); 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 uint64_t pixbuf_len(); + inline bool is_valid() const; + inline wuffs_base__pixel_format pixel_format() const; + inline wuffs_base__pixel_subsampling pixel_subsampling() const; + inline wuffs_base__rect_ie_u32 bounds() const; + inline uint32_t width() const; + inline uint32_t height() const; + inline uint64_t pixbuf_len() const; #endif // __cplusplus } wuffs_base__pixel_config; @@ -1888,22 +1892,22 @@ wuffs_base__pixel_config__invalidate(wuffs_base__pixel_config* c) { } static inline bool // -wuffs_base__pixel_config__is_valid(wuffs_base__pixel_config* c) { +wuffs_base__pixel_config__is_valid(const wuffs_base__pixel_config* c) { return c && c->private_impl.pixfmt; } static inline wuffs_base__pixel_format // -wuffs_base__pixel_config__pixel_format(wuffs_base__pixel_config* c) { +wuffs_base__pixel_config__pixel_format(const wuffs_base__pixel_config* c) { return c ? c->private_impl.pixfmt : 0; } static inline wuffs_base__pixel_subsampling // -wuffs_base__pixel_config__pixel_subsampling(wuffs_base__pixel_config* c) { +wuffs_base__pixel_config__pixel_subsampling(const wuffs_base__pixel_config* c) { return c ? c->private_impl.pixsub : 0; } static inline wuffs_base__rect_ie_u32 // -wuffs_base__pixel_config__bounds(wuffs_base__pixel_config* c) { +wuffs_base__pixel_config__bounds(const wuffs_base__pixel_config* c) { if (c) { wuffs_base__rect_ie_u32 ret; ret.min_incl_x = 0; @@ -1922,12 +1926,12 @@ wuffs_base__pixel_config__bounds(wuffs_base__pixel_config* c) { } static inline uint32_t // -wuffs_base__pixel_config__width(wuffs_base__pixel_config* c) { +wuffs_base__pixel_config__width(const wuffs_base__pixel_config* c) { return c ? c->private_impl.width : 0; } static inline uint32_t // -wuffs_base__pixel_config__height(wuffs_base__pixel_config* c) { +wuffs_base__pixel_config__height(const wuffs_base__pixel_config* c) { return c ? c->private_impl.height : 0; } @@ -1935,7 +1939,7 @@ wuffs_base__pixel_config__height(wuffs_base__pixel_config* c) { // decoding into a color model different from the format's intrinsic one? For // example, decoding a JPEG image straight to RGBA instead of to YCbCr? static inline uint64_t // -wuffs_base__pixel_config__pixbuf_len(wuffs_base__pixel_config* c) { +wuffs_base__pixel_config__pixbuf_len(const wuffs_base__pixel_config* c) { if (!c) { return 0; } @@ -1984,37 +1988,37 @@ wuffs_base__pixel_config::invalidate() { } inline bool // -wuffs_base__pixel_config::is_valid() { +wuffs_base__pixel_config::is_valid() const { return wuffs_base__pixel_config__is_valid(this); } inline wuffs_base__pixel_format // -wuffs_base__pixel_config::pixel_format() { +wuffs_base__pixel_config::pixel_format() const { return wuffs_base__pixel_config__pixel_format(this); } inline wuffs_base__pixel_subsampling // -wuffs_base__pixel_config::pixel_subsampling() { +wuffs_base__pixel_config::pixel_subsampling() const { return wuffs_base__pixel_config__pixel_subsampling(this); } inline wuffs_base__rect_ie_u32 // -wuffs_base__pixel_config::bounds() { +wuffs_base__pixel_config::bounds() const { return wuffs_base__pixel_config__bounds(this); } inline uint32_t // -wuffs_base__pixel_config::width() { +wuffs_base__pixel_config::width() const { return wuffs_base__pixel_config__width(this); } inline uint32_t // -wuffs_base__pixel_config::height() { +wuffs_base__pixel_config::height() const { return wuffs_base__pixel_config__height(this); } inline uint64_t // -wuffs_base__pixel_config::pixbuf_len() { +wuffs_base__pixel_config::pixbuf_len() const { return wuffs_base__pixel_config__pixbuf_len(this); } @@ -2040,9 +2044,9 @@ typedef struct { uint64_t first_frame_io_position, bool first_frame_is_opaque); inline void invalidate(); - inline bool is_valid(); - inline uint64_t first_frame_io_position(); - inline bool first_frame_is_opaque(); + inline bool is_valid() const; + inline uint64_t first_frame_io_position() const; + inline bool first_frame_is_opaque() const; #endif // __cplusplus } wuffs_base__image_config; @@ -2099,17 +2103,19 @@ wuffs_base__image_config__invalidate(wuffs_base__image_config* c) { } static inline bool // -wuffs_base__image_config__is_valid(wuffs_base__image_config* c) { +wuffs_base__image_config__is_valid(const wuffs_base__image_config* c) { return c && wuffs_base__pixel_config__is_valid(&(c->pixcfg)); } static inline uint64_t // -wuffs_base__image_config__first_frame_io_position(wuffs_base__image_config* c) { +wuffs_base__image_config__first_frame_io_position( + const wuffs_base__image_config* c) { return c ? c->private_impl.first_frame_io_position : 0; } static inline bool // -wuffs_base__image_config__first_frame_is_opaque(wuffs_base__image_config* c) { +wuffs_base__image_config__first_frame_is_opaque( + const wuffs_base__image_config* c) { return c ? c->private_impl.first_frame_is_opaque : false; } @@ -2132,17 +2138,17 @@ wuffs_base__image_config::invalidate() { } inline bool // -wuffs_base__image_config::is_valid() { +wuffs_base__image_config::is_valid() const { return wuffs_base__image_config__is_valid(this); } inline uint64_t // -wuffs_base__image_config::first_frame_io_position() { +wuffs_base__image_config::first_frame_io_position() const { return wuffs_base__image_config__first_frame_io_position(this); } inline bool // -wuffs_base__image_config::first_frame_is_opaque() { +wuffs_base__image_config::first_frame_is_opaque() const { return wuffs_base__image_config__first_frame_is_opaque(this); } @@ -2207,14 +2213,14 @@ typedef struct { uint64_t io_position, wuffs_base__animation_blend blend, wuffs_base__animation_disposal disposal); - inline wuffs_base__rect_ie_u32 bounds(); - inline uint32_t width(); - inline uint32_t height(); - inline wuffs_base__flicks duration(); - inline uint64_t index(); - inline uint64_t io_position(); - inline wuffs_base__animation_blend blend(); - inline wuffs_base__animation_disposal disposal(); + inline wuffs_base__rect_ie_u32 bounds() const; + inline uint32_t width() const; + inline uint32_t height() const; + inline wuffs_base__flicks duration() const; + inline uint64_t index() const; + inline uint64_t io_position() const; + inline wuffs_base__animation_blend blend() const; + inline wuffs_base__animation_disposal disposal() const; #endif // __cplusplus } wuffs_base__frame_config; @@ -2252,7 +2258,7 @@ wuffs_base__frame_config__update(wuffs_base__frame_config* c, } static inline wuffs_base__rect_ie_u32 // -wuffs_base__frame_config__bounds(wuffs_base__frame_config* c) { +wuffs_base__frame_config__bounds(const wuffs_base__frame_config* c) { if (c) { return c->private_impl.bounds; } @@ -2266,47 +2272,47 @@ wuffs_base__frame_config__bounds(wuffs_base__frame_config* c) { } static inline uint32_t // -wuffs_base__frame_config__width(wuffs_base__frame_config* c) { +wuffs_base__frame_config__width(const wuffs_base__frame_config* c) { return c ? wuffs_base__rect_ie_u32__width(&c->private_impl.bounds) : 0; } static inline uint32_t // -wuffs_base__frame_config__height(wuffs_base__frame_config* c) { +wuffs_base__frame_config__height(const wuffs_base__frame_config* c) { return c ? wuffs_base__rect_ie_u32__height(&c->private_impl.bounds) : 0; } // wuffs_base__frame_config__duration returns the amount of time to display // this frame. Zero means to display forever - a still (non-animated) image. static inline wuffs_base__flicks // -wuffs_base__frame_config__duration(wuffs_base__frame_config* c) { +wuffs_base__frame_config__duration(const wuffs_base__frame_config* c) { return c ? c->private_impl.duration : 0; } // wuffs_base__frame_config__index returns the index of this frame. The first // frame in an image has index 0, the second frame has index 1, and so on. static inline uint64_t // -wuffs_base__frame_config__index(wuffs_base__frame_config* c) { +wuffs_base__frame_config__index(const wuffs_base__frame_config* c) { return c ? c->private_impl.index : 0; } // wuffs_base__frame_config__io_position returns the I/O stream position before // the frame config. static inline uint64_t // -wuffs_base__frame_config__io_position(wuffs_base__frame_config* c) { +wuffs_base__frame_config__io_position(const wuffs_base__frame_config* c) { return c ? c->private_impl.io_position : 0; } // wuffs_base__frame_config__blend returns, for an animated image, how to blend // the transparent pixels of this frame with the existing canvas. static inline wuffs_base__animation_blend // -wuffs_base__frame_config__blend(wuffs_base__frame_config* c) { +wuffs_base__frame_config__blend(const wuffs_base__frame_config* c) { return c ? c->private_impl.blend : 0; } // wuffs_base__frame_config__disposal returns, for an animated image, how to // dispose of this frame after displaying it. static inline wuffs_base__animation_disposal // -wuffs_base__frame_config__disposal(wuffs_base__frame_config* c) { +wuffs_base__frame_config__disposal(const wuffs_base__frame_config* c) { return c ? c->private_impl.disposal : 0; } @@ -2324,42 +2330,42 @@ wuffs_base__frame_config::update(wuffs_base__rect_ie_u32 bounds, } inline wuffs_base__rect_ie_u32 // -wuffs_base__frame_config::bounds() { +wuffs_base__frame_config::bounds() const { return wuffs_base__frame_config__bounds(this); } inline uint32_t // -wuffs_base__frame_config::width() { +wuffs_base__frame_config::width() const { return wuffs_base__frame_config__width(this); } inline uint32_t // -wuffs_base__frame_config::height() { +wuffs_base__frame_config::height() const { return wuffs_base__frame_config__height(this); } inline wuffs_base__flicks // -wuffs_base__frame_config::duration() { +wuffs_base__frame_config::duration() const { return wuffs_base__frame_config__duration(this); } inline uint64_t // -wuffs_base__frame_config::index() { +wuffs_base__frame_config::index() const { return wuffs_base__frame_config__index(this); } inline uint64_t // -wuffs_base__frame_config::io_position() { +wuffs_base__frame_config::io_position() const { return wuffs_base__frame_config__io_position(this); } inline wuffs_base__animation_blend // -wuffs_base__frame_config::blend() { +wuffs_base__frame_config::blend() const { return wuffs_base__frame_config__blend(this); } inline wuffs_base__animation_disposal // -wuffs_base__frame_config::disposal() { +wuffs_base__frame_config::disposal() const { return wuffs_base__frame_config__disposal(this); } @@ -2381,7 +2387,7 @@ typedef struct { inline wuffs_base__status set_from_slice(wuffs_base__pixel_config* pixcfg, wuffs_base__slice_u8 pixbuf_memory); inline wuffs_base__slice_u8 palette(); - inline wuffs_base__pixel_format pixel_format(); + inline wuffs_base__pixel_format pixel_format() const; inline wuffs_base__table_u8 plane(uint32_t p); #endif // __cplusplus @@ -2478,7 +2484,7 @@ wuffs_base__pixel_buffer__palette(wuffs_base__pixel_buffer* b) { } static inline wuffs_base__pixel_format // -wuffs_base__pixel_buffer__pixel_format(wuffs_base__pixel_buffer* b) { +wuffs_base__pixel_buffer__pixel_format(const wuffs_base__pixel_buffer* b) { if (b) { return b->pixcfg.private_impl.pixfmt; } @@ -2513,7 +2519,7 @@ wuffs_base__pixel_buffer::palette() { } inline wuffs_base__pixel_format // -wuffs_base__pixel_buffer::pixel_format() { +wuffs_base__pixel_buffer::pixel_format() const { return wuffs_base__pixel_buffer__pixel_format(this); } @@ -2561,7 +2567,7 @@ typedef struct { wuffs_base__slice_u8 src_palette); inline uint64_t swizzle_packed(wuffs_base__slice_u8 dst, wuffs_base__slice_u8 dst_palette, - wuffs_base__slice_u8 src); + wuffs_base__slice_u8 src) const; #endif // __cplusplus } wuffs_base__pixel_swizzler; @@ -2576,7 +2582,7 @@ wuffs_base__pixel_swizzler__prepare(wuffs_base__pixel_swizzler* p, wuffs_base__slice_u8 src_palette); uint64_t // -wuffs_base__pixel_swizzler__swizzle_packed(wuffs_base__pixel_swizzler* p, +wuffs_base__pixel_swizzler__swizzle_packed(const wuffs_base__pixel_swizzler* p, wuffs_base__slice_u8 dst, wuffs_base__slice_u8 dst_palette, wuffs_base__slice_u8 src); @@ -2595,7 +2601,7 @@ wuffs_base__pixel_swizzler::prepare(wuffs_base__pixel_format dst_format, uint64_t // wuffs_base__pixel_swizzler::swizzle_packed(wuffs_base__slice_u8 dst, wuffs_base__slice_u8 dst_palette, - wuffs_base__slice_u8 src) { + wuffs_base__slice_u8 src) const { return wuffs_base__pixel_swizzler__swizzle_packed(this, dst, dst_palette, src); } @@ -4785,7 +4791,7 @@ wuffs_base__pixel_swizzler__prepare(wuffs_base__pixel_swizzler* p, } uint64_t // -wuffs_base__pixel_swizzler__swizzle_packed(wuffs_base__pixel_swizzler* p, +wuffs_base__pixel_swizzler__swizzle_packed(const wuffs_base__pixel_swizzler* p, wuffs_base__slice_u8 dst, wuffs_base__slice_u8 dst_palette, wuffs_base__slice_u8 src) {