From 0a1ce533fda421304fe97b19dbae4b26e6ebc8f1 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 23 Jun 2018 08:01:25 +1000 Subject: [PATCH] Add a wuffs_base__image_buffer__bounds function --- cmd/wuffs-c/internal/cgen/base/base-public.h | 16 ++++++++++++++++ cmd/wuffs-c/internal/cgen/data.go | 7 ++++--- example/gifplayer/gifplayer.c | 17 ++++++----------- gen/c/base.c | 16 ++++++++++++++++ gen/c/std/adler32.c | 16 ++++++++++++++++ gen/c/std/crc32.c | 16 ++++++++++++++++ gen/c/std/deflate.c | 16 ++++++++++++++++ gen/c/std/gif.c | 16 ++++++++++++++++ gen/c/std/gzip.c | 16 ++++++++++++++++ gen/c/std/lzw.c | 16 ++++++++++++++++ gen/c/std/zlib.c | 16 ++++++++++++++++ gen/h/std/adler32.h | 16 ++++++++++++++++ gen/h/std/crc32.h | 16 ++++++++++++++++ gen/h/std/deflate.h | 16 ++++++++++++++++ gen/h/std/gif.h | 16 ++++++++++++++++ gen/h/std/gzip.h | 16 ++++++++++++++++ gen/h/std/lzw.h | 16 ++++++++++++++++ gen/h/std/zlib.h | 16 ++++++++++++++++ 18 files changed, 266 insertions(+), 14 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/base/base-public.h b/cmd/wuffs-c/internal/cgen/base/base-public.h index ede1cd7c..31d7b668 100644 --- a/cmd/wuffs-c/internal/cgen/base/base-public.h +++ b/cmd/wuffs-c/internal/cgen/base/base-public.h @@ -1212,6 +1212,22 @@ static inline wuffs_base__image_config* wuffs_base__image_buffer__image_config( return b ? &b->private_impl.config : NULL; } +static inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__bounds( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__bounds(&b->private_impl.config) + : ((wuffs_base__rect_ie_u32){}); +} + +static inline uint32_t wuffs_base__image_buffer__width( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__width(&b->private_impl.config) : 0; +} + +static inline uint32_t wuffs_base__image_buffer__height( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__height(&b->private_impl.config) : 0; +} + // wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of // this frame's pixels differs from the previous frame. static inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__dirty_rect( diff --git a/cmd/wuffs-c/internal/cgen/data.go b/cmd/wuffs-c/internal/cgen/data.go index 34cebd17..9bbc883e 100644 --- a/cmd/wuffs-c/internal/cgen/data.go +++ b/cmd/wuffs-c/internal/cgen/data.go @@ -89,9 +89,10 @@ const basePublicH = "" + "// --------\n\ntypedef struct {\n // Do not access the private_impl's fields directly. There is no API/ABI\n // compatibility or safety guarantee if you do so.\n struct {\n wuffs_base__image_config config;\n uint32_t loop_count; // 0-based count of the current loop.\n wuffs_base__pixel_buffer pixbuf;\n // TODO: color spaces.\n wuffs_base__rect_ie_u32 dirty_rect;\n wuffs_base__flicks duration;\n bool blend;\n wuffs_base__animation_disposal disposal;\n bool palette_changed;\n uint8_t palette[1024];\n } private_impl;\n} wuffs_base__image_buffer;\n\nstatic inline wuffs_base__status wuffs_base__image_buffer__set_from_pixbuf(\n wuffs_base__image_buffer* b,\n wuffs_base__image_config config,\n wuffs_base__pixel_buffer pixbuf) {\n if (!b) {\n return WUFFS_BASE__ERROR_BAD_RECEIVER;\n }\n *b = ((wuffs_base__image_buffer){});\n b->private_impl.config = config;\n b->private_impl.pixbuf = pixbuf;\n return WUFFS_BASE__STATUS_OK;\n}\n\nstatic inline wuffs_base__status wuffs_base__image_buffer__set_from_" + "slice(\n wuffs_base__image_buffer* b,\n wuffs_base__image_config config,\n wuffs_base__slice_u8 pixbuf_memory) {\n if (!b) {\n return WUFFS_BASE__ERROR_BAD_RECEIVER;\n }\n *b = ((wuffs_base__image_buffer){});\n // TODO: don't assume 1 byte per pixel. Don't assume packed.\n uint64_t wh = ((uint64_t)config.private_impl.width) *\n ((uint64_t)config.private_impl.height);\n if (wh > pixbuf_memory.len) {\n return WUFFS_BASE__ERROR_BAD_ARGUMENT_LENGTH_TOO_SHORT;\n }\n b->private_impl.config = config;\n wuffs_base__table_u8* tab = &b->private_impl.pixbuf.planes[0];\n tab->ptr = pixbuf_memory.ptr;\n tab->width = config.private_impl.width;\n tab->height = config.private_impl.height;\n tab->stride = config.private_impl.width;\n return WUFFS_BASE__STATUS_OK;\n}\n\n// The palette argument is ignored unless its length is exactly 1024.\nstatic inline void wuffs_base__image_buffer__update(\n wuffs_base__image_buffer* b,\n wuffs_base__rect_ie_u32 dirty_rect,\n wuffs_base__flicks duration,\n bool bl" + "end,\n wuffs_base__animation_disposal disposal,\n wuffs_base__slice_u8 palette) {\n if (!b) {\n return;\n }\n\n // Clip the dirty_rect to the image bounds.\n dirty_rect.max_excl_x = wuffs_base__u32__min(\n dirty_rect.max_excl_x, b->private_impl.config.private_impl.width);\n dirty_rect.max_excl_y = wuffs_base__u32__min(\n dirty_rect.max_excl_y, b->private_impl.config.private_impl.height);\n b->private_impl.dirty_rect = dirty_rect;\n\n b->private_impl.duration = duration;\n b->private_impl.blend = blend;\n b->private_impl.disposal = disposal;\n b->private_impl.palette_changed = palette.ptr && (palette.len == 1024);\n if (b->private_impl.palette_changed) {\n memmove(b->private_impl.palette, palette.ptr, 1024);\n }\n}\n\n// wuffs_base__image_buffer__loop returns whether the image decoder should loop\n// back to the beginning of the animation, assuming that we've reached the end\n// of the encoded stream. If so, it increments b's count of the animation loops\n// played so far.\nstatic inline bool wuffs_base" + - "__image_buffer__loop(wuffs_base__image_buffer* b) {\n if (!b) {\n return false;\n }\n uint32_t n = b->private_impl.config.private_impl.num_loops;\n if (n == 0) {\n return true;\n }\n if (b->private_impl.loop_count < n - 1) {\n b->private_impl.loop_count++;\n return true;\n }\n return false;\n}\n\n// wuffs_base__image_config returns the overall configuration for this frame.\nstatic inline wuffs_base__image_config* wuffs_base__image_buffer__image_config(\n wuffs_base__image_buffer* b) {\n return b ? &b->private_impl.config : NULL;\n}\n\n// wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of\n// this frame's pixels differs from the previous frame.\nstatic inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__dirty_rect(\n wuffs_base__image_buffer* b) {\n return b ? b->private_impl.dirty_rect : ((wuffs_base__rect_ie_u32){});\n}\n\n// wuffs_base__image_buffer__duration returns the amount of time to display\n// this frame. Zero means to display forever - a still (non-animated) image.\nstat" + - "ic inline wuffs_base__flicks wuffs_base__image_buffer__duration(\n wuffs_base__image_buffer* b) {\n return b ? b->private_impl.duration : 0;\n}\n\n// wuffs_base__image_buffer__blend returns, for a transparent image, whether to\n// blend this frame with the existing canvas.\n//\n// In Porter-Duff compositing operator terminology, false means \"src\" and true\n// means \"src over dst\".\nstatic inline bool wuffs_base__image_buffer__blend(\n wuffs_base__image_buffer* b) {\n return b && b->private_impl.blend;\n}\n\n// wuffs_base__image_buffer__disposal returns, for an animated image, how to\n// dispose of this frame after displaying it.\nstatic inline wuffs_base__animation_disposal wuffs_base__image_buffer__disposal(\n wuffs_base__image_buffer* b) {\n return b ? b->private_impl.disposal : 0;\n}\n\n// wuffs_base__image_buffer__palette_changed returns whether this frame's\n// palette differs from the previous frame. It is conservative and may return\n// false positives (but never false negatives).\nstatic inline bool wuffs_base__im" + - "age_buffer__palette_changed(\n wuffs_base__image_buffer* b) {\n return b && b->private_impl.palette_changed;\n}\n\n// wuffs_base__image_buffer__palette returns the palette that the pixel data\n// can index. The backing array is inside b and has length 1024.\nstatic inline wuffs_base__slice_u8 wuffs_base__image_buffer__palette(\n wuffs_base__image_buffer* b) {\n return b ? ((wuffs_base__slice_u8){.ptr = b->private_impl.palette,\n .len = 1024})\n : ((wuffs_base__slice_u8){});\n}\n\nstatic inline wuffs_base__table_u8 wuffs_base__image_buffer__plane(\n wuffs_base__image_buffer* b,\n uint32_t p) {\n return (b && (p < WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX))\n ? b->private_impl.pixbuf.planes[p]\n : ((wuffs_base__table_u8){});\n}\n\n#ifdef __cplusplus\n} // extern \"C\"\n#endif\n\n#endif // WUFFS_INCLUDE_GUARD__BASE_PUBLIC\n" + + "__image_buffer__loop(wuffs_base__image_buffer* b) {\n if (!b) {\n return false;\n }\n uint32_t n = b->private_impl.config.private_impl.num_loops;\n if (n == 0) {\n return true;\n }\n if (b->private_impl.loop_count < n - 1) {\n b->private_impl.loop_count++;\n return true;\n }\n return false;\n}\n\n// wuffs_base__image_config returns the overall configuration for this frame.\nstatic inline wuffs_base__image_config* wuffs_base__image_buffer__image_config(\n wuffs_base__image_buffer* b) {\n return b ? &b->private_impl.config : NULL;\n}\n\nstatic inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__bounds(\n wuffs_base__image_buffer* b) {\n return b ? wuffs_base__image_config__bounds(&b->private_impl.config)\n : ((wuffs_base__rect_ie_u32){});\n}\n\nstatic inline uint32_t wuffs_base__image_buffer__width(\n wuffs_base__image_buffer* b) {\n return b ? wuffs_base__image_config__width(&b->private_impl.config) : 0;\n}\n\nstatic inline uint32_t wuffs_base__image_buffer__height(\n wuffs_base__image_buffer*" + + " b) {\n return b ? wuffs_base__image_config__height(&b->private_impl.config) : 0;\n}\n\n// wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of\n// this frame's pixels differs from the previous frame.\nstatic inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__dirty_rect(\n wuffs_base__image_buffer* b) {\n return b ? b->private_impl.dirty_rect : ((wuffs_base__rect_ie_u32){});\n}\n\n// wuffs_base__image_buffer__duration returns the amount of time to display\n// this frame. Zero means to display forever - a still (non-animated) image.\nstatic inline wuffs_base__flicks wuffs_base__image_buffer__duration(\n wuffs_base__image_buffer* b) {\n return b ? b->private_impl.duration : 0;\n}\n\n// wuffs_base__image_buffer__blend returns, for a transparent image, whether to\n// blend this frame with the existing canvas.\n//\n// In Porter-Duff compositing operator terminology, false means \"src\" and true\n// means \"src over dst\".\nstatic inline bool wuffs_base__image_buffer__blend(\n wuffs_base__image_buffer" + + "* b) {\n return b && b->private_impl.blend;\n}\n\n// wuffs_base__image_buffer__disposal returns, for an animated image, how to\n// dispose of this frame after displaying it.\nstatic inline wuffs_base__animation_disposal wuffs_base__image_buffer__disposal(\n wuffs_base__image_buffer* b) {\n return b ? b->private_impl.disposal : 0;\n}\n\n// wuffs_base__image_buffer__palette_changed returns whether this frame's\n// palette differs from the previous frame. It is conservative and may return\n// false positives (but never false negatives).\nstatic inline bool wuffs_base__image_buffer__palette_changed(\n wuffs_base__image_buffer* b) {\n return b && b->private_impl.palette_changed;\n}\n\n// wuffs_base__image_buffer__palette returns the palette that the pixel data\n// can index. The backing array is inside b and has length 1024.\nstatic inline wuffs_base__slice_u8 wuffs_base__image_buffer__palette(\n wuffs_base__image_buffer* b) {\n return b ? ((wuffs_base__slice_u8){.ptr = b->private_impl.palette,\n " + + " .len = 1024})\n : ((wuffs_base__slice_u8){});\n}\n\nstatic inline wuffs_base__table_u8 wuffs_base__image_buffer__plane(\n wuffs_base__image_buffer* b,\n uint32_t p) {\n return (b && (p < WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX))\n ? b->private_impl.pixbuf.planes[p]\n : ((wuffs_base__table_u8){});\n}\n\n#ifdef __cplusplus\n} // extern \"C\"\n#endif\n\n#endif // WUFFS_INCLUDE_GUARD__BASE_PUBLIC\n" + "" const basePrivateH = "" + diff --git a/example/gifplayer/gifplayer.c b/example/gifplayer/gifplayer.c index bcd6e73f..bef41108 100644 --- a/example/gifplayer/gifplayer.c +++ b/example/gifplayer/gifplayer.c @@ -125,8 +125,7 @@ static inline uint32_t load_u32le(uint8_t* p) { } void restore_background(wuffs_base__image_buffer* ib) { - wuffs_base__image_config* ic = wuffs_base__image_buffer__image_config(ib); - size_t width = wuffs_base__image_config__width(ic); + size_t width = wuffs_base__image_buffer__width(ib); wuffs_base__rect_ie_u32 bounds = wuffs_base__image_buffer__dirty_rect(ib); size_t y; @@ -141,9 +140,7 @@ void restore_background(wuffs_base__image_buffer* ib) { void compose(wuffs_base__image_buffer* ib) { uint8_t* palette = wuffs_base__image_buffer__palette(ib).ptr; - - wuffs_base__image_config* ic = wuffs_base__image_buffer__image_config(ib); - size_t width = wuffs_base__image_config__width(ic); + size_t width = wuffs_base__image_buffer__width(ib); wuffs_base__rect_ie_u32 bounds = wuffs_base__image_buffer__dirty_rect(ib); size_t y; @@ -163,9 +160,8 @@ void compose(wuffs_base__image_buffer* ib) { } size_t print_ascii_art(wuffs_base__image_buffer* ib) { - wuffs_base__image_config* ic = wuffs_base__image_buffer__image_config(ib); - uint32_t width = wuffs_base__image_config__width(ic); - uint32_t height = wuffs_base__image_config__height(ic); + uint32_t width = wuffs_base__image_buffer__width(ib); + uint32_t height = wuffs_base__image_buffer__height(ib); wuffs_base__color_u32argb* d = dst_buffer; uint8_t* p = print_buffer; @@ -190,9 +186,8 @@ size_t print_ascii_art(wuffs_base__image_buffer* ib) { } size_t print_color_art(wuffs_base__image_buffer* ib) { - wuffs_base__image_config* ic = wuffs_base__image_buffer__image_config(ib); - uint32_t width = wuffs_base__image_config__width(ic); - uint32_t height = wuffs_base__image_config__height(ic); + uint32_t width = wuffs_base__image_buffer__width(ib); + uint32_t height = wuffs_base__image_buffer__height(ib); wuffs_base__color_u32argb* d = dst_buffer; uint8_t* p = print_buffer; diff --git a/gen/c/base.c b/gen/c/base.c index 73726204..71c1c3fb 100644 --- a/gen/c/base.c +++ b/gen/c/base.c @@ -1243,6 +1243,22 @@ static inline wuffs_base__image_config* wuffs_base__image_buffer__image_config( return b ? &b->private_impl.config : NULL; } +static inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__bounds( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__bounds(&b->private_impl.config) + : ((wuffs_base__rect_ie_u32){}); +} + +static inline uint32_t wuffs_base__image_buffer__width( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__width(&b->private_impl.config) : 0; +} + +static inline uint32_t wuffs_base__image_buffer__height( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__height(&b->private_impl.config) : 0; +} + // wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of // this frame's pixels differs from the previous frame. static inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__dirty_rect( diff --git a/gen/c/std/adler32.c b/gen/c/std/adler32.c index 974bcff0..4395ea2e 100644 --- a/gen/c/std/adler32.c +++ b/gen/c/std/adler32.c @@ -1232,6 +1232,22 @@ static inline wuffs_base__image_config* wuffs_base__image_buffer__image_config( return b ? &b->private_impl.config : NULL; } +static inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__bounds( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__bounds(&b->private_impl.config) + : ((wuffs_base__rect_ie_u32){}); +} + +static inline uint32_t wuffs_base__image_buffer__width( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__width(&b->private_impl.config) : 0; +} + +static inline uint32_t wuffs_base__image_buffer__height( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__height(&b->private_impl.config) : 0; +} + // wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of // this frame's pixels differs from the previous frame. static inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__dirty_rect( diff --git a/gen/c/std/crc32.c b/gen/c/std/crc32.c index 22d7a083..da63ced4 100644 --- a/gen/c/std/crc32.c +++ b/gen/c/std/crc32.c @@ -1232,6 +1232,22 @@ static inline wuffs_base__image_config* wuffs_base__image_buffer__image_config( return b ? &b->private_impl.config : NULL; } +static inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__bounds( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__bounds(&b->private_impl.config) + : ((wuffs_base__rect_ie_u32){}); +} + +static inline uint32_t wuffs_base__image_buffer__width( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__width(&b->private_impl.config) : 0; +} + +static inline uint32_t wuffs_base__image_buffer__height( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__height(&b->private_impl.config) : 0; +} + // wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of // this frame's pixels differs from the previous frame. static inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__dirty_rect( diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index 0fe9318a..41f34828 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -1232,6 +1232,22 @@ static inline wuffs_base__image_config* wuffs_base__image_buffer__image_config( return b ? &b->private_impl.config : NULL; } +static inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__bounds( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__bounds(&b->private_impl.config) + : ((wuffs_base__rect_ie_u32){}); +} + +static inline uint32_t wuffs_base__image_buffer__width( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__width(&b->private_impl.config) : 0; +} + +static inline uint32_t wuffs_base__image_buffer__height( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__height(&b->private_impl.config) : 0; +} + // wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of // this frame's pixels differs from the previous frame. static inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__dirty_rect( diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 8f6c16a0..45fab5af 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -1232,6 +1232,22 @@ static inline wuffs_base__image_config* wuffs_base__image_buffer__image_config( return b ? &b->private_impl.config : NULL; } +static inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__bounds( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__bounds(&b->private_impl.config) + : ((wuffs_base__rect_ie_u32){}); +} + +static inline uint32_t wuffs_base__image_buffer__width( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__width(&b->private_impl.config) : 0; +} + +static inline uint32_t wuffs_base__image_buffer__height( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__height(&b->private_impl.config) : 0; +} + // wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of // this frame's pixels differs from the previous frame. static inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__dirty_rect( diff --git a/gen/c/std/gzip.c b/gen/c/std/gzip.c index ed899b7a..f2ef4e1c 100644 --- a/gen/c/std/gzip.c +++ b/gen/c/std/gzip.c @@ -1232,6 +1232,22 @@ static inline wuffs_base__image_config* wuffs_base__image_buffer__image_config( return b ? &b->private_impl.config : NULL; } +static inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__bounds( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__bounds(&b->private_impl.config) + : ((wuffs_base__rect_ie_u32){}); +} + +static inline uint32_t wuffs_base__image_buffer__width( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__width(&b->private_impl.config) : 0; +} + +static inline uint32_t wuffs_base__image_buffer__height( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__height(&b->private_impl.config) : 0; +} + // wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of // this frame's pixels differs from the previous frame. static inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__dirty_rect( diff --git a/gen/c/std/lzw.c b/gen/c/std/lzw.c index 41703b69..9d735986 100644 --- a/gen/c/std/lzw.c +++ b/gen/c/std/lzw.c @@ -1232,6 +1232,22 @@ static inline wuffs_base__image_config* wuffs_base__image_buffer__image_config( return b ? &b->private_impl.config : NULL; } +static inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__bounds( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__bounds(&b->private_impl.config) + : ((wuffs_base__rect_ie_u32){}); +} + +static inline uint32_t wuffs_base__image_buffer__width( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__width(&b->private_impl.config) : 0; +} + +static inline uint32_t wuffs_base__image_buffer__height( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__height(&b->private_impl.config) : 0; +} + // wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of // this frame's pixels differs from the previous frame. static inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__dirty_rect( diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index 5480b1ca..ac5e9889 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -1232,6 +1232,22 @@ static inline wuffs_base__image_config* wuffs_base__image_buffer__image_config( return b ? &b->private_impl.config : NULL; } +static inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__bounds( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__bounds(&b->private_impl.config) + : ((wuffs_base__rect_ie_u32){}); +} + +static inline uint32_t wuffs_base__image_buffer__width( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__width(&b->private_impl.config) : 0; +} + +static inline uint32_t wuffs_base__image_buffer__height( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__height(&b->private_impl.config) : 0; +} + // wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of // this frame's pixels differs from the previous frame. static inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__dirty_rect( diff --git a/gen/h/std/adler32.h b/gen/h/std/adler32.h index fcebcc13..109a4aed 100644 --- a/gen/h/std/adler32.h +++ b/gen/h/std/adler32.h @@ -1232,6 +1232,22 @@ static inline wuffs_base__image_config* wuffs_base__image_buffer__image_config( return b ? &b->private_impl.config : NULL; } +static inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__bounds( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__bounds(&b->private_impl.config) + : ((wuffs_base__rect_ie_u32){}); +} + +static inline uint32_t wuffs_base__image_buffer__width( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__width(&b->private_impl.config) : 0; +} + +static inline uint32_t wuffs_base__image_buffer__height( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__height(&b->private_impl.config) : 0; +} + // wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of // this frame's pixels differs from the previous frame. static inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__dirty_rect( diff --git a/gen/h/std/crc32.h b/gen/h/std/crc32.h index 37f7d7dd..efaada9c 100644 --- a/gen/h/std/crc32.h +++ b/gen/h/std/crc32.h @@ -1232,6 +1232,22 @@ static inline wuffs_base__image_config* wuffs_base__image_buffer__image_config( return b ? &b->private_impl.config : NULL; } +static inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__bounds( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__bounds(&b->private_impl.config) + : ((wuffs_base__rect_ie_u32){}); +} + +static inline uint32_t wuffs_base__image_buffer__width( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__width(&b->private_impl.config) : 0; +} + +static inline uint32_t wuffs_base__image_buffer__height( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__height(&b->private_impl.config) : 0; +} + // wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of // this frame's pixels differs from the previous frame. static inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__dirty_rect( diff --git a/gen/h/std/deflate.h b/gen/h/std/deflate.h index 71f94f2d..8e037953 100644 --- a/gen/h/std/deflate.h +++ b/gen/h/std/deflate.h @@ -1232,6 +1232,22 @@ static inline wuffs_base__image_config* wuffs_base__image_buffer__image_config( return b ? &b->private_impl.config : NULL; } +static inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__bounds( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__bounds(&b->private_impl.config) + : ((wuffs_base__rect_ie_u32){}); +} + +static inline uint32_t wuffs_base__image_buffer__width( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__width(&b->private_impl.config) : 0; +} + +static inline uint32_t wuffs_base__image_buffer__height( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__height(&b->private_impl.config) : 0; +} + // wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of // this frame's pixels differs from the previous frame. static inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__dirty_rect( diff --git a/gen/h/std/gif.h b/gen/h/std/gif.h index 48c65c0f..877a62e7 100644 --- a/gen/h/std/gif.h +++ b/gen/h/std/gif.h @@ -1232,6 +1232,22 @@ static inline wuffs_base__image_config* wuffs_base__image_buffer__image_config( return b ? &b->private_impl.config : NULL; } +static inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__bounds( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__bounds(&b->private_impl.config) + : ((wuffs_base__rect_ie_u32){}); +} + +static inline uint32_t wuffs_base__image_buffer__width( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__width(&b->private_impl.config) : 0; +} + +static inline uint32_t wuffs_base__image_buffer__height( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__height(&b->private_impl.config) : 0; +} + // wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of // this frame's pixels differs from the previous frame. static inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__dirty_rect( diff --git a/gen/h/std/gzip.h b/gen/h/std/gzip.h index 33a48b49..d5cfcfac 100644 --- a/gen/h/std/gzip.h +++ b/gen/h/std/gzip.h @@ -1232,6 +1232,22 @@ static inline wuffs_base__image_config* wuffs_base__image_buffer__image_config( return b ? &b->private_impl.config : NULL; } +static inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__bounds( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__bounds(&b->private_impl.config) + : ((wuffs_base__rect_ie_u32){}); +} + +static inline uint32_t wuffs_base__image_buffer__width( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__width(&b->private_impl.config) : 0; +} + +static inline uint32_t wuffs_base__image_buffer__height( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__height(&b->private_impl.config) : 0; +} + // wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of // this frame's pixels differs from the previous frame. static inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__dirty_rect( diff --git a/gen/h/std/lzw.h b/gen/h/std/lzw.h index 18e23a29..4bd7b3a8 100644 --- a/gen/h/std/lzw.h +++ b/gen/h/std/lzw.h @@ -1232,6 +1232,22 @@ static inline wuffs_base__image_config* wuffs_base__image_buffer__image_config( return b ? &b->private_impl.config : NULL; } +static inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__bounds( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__bounds(&b->private_impl.config) + : ((wuffs_base__rect_ie_u32){}); +} + +static inline uint32_t wuffs_base__image_buffer__width( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__width(&b->private_impl.config) : 0; +} + +static inline uint32_t wuffs_base__image_buffer__height( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__height(&b->private_impl.config) : 0; +} + // wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of // this frame's pixels differs from the previous frame. static inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__dirty_rect( diff --git a/gen/h/std/zlib.h b/gen/h/std/zlib.h index 5ee4b9c7..9b098b33 100644 --- a/gen/h/std/zlib.h +++ b/gen/h/std/zlib.h @@ -1232,6 +1232,22 @@ static inline wuffs_base__image_config* wuffs_base__image_buffer__image_config( return b ? &b->private_impl.config : NULL; } +static inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__bounds( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__bounds(&b->private_impl.config) + : ((wuffs_base__rect_ie_u32){}); +} + +static inline uint32_t wuffs_base__image_buffer__width( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__width(&b->private_impl.config) : 0; +} + +static inline uint32_t wuffs_base__image_buffer__height( + wuffs_base__image_buffer* b) { + return b ? wuffs_base__image_config__height(&b->private_impl.config) : 0; +} + // wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of // this frame's pixels differs from the previous frame. static inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__dirty_rect(