diff --git a/cmd/wuffs-c/internal/cgen/base-header.h b/cmd/wuffs-c/internal/cgen/base-header.h index dc58cd41..1f0bc172 100644 --- a/cmd/wuffs-c/internal/cgen/base-header.h +++ b/cmd/wuffs-c/internal/cgen/base-header.h @@ -1088,7 +1088,14 @@ static inline void wuffs_base__image_buffer__update( return; } b->private_impl.dirty_palette = dirty_palette; + + // Clip the dirty_rect to the image bounds. + 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); b->private_impl.dirty_rect = dirty_rect; + b->private_impl.duration = duration; if (palette.ptr) { memmove(b->private_impl.palette, palette.ptr, diff --git a/cmd/wuffs-c/internal/cgen/data.go b/cmd/wuffs-c/internal/cgen/data.go index 633eb2a6..bbe468a1 100644 --- a/cmd/wuffs-c/internal/cgen/data.go +++ b/cmd/wuffs-c/internal/cgen/data.go @@ -79,10 +79,10 @@ const baseHeader = "" + " wuffs_base__image_config* c) {\n return c ? c->private_impl.num_loops : 0;\n}\n\n// TODO: this is the right API for planar (not packed) pixbufs? Should it allow\n// decoding into a color model different from the format's intrinsic one? For\n// example, decoding a JPEG image straight to RGBA instead of to YCbCr?\nstatic inline size_t wuffs_base__image_config__pixbuf_size(\n wuffs_base__image_config* c) {\n if (c) {\n uint64_t wh =\n ((uint64_t)c->private_impl.width) * ((uint64_t)c->private_impl.height);\n // TODO: handle things other than 1 byte per pixel.\n return (size_t)wh;\n }\n return 0;\n}\n\n" + "" + "// --------\n\ntypedef struct {\n // Do not access the private_impl's fields directly. There is no API/ABI\n // compatibility or safety guarantee if you do so.\n struct {\n wuffs_base__image_config config;\n uint32_t loop_count; // 0-based count of the current loop.\n wuffs_base__pixel_buffer pixbuf;\n // TODO: color spaces.\n bool dirty_palette;\n wuffs_base__rect_ie_u32 dirty_rect;\n wuffs_base__flicks duration;\n uint8_t palette[1024];\n } private_impl;\n} wuffs_base__image_buffer;\n\nstatic inline void wuffs_base__image_buffer__set_from_pixbuf(\n wuffs_base__image_buffer* b,\n wuffs_base__image_config config,\n wuffs_base__pixel_buffer pixbuf) {\n if (!b) {\n return;\n }\n *b = ((wuffs_base__image_buffer){});\n b->private_impl.config = config;\n b->private_impl.pixbuf = pixbuf;\n}\n\n// TODO: Should this function return bool? An error type?\nstatic inline void wuffs_base__image_buffer__set_from_slice(\n wuffs_base__image_buffer* b,\n wuffs_base__image_config config,\n wuffs_base__sli" + - "ce_u8 pixbuf_memory) {\n if (!b) {\n return;\n }\n *b = ((wuffs_base__image_buffer){});\n // TODO: don't assume 1 byte per pixel. Don't assume packed.\n uint64_t wh = ((uint64_t)config.private_impl.width) *\n ((uint64_t)config.private_impl.height);\n if (wh > pixbuf_memory.len) {\n return;\n }\n b->private_impl.config = config;\n wuffs_base__table_u8* tab = &b->private_impl.pixbuf.planes[0];\n tab->ptr = pixbuf_memory.ptr;\n tab->width = config.private_impl.width;\n tab->height = config.private_impl.height;\n tab->stride = config.private_impl.width;\n}\n\nstatic inline void wuffs_base__image_buffer__update(\n wuffs_base__image_buffer* b,\n bool dirty_palette,\n wuffs_base__rect_ie_u32 dirty_rect,\n wuffs_base__flicks duration,\n wuffs_base__slice_u8 palette) {\n if (!b) {\n return;\n }\n b->private_impl.dirty_palette = dirty_palette;\n b->private_impl.dirty_rect = dirty_rect;\n b->private_impl.duration = duration;\n if (palette.ptr) {\n memmove(b->private_impl.palette, palette.ptr" + - ",\n palette.len <= 1024 ? palette.len : 1024);\n }\n}\n\n// wuffs_base__image_buffer__loop returns whether the image decoder should loop\n// back to the beginning of the animation, assuming that we've reached the end\n// of the encoded stream. If so, it increments b's count of the animation loops\n// played so far.\nstatic inline bool wuffs_base__image_buffer__loop(wuffs_base__image_buffer* b) {\n if (!b) {\n return false;\n }\n uint32_t n = b->private_impl.config.private_impl.num_loops;\n if (n == 0) {\n return true;\n }\n if (b->private_impl.loop_count < n - 1) {\n b->private_impl.loop_count++;\n return true;\n }\n return false;\n}\n\n// wuffs_base__image_buffer__dirty_palette returns whether this frame's palette\n// differs from the previous frame. It is conservative and may return false\n// positives (but never false negatives).\nstatic inline bool wuffs_base__image_buffer__dirty_palette(\n wuffs_base__image_buffer* b) {\n return b && b->private_impl.dirty_palette;\n}\n\n// wuffs_base__image_buffer__d" + - "irty_rect returns an upper bound for what part of\n// this frame's pixels differs from the previous frame.\nstatic inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__dirty_rect(\n wuffs_base__image_buffer* b) {\n return b ? b->private_impl.dirty_rect : ((wuffs_base__rect_ie_u32){0});\n}\n\n// wuffs_base__image_buffer__duration returns the amount of time to display\n// this frame. Zero means to display forever - a still (non-animated) image.\nstatic inline wuffs_base__flicks wuffs_base__image_buffer__duration(\n wuffs_base__image_buffer* b) {\n return b ? b->private_impl.duration : 0;\n}\n\n// wuffs_base__image_buffer__palette returns the palette that the pixel data\n// can index. The backing array is inside b and has length 1024.\nstatic inline uint8_t* wuffs_base__image_buffer__palette(\n wuffs_base__image_buffer* b) {\n return b ? b->private_impl.palette : NULL;\n}\n\nstatic inline wuffs_base__table_u8 wuffs_base__image_buffer__plane(\n wuffs_base__image_buffer* b,\n uint32_t p) {\n return (b && (p < WUFFS" + - "_BASE__PIXEL_FORMAT__NUM_PLANES_MAX))\n ? b->private_impl.pixbuf.planes[p]\n : ((wuffs_base__table_u8){});\n}\n\n#endif // WUFFS_BASE_HEADER_H\n" + + "ce_u8 pixbuf_memory) {\n if (!b) {\n return;\n }\n *b = ((wuffs_base__image_buffer){});\n // TODO: don't assume 1 byte per pixel. Don't assume packed.\n uint64_t wh = ((uint64_t)config.private_impl.width) *\n ((uint64_t)config.private_impl.height);\n if (wh > pixbuf_memory.len) {\n return;\n }\n b->private_impl.config = config;\n wuffs_base__table_u8* tab = &b->private_impl.pixbuf.planes[0];\n tab->ptr = pixbuf_memory.ptr;\n tab->width = config.private_impl.width;\n tab->height = config.private_impl.height;\n tab->stride = config.private_impl.width;\n}\n\nstatic inline void wuffs_base__image_buffer__update(\n wuffs_base__image_buffer* b,\n bool dirty_palette,\n wuffs_base__rect_ie_u32 dirty_rect,\n wuffs_base__flicks duration,\n wuffs_base__slice_u8 palette) {\n if (!b) {\n return;\n }\n b->private_impl.dirty_palette = dirty_palette;\n\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.c" + + "onfig.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 if (palette.ptr) {\n memmove(b->private_impl.palette, palette.ptr,\n palette.len <= 1024 ? palette.len : 1024);\n }\n}\n\n// wuffs_base__image_buffer__loop returns whether the image decoder should loop\n// back to the beginning of the animation, assuming that we've reached the end\n// of the encoded stream. If so, it increments b's count of the animation loops\n// played so far.\nstatic inline bool wuffs_base__image_buffer__loop(wuffs_base__image_buffer* b) {\n if (!b) {\n return false;\n }\n uint32_t n = b->private_impl.config.private_impl.num_loops;\n if (n == 0) {\n return true;\n }\n if (b->private_impl.loop_count < n - 1) {\n b->private_impl.loop_count++;\n return true;\n }\n return false;\n}\n\n// wuffs_base__image_buffer__dirty_palette returns whether th" + + "is frame's palette\n// differs from the previous frame. It is conservative and may return false\n// positives (but never false negatives).\nstatic inline bool wuffs_base__image_buffer__dirty_palette(\n wuffs_base__image_buffer* b) {\n return b && b->private_impl.dirty_palette;\n}\n\n// wuffs_base__image_buffer__dirty_rect returns an upper bound for what part of\n// this frame's pixels differs from the previous frame.\nstatic inline wuffs_base__rect_ie_u32 wuffs_base__image_buffer__dirty_rect(\n wuffs_base__image_buffer* b) {\n return b ? b->private_impl.dirty_rect : ((wuffs_base__rect_ie_u32){0});\n}\n\n// wuffs_base__image_buffer__duration returns the amount of time to display\n// this frame. Zero means to display forever - a still (non-animated) image.\nstatic inline wuffs_base__flicks wuffs_base__image_buffer__duration(\n wuffs_base__image_buffer* b) {\n return b ? b->private_impl.duration : 0;\n}\n\n// wuffs_base__image_buffer__palette returns the palette that the pixel data\n// can index. The backing array is insid" + + "e b and has length 1024.\nstatic inline uint8_t* wuffs_base__image_buffer__palette(\n wuffs_base__image_buffer* b) {\n return b ? b->private_impl.palette : NULL;\n}\n\nstatic inline wuffs_base__table_u8 wuffs_base__image_buffer__plane(\n wuffs_base__image_buffer* b,\n uint32_t p) {\n return (b && (p < WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX))\n ? b->private_impl.pixbuf.planes[p]\n : ((wuffs_base__table_u8){});\n}\n\n#endif // WUFFS_BASE_HEADER_H\n" + "" const baseImpl = "" + diff --git a/gen/c/std/adler32.c b/gen/c/std/adler32.c index c3a3db2a..416aeb40 100644 --- a/gen/c/std/adler32.c +++ b/gen/c/std/adler32.c @@ -1091,7 +1091,14 @@ static inline void wuffs_base__image_buffer__update( return; } b->private_impl.dirty_palette = dirty_palette; + + // Clip the dirty_rect to the image bounds. + 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); b->private_impl.dirty_rect = dirty_rect; + b->private_impl.duration = duration; if (palette.ptr) { memmove(b->private_impl.palette, palette.ptr, diff --git a/gen/c/std/crc32.c b/gen/c/std/crc32.c index 3ba9bbfb..debed4c9 100644 --- a/gen/c/std/crc32.c +++ b/gen/c/std/crc32.c @@ -1091,7 +1091,14 @@ static inline void wuffs_base__image_buffer__update( return; } b->private_impl.dirty_palette = dirty_palette; + + // Clip the dirty_rect to the image bounds. + 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); b->private_impl.dirty_rect = dirty_rect; + b->private_impl.duration = duration; if (palette.ptr) { memmove(b->private_impl.palette, palette.ptr, diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index fd5d1a80..588d0454 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -1091,7 +1091,14 @@ static inline void wuffs_base__image_buffer__update( return; } b->private_impl.dirty_palette = dirty_palette; + + // Clip the dirty_rect to the image bounds. + 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); b->private_impl.dirty_rect = dirty_rect; + b->private_impl.duration = duration; if (palette.ptr) { memmove(b->private_impl.palette, palette.ptr, diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index e95721a4..2e2744b1 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -1091,7 +1091,14 @@ static inline void wuffs_base__image_buffer__update( return; } b->private_impl.dirty_palette = dirty_palette; + + // Clip the dirty_rect to the image bounds. + 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); b->private_impl.dirty_rect = dirty_rect; + b->private_impl.duration = duration; if (palette.ptr) { memmove(b->private_impl.palette, palette.ptr, diff --git a/gen/c/std/gzip.c b/gen/c/std/gzip.c index dee4163d..3ccb01f7 100644 --- a/gen/c/std/gzip.c +++ b/gen/c/std/gzip.c @@ -1091,7 +1091,14 @@ static inline void wuffs_base__image_buffer__update( return; } b->private_impl.dirty_palette = dirty_palette; + + // Clip the dirty_rect to the image bounds. + 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); b->private_impl.dirty_rect = dirty_rect; + b->private_impl.duration = duration; if (palette.ptr) { memmove(b->private_impl.palette, palette.ptr, diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index ffd1c301..7a0d3aa9 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -1091,7 +1091,14 @@ static inline void wuffs_base__image_buffer__update( return; } b->private_impl.dirty_palette = dirty_palette; + + // Clip the dirty_rect to the image bounds. + 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); b->private_impl.dirty_rect = dirty_rect; + b->private_impl.duration = duration; if (palette.ptr) { memmove(b->private_impl.palette, palette.ptr, diff --git a/gen/h/std/adler32.h b/gen/h/std/adler32.h index 327fdd4b..829fb55b 100644 --- a/gen/h/std/adler32.h +++ b/gen/h/std/adler32.h @@ -1091,7 +1091,14 @@ static inline void wuffs_base__image_buffer__update( return; } b->private_impl.dirty_palette = dirty_palette; + + // Clip the dirty_rect to the image bounds. + 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); b->private_impl.dirty_rect = dirty_rect; + b->private_impl.duration = duration; if (palette.ptr) { memmove(b->private_impl.palette, palette.ptr, diff --git a/gen/h/std/crc32.h b/gen/h/std/crc32.h index cb47b89e..63fcddb4 100644 --- a/gen/h/std/crc32.h +++ b/gen/h/std/crc32.h @@ -1091,7 +1091,14 @@ static inline void wuffs_base__image_buffer__update( return; } b->private_impl.dirty_palette = dirty_palette; + + // Clip the dirty_rect to the image bounds. + 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); b->private_impl.dirty_rect = dirty_rect; + b->private_impl.duration = duration; if (palette.ptr) { memmove(b->private_impl.palette, palette.ptr, diff --git a/gen/h/std/deflate.h b/gen/h/std/deflate.h index 3c36bc23..5ef492af 100644 --- a/gen/h/std/deflate.h +++ b/gen/h/std/deflate.h @@ -1091,7 +1091,14 @@ static inline void wuffs_base__image_buffer__update( return; } b->private_impl.dirty_palette = dirty_palette; + + // Clip the dirty_rect to the image bounds. + 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); b->private_impl.dirty_rect = dirty_rect; + b->private_impl.duration = duration; if (palette.ptr) { memmove(b->private_impl.palette, palette.ptr, diff --git a/gen/h/std/gif.h b/gen/h/std/gif.h index 07ba2af2..bed6c286 100644 --- a/gen/h/std/gif.h +++ b/gen/h/std/gif.h @@ -1091,7 +1091,14 @@ static inline void wuffs_base__image_buffer__update( return; } b->private_impl.dirty_palette = dirty_palette; + + // Clip the dirty_rect to the image bounds. + 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); b->private_impl.dirty_rect = dirty_rect; + b->private_impl.duration = duration; if (palette.ptr) { memmove(b->private_impl.palette, palette.ptr, diff --git a/gen/h/std/gzip.h b/gen/h/std/gzip.h index ce7cf7da..179f56f4 100644 --- a/gen/h/std/gzip.h +++ b/gen/h/std/gzip.h @@ -1091,7 +1091,14 @@ static inline void wuffs_base__image_buffer__update( return; } b->private_impl.dirty_palette = dirty_palette; + + // Clip the dirty_rect to the image bounds. + 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); b->private_impl.dirty_rect = dirty_rect; + b->private_impl.duration = duration; if (palette.ptr) { memmove(b->private_impl.palette, palette.ptr, diff --git a/gen/h/std/zlib.h b/gen/h/std/zlib.h index ef49558b..d95e7bac 100644 --- a/gen/h/std/zlib.h +++ b/gen/h/std/zlib.h @@ -1091,7 +1091,14 @@ static inline void wuffs_base__image_buffer__update( return; } b->private_impl.dirty_palette = dirty_palette; + + // Clip the dirty_rect to the image bounds. + 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); b->private_impl.dirty_rect = dirty_rect; + b->private_impl.duration = duration; if (palette.ptr) { memmove(b->private_impl.palette, palette.ptr,