diff --git a/cmd/wuffs-c/internal/cgen/base-header.h b/cmd/wuffs-c/internal/cgen/base-header.h index 5d606ac6..f62e40c2 100644 --- a/cmd/wuffs-c/internal/cgen/base-header.h +++ b/cmd/wuffs-c/internal/cgen/base-header.h @@ -1092,7 +1092,7 @@ static inline void wuffs_base__image_buffer__update( dirty_rect.max_exclusive_x = wuffs_base__u32__min( dirty_rect.max_exclusive_x, b->private_impl.config.private_impl.width); dirty_rect.max_exclusive_y = wuffs_base__u32__min( - dirty_rect.max_exclusive_y, b->private_impl.config.private_impl.width); + dirty_rect.max_exclusive_y, b->private_impl.config.private_impl.height); b->private_impl.dirty_rect = dirty_rect; b->private_impl.duration = duration; diff --git a/cmd/wuffs-c/internal/cgen/data.go b/cmd/wuffs-c/internal/cgen/data.go index 48c043cb..bfa5f8f8 100644 --- a/cmd/wuffs-c/internal/cgen/data.go +++ b/cmd/wuffs-c/internal/cgen/data.go @@ -80,9 +80,9 @@ const baseHeader = "" + "" + "// --------\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 palette_changed;\n uint8_t palette[1024];\n } private_impl;\n} wuffs_base__image_buffer;\n\nstatic inline void wuffs_base__image_buffer__set_from_pixbuf(\n wuffs_base__image_buffer* b,\n wuffs_base__image_config config,\n wuffs_base__pixel_buffer pixbuf) {\n if (!b) {\n return;\n }\n *b = ((wuffs_base__image_buffer){});\n b->private_impl.config = config;\n b->private_impl.pixbuf = pixbuf;\n}\n\n// TODO: Should this function return bool? An error type?\nstatic inline void wuffs_base__image_buffer__set_from_slice(\n wuffs_base__image_buffer* b,\n wuffs_base__image_config config,\n wuffs_base__s" + "lice_u8 pixbuf_memory) {\n if (!b) {\n return;\n }\n *b = ((wuffs_base__image_buffer){});\n // TODO: don't assume 1 byte per pixel. Don't assume packed.\n uint64_t wh = ((uint64_t)config.private_impl.width) *\n ((uint64_t)config.private_impl.height);\n if (wh > pixbuf_memory.len) {\n return;\n }\n b->private_impl.config = config;\n wuffs_base__table_u8* tab = &b->private_impl.pixbuf.planes[0];\n tab->ptr = pixbuf_memory.ptr;\n tab->width = config.private_impl.width;\n tab->height = config.private_impl.height;\n tab->stride = config.private_impl.width;\n}\n\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 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_exclusive_x = wuffs_base__u32__min(\n dirty_rect.max_exclusive_x, b->private_impl.co" + - "nfig.private_impl.width);\n dirty_rect.max_exclusive_y = wuffs_base__u32__min(\n dirty_rect.max_exclusive_y, b->private_impl.config.private_impl.width);\n b->private_impl.dirty_rect = dirty_rect;\n\n b->private_impl.duration = duration;\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\nstatic inline wu" + - "ffs_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__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__dirty_rect returns an upper bound for what part of\n// this frame's pixels differs from the previous frame.\nstatic inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__dirty_rect(\n wuffs_base__image_buffer* b) {\n return b ? b->private_impl.dirty_rect : ((wuffs_base__rect_ie_u32){0});\n}\n\n// wuffs_base__image_buffer__duration returns the amount of time to display\n// this frame. Zero means to display forever - a still (non-animated) image.\nstatic inline wuffs_base__flicks wuffs_base__image_bu" + - "ffer__duration(\n wuffs_base__image_buffer* b) {\n return b ? b->private_impl.duration : 0;\n}\n\n// wuffs_base__image_buffer__palette returns the palette that the pixel data\n// can index. The backing array is inside b and has length 1024.\nstatic inline 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#endif // WUFFS_BASE_HEADER_H\n" + + "nfig.private_impl.width);\n dirty_rect.max_exclusive_y = wuffs_base__u32__min(\n dirty_rect.max_exclusive_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.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\nstatic inline w" + + "uffs_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__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__dirty_rect returns an upper bound for what part of\n// this frame's pixels differs from the previous frame.\nstatic inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__dirty_rect(\n wuffs_base__image_buffer* b) {\n return b ? b->private_impl.dirty_rect : ((wuffs_base__rect_ie_u32){0});\n}\n\n// wuffs_base__image_buffer__duration returns the amount of time to display\n// this frame. Zero means to display forever - a still (non-animated) image.\nstatic inline wuffs_base__flicks wuffs_base__image_b" + + "uffer__duration(\n wuffs_base__image_buffer* b) {\n return b ? b->private_impl.duration : 0;\n}\n\n// wuffs_base__image_buffer__palette returns the palette that the pixel data\n// can index. The backing array is inside b and has length 1024.\nstatic inline 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#endif // WUFFS_BASE_HEADER_H\n" + "" const baseImpl = "" + diff --git a/gen/c/std/adler32.c b/gen/c/std/adler32.c index 97157a92..da000ea7 100644 --- a/gen/c/std/adler32.c +++ b/gen/c/std/adler32.c @@ -1095,7 +1095,7 @@ static inline void wuffs_base__image_buffer__update( dirty_rect.max_exclusive_x = wuffs_base__u32__min( dirty_rect.max_exclusive_x, b->private_impl.config.private_impl.width); dirty_rect.max_exclusive_y = wuffs_base__u32__min( - dirty_rect.max_exclusive_y, b->private_impl.config.private_impl.width); + dirty_rect.max_exclusive_y, b->private_impl.config.private_impl.height); b->private_impl.dirty_rect = dirty_rect; b->private_impl.duration = duration; diff --git a/gen/c/std/crc32.c b/gen/c/std/crc32.c index bbd0477b..d3cb6d0b 100644 --- a/gen/c/std/crc32.c +++ b/gen/c/std/crc32.c @@ -1095,7 +1095,7 @@ static inline void wuffs_base__image_buffer__update( dirty_rect.max_exclusive_x = wuffs_base__u32__min( dirty_rect.max_exclusive_x, b->private_impl.config.private_impl.width); dirty_rect.max_exclusive_y = wuffs_base__u32__min( - dirty_rect.max_exclusive_y, b->private_impl.config.private_impl.width); + dirty_rect.max_exclusive_y, b->private_impl.config.private_impl.height); b->private_impl.dirty_rect = dirty_rect; b->private_impl.duration = duration; diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index 006349ac..6644ab44 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -1095,7 +1095,7 @@ static inline void wuffs_base__image_buffer__update( dirty_rect.max_exclusive_x = wuffs_base__u32__min( dirty_rect.max_exclusive_x, b->private_impl.config.private_impl.width); dirty_rect.max_exclusive_y = wuffs_base__u32__min( - dirty_rect.max_exclusive_y, b->private_impl.config.private_impl.width); + dirty_rect.max_exclusive_y, b->private_impl.config.private_impl.height); b->private_impl.dirty_rect = dirty_rect; b->private_impl.duration = duration; diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index e302f141..ef8bfdc9 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -1095,7 +1095,7 @@ static inline void wuffs_base__image_buffer__update( dirty_rect.max_exclusive_x = wuffs_base__u32__min( dirty_rect.max_exclusive_x, b->private_impl.config.private_impl.width); dirty_rect.max_exclusive_y = wuffs_base__u32__min( - dirty_rect.max_exclusive_y, b->private_impl.config.private_impl.width); + dirty_rect.max_exclusive_y, b->private_impl.config.private_impl.height); b->private_impl.dirty_rect = dirty_rect; b->private_impl.duration = duration; diff --git a/gen/c/std/gzip.c b/gen/c/std/gzip.c index 0118ba3f..83524ef1 100644 --- a/gen/c/std/gzip.c +++ b/gen/c/std/gzip.c @@ -1095,7 +1095,7 @@ static inline void wuffs_base__image_buffer__update( dirty_rect.max_exclusive_x = wuffs_base__u32__min( dirty_rect.max_exclusive_x, b->private_impl.config.private_impl.width); dirty_rect.max_exclusive_y = wuffs_base__u32__min( - dirty_rect.max_exclusive_y, b->private_impl.config.private_impl.width); + dirty_rect.max_exclusive_y, b->private_impl.config.private_impl.height); b->private_impl.dirty_rect = dirty_rect; b->private_impl.duration = duration; diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index 7b70b81a..55fbde97 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -1095,7 +1095,7 @@ static inline void wuffs_base__image_buffer__update( dirty_rect.max_exclusive_x = wuffs_base__u32__min( dirty_rect.max_exclusive_x, b->private_impl.config.private_impl.width); dirty_rect.max_exclusive_y = wuffs_base__u32__min( - dirty_rect.max_exclusive_y, b->private_impl.config.private_impl.width); + dirty_rect.max_exclusive_y, b->private_impl.config.private_impl.height); b->private_impl.dirty_rect = dirty_rect; b->private_impl.duration = duration; diff --git a/gen/h/std/adler32.h b/gen/h/std/adler32.h index 3ebaf3a0..8769ebc9 100644 --- a/gen/h/std/adler32.h +++ b/gen/h/std/adler32.h @@ -1095,7 +1095,7 @@ static inline void wuffs_base__image_buffer__update( dirty_rect.max_exclusive_x = wuffs_base__u32__min( dirty_rect.max_exclusive_x, b->private_impl.config.private_impl.width); dirty_rect.max_exclusive_y = wuffs_base__u32__min( - dirty_rect.max_exclusive_y, b->private_impl.config.private_impl.width); + dirty_rect.max_exclusive_y, b->private_impl.config.private_impl.height); b->private_impl.dirty_rect = dirty_rect; b->private_impl.duration = duration; diff --git a/gen/h/std/crc32.h b/gen/h/std/crc32.h index 33b7f7fd..af9f7376 100644 --- a/gen/h/std/crc32.h +++ b/gen/h/std/crc32.h @@ -1095,7 +1095,7 @@ static inline void wuffs_base__image_buffer__update( dirty_rect.max_exclusive_x = wuffs_base__u32__min( dirty_rect.max_exclusive_x, b->private_impl.config.private_impl.width); dirty_rect.max_exclusive_y = wuffs_base__u32__min( - dirty_rect.max_exclusive_y, b->private_impl.config.private_impl.width); + dirty_rect.max_exclusive_y, b->private_impl.config.private_impl.height); b->private_impl.dirty_rect = dirty_rect; b->private_impl.duration = duration; diff --git a/gen/h/std/deflate.h b/gen/h/std/deflate.h index 6b76566d..bc23bad6 100644 --- a/gen/h/std/deflate.h +++ b/gen/h/std/deflate.h @@ -1095,7 +1095,7 @@ static inline void wuffs_base__image_buffer__update( dirty_rect.max_exclusive_x = wuffs_base__u32__min( dirty_rect.max_exclusive_x, b->private_impl.config.private_impl.width); dirty_rect.max_exclusive_y = wuffs_base__u32__min( - dirty_rect.max_exclusive_y, b->private_impl.config.private_impl.width); + dirty_rect.max_exclusive_y, b->private_impl.config.private_impl.height); b->private_impl.dirty_rect = dirty_rect; b->private_impl.duration = duration; diff --git a/gen/h/std/gif.h b/gen/h/std/gif.h index f544e4a1..01e898d2 100644 --- a/gen/h/std/gif.h +++ b/gen/h/std/gif.h @@ -1095,7 +1095,7 @@ static inline void wuffs_base__image_buffer__update( dirty_rect.max_exclusive_x = wuffs_base__u32__min( dirty_rect.max_exclusive_x, b->private_impl.config.private_impl.width); dirty_rect.max_exclusive_y = wuffs_base__u32__min( - dirty_rect.max_exclusive_y, b->private_impl.config.private_impl.width); + dirty_rect.max_exclusive_y, b->private_impl.config.private_impl.height); b->private_impl.dirty_rect = dirty_rect; b->private_impl.duration = duration; diff --git a/gen/h/std/gzip.h b/gen/h/std/gzip.h index bbba28ee..786ef568 100644 --- a/gen/h/std/gzip.h +++ b/gen/h/std/gzip.h @@ -1095,7 +1095,7 @@ static inline void wuffs_base__image_buffer__update( dirty_rect.max_exclusive_x = wuffs_base__u32__min( dirty_rect.max_exclusive_x, b->private_impl.config.private_impl.width); dirty_rect.max_exclusive_y = wuffs_base__u32__min( - dirty_rect.max_exclusive_y, b->private_impl.config.private_impl.width); + dirty_rect.max_exclusive_y, b->private_impl.config.private_impl.height); b->private_impl.dirty_rect = dirty_rect; b->private_impl.duration = duration; diff --git a/gen/h/std/zlib.h b/gen/h/std/zlib.h index b0fc04fd..55f4c4e7 100644 --- a/gen/h/std/zlib.h +++ b/gen/h/std/zlib.h @@ -1095,7 +1095,7 @@ static inline void wuffs_base__image_buffer__update( dirty_rect.max_exclusive_x = wuffs_base__u32__min( dirty_rect.max_exclusive_x, b->private_impl.config.private_impl.width); dirty_rect.max_exclusive_y = wuffs_base__u32__min( - dirty_rect.max_exclusive_y, b->private_impl.config.private_impl.width); + dirty_rect.max_exclusive_y, b->private_impl.config.private_impl.height); b->private_impl.dirty_rect = dirty_rect; b->private_impl.duration = duration;