diff --git a/cmd/wuffs-c/internal/cgen/base-header.h b/cmd/wuffs-c/internal/cgen/base-header.h index 6636fc81..dd0a3ee1 100644 --- a/cmd/wuffs-c/internal/cgen/base-header.h +++ b/cmd/wuffs-c/internal/cgen/base-header.h @@ -962,7 +962,7 @@ typedef struct { } private_impl; } wuffs_base__image_buffer; -static inline void wuffs_base__image_buffer__initialize( +static inline void wuffs_base__image_buffer__set_from_pixbuf( wuffs_base__image_buffer* f, wuffs_base__image_config config, wuffs_base__pixel_buffer pixbuf) { @@ -974,6 +974,29 @@ static inline void wuffs_base__image_buffer__initialize( f->private_impl.pixbuf = pixbuf; } +// TODO: Should this function return bool? An error type? +static inline void wuffs_base__image_buffer__set_from_slice( + wuffs_base__image_buffer* f, + wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory) { + if (!f) { + return; + } + *f = ((wuffs_base__image_buffer){}); + f->private_impl.config = config; + // TODO: don't assume 1 byte per pixel. Don't assume packed. + uint64_t wh = ((uint64_t)config.private_impl.width) * + ((uint64_t)config.private_impl.height); + if (wh > pixbuf_memory.len) { + return; + } + wuffs_base__table_u8* tab = &f->private_impl.pixbuf.planes[0]; + tab->ptr = pixbuf_memory.ptr; + tab->width = config.private_impl.width; + tab->height = config.private_impl.height; + tab->stride = config.private_impl.width; +} + static inline void wuffs_base__image_buffer__update( wuffs_base__image_buffer* f, wuffs_base__rect_ie_u32 dirty_rect, diff --git a/cmd/wuffs-c/internal/cgen/data.go b/cmd/wuffs-c/internal/cgen/data.go index 320b95d5..7f9d1e2e 100644 --- a/cmd/wuffs-c/internal/cgen/data.go +++ b/cmd/wuffs-c/internal/cgen/data.go @@ -73,9 +73,10 @@ const baseHeader = "" + "l.num_loops = num_loops;\n return;\n }\n }\n *c = ((wuffs_base__image_config){});\n}\n\nstatic inline void wuffs_base__image_config__invalidate(\n wuffs_base__image_config* c) {\n if (c) {\n *c = ((wuffs_base__image_config){});\n }\n}\n\nstatic inline bool wuffs_base__image_config__is_valid(\n wuffs_base__image_config* c) {\n return c && c->private_impl.pixfmt;\n}\n\nstatic inline wuffs_base__pixel_format wuffs_base__image_config__pixel_format(\n wuffs_base__image_config* c) {\n return c ? c->private_impl.pixfmt : 0;\n}\n\nstatic inline wuffs_base__pixel_subsampling\nwuffs_base__image_config__pixel_subsampling(wuffs_base__image_config* c) {\n return c ? c->private_impl.pixsub : 0;\n}\n\nstatic inline uint32_t wuffs_base__image_config__width(\n wuffs_base__image_config* c) {\n return c ? c->private_impl.width : 0;\n}\n\nstatic inline uint32_t wuffs_base__image_config__height(\n wuffs_base__image_config* c) {\n return c ? c->private_impl.height : 0;\n}\n\nstatic inline uint32_t wuffs_base__image_config__num_loops(\n" + " wuffs_base__image_config* c) {\n return c ? c->private_impl.num_loops : 0;\n}\n\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 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__initialize(\n wuffs_base__image_buffer* f,\n wuffs_base__image_config config,\n wuffs_base__pixel_buffer pixbuf) {\n if (!f) {\n return;\n }\n *f = ((wuffs_base__image_buffer){});\n f->private_impl.config = config;\n f->private_impl.pixbuf = pixbuf;\n}\n\nstatic inline void wuffs_base__image_buffer__update(\n wuffs_base__image_buffer* f,\n wuffs_base__rect_ie_u32 dirty_rect,\n wuffs_base__flicks duration,\n uint8_t* palette_ptr,\n size_t palette_len) {\n if (!f) {\n return;\n " + - "}\n f->private_impl.dirty_rect = dirty_rect;\n f->private_impl.duration = duration;\n if (palette_ptr) {\n memmove(f->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 f's count of the animation loops\n// played so far.\nstatic inline bool wuffs_base__image_buffer__loop(wuffs_base__image_buffer* f) {\n if (!f) {\n return false;\n }\n uint32_t n = f->private_impl.config.private_impl.num_loops;\n if (n == 0) {\n return true;\n }\n if (f->private_impl.loop_count < n - 1) {\n f->private_impl.loop_count++;\n return true;\n }\n return false;\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 wu" + - "ffs_base__image_buffer* f) {\n return f ? f->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* f) {\n return f ? f->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 f and has length 1024.\nstatic inline uint8_t* wuffs_base__image_buffer__palette(\n wuffs_base__image_buffer* f) {\n return f ? f->private_impl.palette : NULL;\n}\n\n#endif // WUFFS_BASE_HEADER_H\n" + + "// --------\n\ntypedef struct {\n // Do not access the private_impl's fields directly. There is no API/ABI\n // compatibility or safety guarantee if you do so.\n struct {\n wuffs_base__image_config config;\n uint32_t loop_count; // 0-based count of the current loop.\n wuffs_base__pixel_buffer pixbuf;\n // TODO: color spaces.\n wuffs_base__rect_ie_u32 dirty_rect;\n wuffs_base__flicks duration;\n 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* f,\n wuffs_base__image_config config,\n wuffs_base__pixel_buffer pixbuf) {\n if (!f) {\n return;\n }\n *f = ((wuffs_base__image_buffer){});\n f->private_impl.config = config;\n f->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* f,\n wuffs_base__image_config config,\n wuffs_base__slice_u8 pixbuf_memory) {\n " + + " if (!f) {\n return;\n }\n *f = ((wuffs_base__image_buffer){});\n f->private_impl.config = config;\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 wuffs_base__table_u8* tab = &f->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* f,\n wuffs_base__rect_ie_u32 dirty_rect,\n wuffs_base__flicks duration,\n uint8_t* palette_ptr,\n size_t palette_len) {\n if (!f) {\n return;\n }\n f->private_impl.dirty_rect = dirty_rect;\n f->private_impl.duration = duration;\n if (palette_ptr) {\n memmove(f->private_impl.palette, palette_ptr,\n palette_len <= 1024 ? palette_len : 1024);\n }\n}\n\n// wuffs_base__im" + + "age_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 f's count of the animation loops\n// played so far.\nstatic inline bool wuffs_base__image_buffer__loop(wuffs_base__image_buffer* f) {\n if (!f) {\n return false;\n }\n uint32_t n = f->private_impl.config.private_impl.num_loops;\n if (n == 0) {\n return true;\n }\n if (f->private_impl.loop_count < n - 1) {\n f->private_impl.loop_count++;\n return true;\n }\n return false;\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* f) {\n return f ? f->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 sti" + + "ll (non-animated) image.\nstatic inline wuffs_base__flicks wuffs_base__image_buffer__duration(\n wuffs_base__image_buffer* f) {\n return f ? f->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 f and has length 1024.\nstatic inline uint8_t* wuffs_base__image_buffer__palette(\n wuffs_base__image_buffer* f) {\n return f ? f->private_impl.palette : NULL;\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 a61e7ae6..05f7663b 100644 --- a/gen/c/std/adler32.c +++ b/gen/c/std/adler32.c @@ -965,7 +965,7 @@ typedef struct { } private_impl; } wuffs_base__image_buffer; -static inline void wuffs_base__image_buffer__initialize( +static inline void wuffs_base__image_buffer__set_from_pixbuf( wuffs_base__image_buffer* f, wuffs_base__image_config config, wuffs_base__pixel_buffer pixbuf) { @@ -977,6 +977,29 @@ static inline void wuffs_base__image_buffer__initialize( f->private_impl.pixbuf = pixbuf; } +// TODO: Should this function return bool? An error type? +static inline void wuffs_base__image_buffer__set_from_slice( + wuffs_base__image_buffer* f, + wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory) { + if (!f) { + return; + } + *f = ((wuffs_base__image_buffer){}); + f->private_impl.config = config; + // TODO: don't assume 1 byte per pixel. Don't assume packed. + uint64_t wh = ((uint64_t)config.private_impl.width) * + ((uint64_t)config.private_impl.height); + if (wh > pixbuf_memory.len) { + return; + } + wuffs_base__table_u8* tab = &f->private_impl.pixbuf.planes[0]; + tab->ptr = pixbuf_memory.ptr; + tab->width = config.private_impl.width; + tab->height = config.private_impl.height; + tab->stride = config.private_impl.width; +} + static inline void wuffs_base__image_buffer__update( wuffs_base__image_buffer* f, wuffs_base__rect_ie_u32 dirty_rect, diff --git a/gen/c/std/crc32.c b/gen/c/std/crc32.c index a23bff2d..934be942 100644 --- a/gen/c/std/crc32.c +++ b/gen/c/std/crc32.c @@ -965,7 +965,7 @@ typedef struct { } private_impl; } wuffs_base__image_buffer; -static inline void wuffs_base__image_buffer__initialize( +static inline void wuffs_base__image_buffer__set_from_pixbuf( wuffs_base__image_buffer* f, wuffs_base__image_config config, wuffs_base__pixel_buffer pixbuf) { @@ -977,6 +977,29 @@ static inline void wuffs_base__image_buffer__initialize( f->private_impl.pixbuf = pixbuf; } +// TODO: Should this function return bool? An error type? +static inline void wuffs_base__image_buffer__set_from_slice( + wuffs_base__image_buffer* f, + wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory) { + if (!f) { + return; + } + *f = ((wuffs_base__image_buffer){}); + f->private_impl.config = config; + // TODO: don't assume 1 byte per pixel. Don't assume packed. + uint64_t wh = ((uint64_t)config.private_impl.width) * + ((uint64_t)config.private_impl.height); + if (wh > pixbuf_memory.len) { + return; + } + wuffs_base__table_u8* tab = &f->private_impl.pixbuf.planes[0]; + tab->ptr = pixbuf_memory.ptr; + tab->width = config.private_impl.width; + tab->height = config.private_impl.height; + tab->stride = config.private_impl.width; +} + static inline void wuffs_base__image_buffer__update( wuffs_base__image_buffer* f, wuffs_base__rect_ie_u32 dirty_rect, diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index 9f56d1cf..7f5b40b4 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -965,7 +965,7 @@ typedef struct { } private_impl; } wuffs_base__image_buffer; -static inline void wuffs_base__image_buffer__initialize( +static inline void wuffs_base__image_buffer__set_from_pixbuf( wuffs_base__image_buffer* f, wuffs_base__image_config config, wuffs_base__pixel_buffer pixbuf) { @@ -977,6 +977,29 @@ static inline void wuffs_base__image_buffer__initialize( f->private_impl.pixbuf = pixbuf; } +// TODO: Should this function return bool? An error type? +static inline void wuffs_base__image_buffer__set_from_slice( + wuffs_base__image_buffer* f, + wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory) { + if (!f) { + return; + } + *f = ((wuffs_base__image_buffer){}); + f->private_impl.config = config; + // TODO: don't assume 1 byte per pixel. Don't assume packed. + uint64_t wh = ((uint64_t)config.private_impl.width) * + ((uint64_t)config.private_impl.height); + if (wh > pixbuf_memory.len) { + return; + } + wuffs_base__table_u8* tab = &f->private_impl.pixbuf.planes[0]; + tab->ptr = pixbuf_memory.ptr; + tab->width = config.private_impl.width; + tab->height = config.private_impl.height; + tab->stride = config.private_impl.width; +} + static inline void wuffs_base__image_buffer__update( wuffs_base__image_buffer* f, wuffs_base__rect_ie_u32 dirty_rect, diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 0343a1ae..8b2e2041 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -965,7 +965,7 @@ typedef struct { } private_impl; } wuffs_base__image_buffer; -static inline void wuffs_base__image_buffer__initialize( +static inline void wuffs_base__image_buffer__set_from_pixbuf( wuffs_base__image_buffer* f, wuffs_base__image_config config, wuffs_base__pixel_buffer pixbuf) { @@ -977,6 +977,29 @@ static inline void wuffs_base__image_buffer__initialize( f->private_impl.pixbuf = pixbuf; } +// TODO: Should this function return bool? An error type? +static inline void wuffs_base__image_buffer__set_from_slice( + wuffs_base__image_buffer* f, + wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory) { + if (!f) { + return; + } + *f = ((wuffs_base__image_buffer){}); + f->private_impl.config = config; + // TODO: don't assume 1 byte per pixel. Don't assume packed. + uint64_t wh = ((uint64_t)config.private_impl.width) * + ((uint64_t)config.private_impl.height); + if (wh > pixbuf_memory.len) { + return; + } + wuffs_base__table_u8* tab = &f->private_impl.pixbuf.planes[0]; + tab->ptr = pixbuf_memory.ptr; + tab->width = config.private_impl.width; + tab->height = config.private_impl.height; + tab->stride = config.private_impl.width; +} + static inline void wuffs_base__image_buffer__update( wuffs_base__image_buffer* f, wuffs_base__rect_ie_u32 dirty_rect, diff --git a/gen/c/std/gzip.c b/gen/c/std/gzip.c index 5e9fcb65..425b0ad2 100644 --- a/gen/c/std/gzip.c +++ b/gen/c/std/gzip.c @@ -965,7 +965,7 @@ typedef struct { } private_impl; } wuffs_base__image_buffer; -static inline void wuffs_base__image_buffer__initialize( +static inline void wuffs_base__image_buffer__set_from_pixbuf( wuffs_base__image_buffer* f, wuffs_base__image_config config, wuffs_base__pixel_buffer pixbuf) { @@ -977,6 +977,29 @@ static inline void wuffs_base__image_buffer__initialize( f->private_impl.pixbuf = pixbuf; } +// TODO: Should this function return bool? An error type? +static inline void wuffs_base__image_buffer__set_from_slice( + wuffs_base__image_buffer* f, + wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory) { + if (!f) { + return; + } + *f = ((wuffs_base__image_buffer){}); + f->private_impl.config = config; + // TODO: don't assume 1 byte per pixel. Don't assume packed. + uint64_t wh = ((uint64_t)config.private_impl.width) * + ((uint64_t)config.private_impl.height); + if (wh > pixbuf_memory.len) { + return; + } + wuffs_base__table_u8* tab = &f->private_impl.pixbuf.planes[0]; + tab->ptr = pixbuf_memory.ptr; + tab->width = config.private_impl.width; + tab->height = config.private_impl.height; + tab->stride = config.private_impl.width; +} + static inline void wuffs_base__image_buffer__update( wuffs_base__image_buffer* f, wuffs_base__rect_ie_u32 dirty_rect, diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index cb95e1d9..1cf1e2cb 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -965,7 +965,7 @@ typedef struct { } private_impl; } wuffs_base__image_buffer; -static inline void wuffs_base__image_buffer__initialize( +static inline void wuffs_base__image_buffer__set_from_pixbuf( wuffs_base__image_buffer* f, wuffs_base__image_config config, wuffs_base__pixel_buffer pixbuf) { @@ -977,6 +977,29 @@ static inline void wuffs_base__image_buffer__initialize( f->private_impl.pixbuf = pixbuf; } +// TODO: Should this function return bool? An error type? +static inline void wuffs_base__image_buffer__set_from_slice( + wuffs_base__image_buffer* f, + wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory) { + if (!f) { + return; + } + *f = ((wuffs_base__image_buffer){}); + f->private_impl.config = config; + // TODO: don't assume 1 byte per pixel. Don't assume packed. + uint64_t wh = ((uint64_t)config.private_impl.width) * + ((uint64_t)config.private_impl.height); + if (wh > pixbuf_memory.len) { + return; + } + wuffs_base__table_u8* tab = &f->private_impl.pixbuf.planes[0]; + tab->ptr = pixbuf_memory.ptr; + tab->width = config.private_impl.width; + tab->height = config.private_impl.height; + tab->stride = config.private_impl.width; +} + static inline void wuffs_base__image_buffer__update( wuffs_base__image_buffer* f, wuffs_base__rect_ie_u32 dirty_rect, diff --git a/gen/h/std/adler32.h b/gen/h/std/adler32.h index 72599c98..0131a89c 100644 --- a/gen/h/std/adler32.h +++ b/gen/h/std/adler32.h @@ -965,7 +965,7 @@ typedef struct { } private_impl; } wuffs_base__image_buffer; -static inline void wuffs_base__image_buffer__initialize( +static inline void wuffs_base__image_buffer__set_from_pixbuf( wuffs_base__image_buffer* f, wuffs_base__image_config config, wuffs_base__pixel_buffer pixbuf) { @@ -977,6 +977,29 @@ static inline void wuffs_base__image_buffer__initialize( f->private_impl.pixbuf = pixbuf; } +// TODO: Should this function return bool? An error type? +static inline void wuffs_base__image_buffer__set_from_slice( + wuffs_base__image_buffer* f, + wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory) { + if (!f) { + return; + } + *f = ((wuffs_base__image_buffer){}); + f->private_impl.config = config; + // TODO: don't assume 1 byte per pixel. Don't assume packed. + uint64_t wh = ((uint64_t)config.private_impl.width) * + ((uint64_t)config.private_impl.height); + if (wh > pixbuf_memory.len) { + return; + } + wuffs_base__table_u8* tab = &f->private_impl.pixbuf.planes[0]; + tab->ptr = pixbuf_memory.ptr; + tab->width = config.private_impl.width; + tab->height = config.private_impl.height; + tab->stride = config.private_impl.width; +} + static inline void wuffs_base__image_buffer__update( wuffs_base__image_buffer* f, wuffs_base__rect_ie_u32 dirty_rect, diff --git a/gen/h/std/crc32.h b/gen/h/std/crc32.h index f500b928..8ee0b24f 100644 --- a/gen/h/std/crc32.h +++ b/gen/h/std/crc32.h @@ -965,7 +965,7 @@ typedef struct { } private_impl; } wuffs_base__image_buffer; -static inline void wuffs_base__image_buffer__initialize( +static inline void wuffs_base__image_buffer__set_from_pixbuf( wuffs_base__image_buffer* f, wuffs_base__image_config config, wuffs_base__pixel_buffer pixbuf) { @@ -977,6 +977,29 @@ static inline void wuffs_base__image_buffer__initialize( f->private_impl.pixbuf = pixbuf; } +// TODO: Should this function return bool? An error type? +static inline void wuffs_base__image_buffer__set_from_slice( + wuffs_base__image_buffer* f, + wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory) { + if (!f) { + return; + } + *f = ((wuffs_base__image_buffer){}); + f->private_impl.config = config; + // TODO: don't assume 1 byte per pixel. Don't assume packed. + uint64_t wh = ((uint64_t)config.private_impl.width) * + ((uint64_t)config.private_impl.height); + if (wh > pixbuf_memory.len) { + return; + } + wuffs_base__table_u8* tab = &f->private_impl.pixbuf.planes[0]; + tab->ptr = pixbuf_memory.ptr; + tab->width = config.private_impl.width; + tab->height = config.private_impl.height; + tab->stride = config.private_impl.width; +} + static inline void wuffs_base__image_buffer__update( wuffs_base__image_buffer* f, wuffs_base__rect_ie_u32 dirty_rect, diff --git a/gen/h/std/deflate.h b/gen/h/std/deflate.h index a6ea2737..dff72022 100644 --- a/gen/h/std/deflate.h +++ b/gen/h/std/deflate.h @@ -965,7 +965,7 @@ typedef struct { } private_impl; } wuffs_base__image_buffer; -static inline void wuffs_base__image_buffer__initialize( +static inline void wuffs_base__image_buffer__set_from_pixbuf( wuffs_base__image_buffer* f, wuffs_base__image_config config, wuffs_base__pixel_buffer pixbuf) { @@ -977,6 +977,29 @@ static inline void wuffs_base__image_buffer__initialize( f->private_impl.pixbuf = pixbuf; } +// TODO: Should this function return bool? An error type? +static inline void wuffs_base__image_buffer__set_from_slice( + wuffs_base__image_buffer* f, + wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory) { + if (!f) { + return; + } + *f = ((wuffs_base__image_buffer){}); + f->private_impl.config = config; + // TODO: don't assume 1 byte per pixel. Don't assume packed. + uint64_t wh = ((uint64_t)config.private_impl.width) * + ((uint64_t)config.private_impl.height); + if (wh > pixbuf_memory.len) { + return; + } + wuffs_base__table_u8* tab = &f->private_impl.pixbuf.planes[0]; + tab->ptr = pixbuf_memory.ptr; + tab->width = config.private_impl.width; + tab->height = config.private_impl.height; + tab->stride = config.private_impl.width; +} + static inline void wuffs_base__image_buffer__update( wuffs_base__image_buffer* f, wuffs_base__rect_ie_u32 dirty_rect, diff --git a/gen/h/std/gif.h b/gen/h/std/gif.h index b302c0e2..ae677fc8 100644 --- a/gen/h/std/gif.h +++ b/gen/h/std/gif.h @@ -965,7 +965,7 @@ typedef struct { } private_impl; } wuffs_base__image_buffer; -static inline void wuffs_base__image_buffer__initialize( +static inline void wuffs_base__image_buffer__set_from_pixbuf( wuffs_base__image_buffer* f, wuffs_base__image_config config, wuffs_base__pixel_buffer pixbuf) { @@ -977,6 +977,29 @@ static inline void wuffs_base__image_buffer__initialize( f->private_impl.pixbuf = pixbuf; } +// TODO: Should this function return bool? An error type? +static inline void wuffs_base__image_buffer__set_from_slice( + wuffs_base__image_buffer* f, + wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory) { + if (!f) { + return; + } + *f = ((wuffs_base__image_buffer){}); + f->private_impl.config = config; + // TODO: don't assume 1 byte per pixel. Don't assume packed. + uint64_t wh = ((uint64_t)config.private_impl.width) * + ((uint64_t)config.private_impl.height); + if (wh > pixbuf_memory.len) { + return; + } + wuffs_base__table_u8* tab = &f->private_impl.pixbuf.planes[0]; + tab->ptr = pixbuf_memory.ptr; + tab->width = config.private_impl.width; + tab->height = config.private_impl.height; + tab->stride = config.private_impl.width; +} + static inline void wuffs_base__image_buffer__update( wuffs_base__image_buffer* f, wuffs_base__rect_ie_u32 dirty_rect, diff --git a/gen/h/std/gzip.h b/gen/h/std/gzip.h index 6c32d641..ddc40c87 100644 --- a/gen/h/std/gzip.h +++ b/gen/h/std/gzip.h @@ -965,7 +965,7 @@ typedef struct { } private_impl; } wuffs_base__image_buffer; -static inline void wuffs_base__image_buffer__initialize( +static inline void wuffs_base__image_buffer__set_from_pixbuf( wuffs_base__image_buffer* f, wuffs_base__image_config config, wuffs_base__pixel_buffer pixbuf) { @@ -977,6 +977,29 @@ static inline void wuffs_base__image_buffer__initialize( f->private_impl.pixbuf = pixbuf; } +// TODO: Should this function return bool? An error type? +static inline void wuffs_base__image_buffer__set_from_slice( + wuffs_base__image_buffer* f, + wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory) { + if (!f) { + return; + } + *f = ((wuffs_base__image_buffer){}); + f->private_impl.config = config; + // TODO: don't assume 1 byte per pixel. Don't assume packed. + uint64_t wh = ((uint64_t)config.private_impl.width) * + ((uint64_t)config.private_impl.height); + if (wh > pixbuf_memory.len) { + return; + } + wuffs_base__table_u8* tab = &f->private_impl.pixbuf.planes[0]; + tab->ptr = pixbuf_memory.ptr; + tab->width = config.private_impl.width; + tab->height = config.private_impl.height; + tab->stride = config.private_impl.width; +} + static inline void wuffs_base__image_buffer__update( wuffs_base__image_buffer* f, wuffs_base__rect_ie_u32 dirty_rect, diff --git a/gen/h/std/zlib.h b/gen/h/std/zlib.h index 9809a4ee..daa4f534 100644 --- a/gen/h/std/zlib.h +++ b/gen/h/std/zlib.h @@ -965,7 +965,7 @@ typedef struct { } private_impl; } wuffs_base__image_buffer; -static inline void wuffs_base__image_buffer__initialize( +static inline void wuffs_base__image_buffer__set_from_pixbuf( wuffs_base__image_buffer* f, wuffs_base__image_config config, wuffs_base__pixel_buffer pixbuf) { @@ -977,6 +977,29 @@ static inline void wuffs_base__image_buffer__initialize( f->private_impl.pixbuf = pixbuf; } +// TODO: Should this function return bool? An error type? +static inline void wuffs_base__image_buffer__set_from_slice( + wuffs_base__image_buffer* f, + wuffs_base__image_config config, + wuffs_base__slice_u8 pixbuf_memory) { + if (!f) { + return; + } + *f = ((wuffs_base__image_buffer){}); + f->private_impl.config = config; + // TODO: don't assume 1 byte per pixel. Don't assume packed. + uint64_t wh = ((uint64_t)config.private_impl.width) * + ((uint64_t)config.private_impl.height); + if (wh > pixbuf_memory.len) { + return; + } + wuffs_base__table_u8* tab = &f->private_impl.pixbuf.planes[0]; + tab->ptr = pixbuf_memory.ptr; + tab->width = config.private_impl.width; + tab->height = config.private_impl.height; + tab->stride = config.private_impl.width; +} + static inline void wuffs_base__image_buffer__update( wuffs_base__image_buffer* f, wuffs_base__rect_ie_u32 dirty_rect,