diff --git a/cmd/wuffs-c/internal/cgen/base-header.h b/cmd/wuffs-c/internal/cgen/base-header.h index 3bfa8189..0f400fc7 100644 --- a/cmd/wuffs-c/internal/cgen/base-header.h +++ b/cmd/wuffs-c/internal/cgen/base-header.h @@ -975,6 +975,17 @@ wuffs_base__image_config__pixel_subsampling(wuffs_base__image_config* c) { return c ? c->private_impl.pixsub : 0; } +static inline wuffs_base__rect_ie_u32 wuffs_base__image_config__bounds( + wuffs_base__image_config* c) { + return c ? ((wuffs_base__rect_ie_u32){ + .min_inclusive_x = 0, + .min_inclusive_y = 0, + .max_exclusive_x = c->private_impl.width, + .max_exclusive_y = c->private_impl.height, + }) + : ((wuffs_base__rect_ie_u32){}); +} + static inline uint32_t wuffs_base__image_config__width( wuffs_base__image_config* c) { return c ? c->private_impl.width : 0; diff --git a/cmd/wuffs-c/internal/cgen/data.go b/cmd/wuffs-c/internal/cgen/data.go index 97c61d39..b8f5feea 100644 --- a/cmd/wuffs-c/internal/cgen/data.go +++ b/cmd/wuffs-c/internal/cgen/data.go @@ -74,8 +74,8 @@ const baseHeader = "" + " inline uint32_t wuffs_base__pixel_subsampling__shift_y(\n 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 uint32_t num_loops;\n } private_impl;\n} wuffs_base__image_config;\n\n// TODO: Should this function return bool? An error type?\nstatic inline void wuffs_base__image_config__initialize(\n 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 uint32_t num_loops) {\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 c->private_imp" + - "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" + + "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 wuffs_base__rect_ie_u32 wuffs_base__image_config__bounds(\n wuffs_base__image_config* c) {\n return c ? ((wuffs_base__rect_ie_u32){\n .min_inclusive_x = 0,\n .min_inclusive_y = 0,\n .max_exclusive_x = c->private_impl.width,\n .max_exclusive_y = c->privat" + + "e_impl.height,\n })\n : ((wuffs_base__rect_ie_u32){});\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\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" + "" + diff --git a/gen/c/std/adler32.c b/gen/c/std/adler32.c index 7e698064..1ee786c1 100644 --- a/gen/c/std/adler32.c +++ b/gen/c/std/adler32.c @@ -978,6 +978,17 @@ wuffs_base__image_config__pixel_subsampling(wuffs_base__image_config* c) { return c ? c->private_impl.pixsub : 0; } +static inline wuffs_base__rect_ie_u32 wuffs_base__image_config__bounds( + wuffs_base__image_config* c) { + return c ? ((wuffs_base__rect_ie_u32){ + .min_inclusive_x = 0, + .min_inclusive_y = 0, + .max_exclusive_x = c->private_impl.width, + .max_exclusive_y = c->private_impl.height, + }) + : ((wuffs_base__rect_ie_u32){}); +} + static inline uint32_t wuffs_base__image_config__width( wuffs_base__image_config* c) { return c ? c->private_impl.width : 0; diff --git a/gen/c/std/crc32.c b/gen/c/std/crc32.c index e201716c..982b756b 100644 --- a/gen/c/std/crc32.c +++ b/gen/c/std/crc32.c @@ -978,6 +978,17 @@ wuffs_base__image_config__pixel_subsampling(wuffs_base__image_config* c) { return c ? c->private_impl.pixsub : 0; } +static inline wuffs_base__rect_ie_u32 wuffs_base__image_config__bounds( + wuffs_base__image_config* c) { + return c ? ((wuffs_base__rect_ie_u32){ + .min_inclusive_x = 0, + .min_inclusive_y = 0, + .max_exclusive_x = c->private_impl.width, + .max_exclusive_y = c->private_impl.height, + }) + : ((wuffs_base__rect_ie_u32){}); +} + static inline uint32_t wuffs_base__image_config__width( wuffs_base__image_config* c) { return c ? c->private_impl.width : 0; diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index c86bb4bd..3a80bee9 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -978,6 +978,17 @@ wuffs_base__image_config__pixel_subsampling(wuffs_base__image_config* c) { return c ? c->private_impl.pixsub : 0; } +static inline wuffs_base__rect_ie_u32 wuffs_base__image_config__bounds( + wuffs_base__image_config* c) { + return c ? ((wuffs_base__rect_ie_u32){ + .min_inclusive_x = 0, + .min_inclusive_y = 0, + .max_exclusive_x = c->private_impl.width, + .max_exclusive_y = c->private_impl.height, + }) + : ((wuffs_base__rect_ie_u32){}); +} + static inline uint32_t wuffs_base__image_config__width( wuffs_base__image_config* c) { return c ? c->private_impl.width : 0; diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 6f90e474..96bf7eec 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -978,6 +978,17 @@ wuffs_base__image_config__pixel_subsampling(wuffs_base__image_config* c) { return c ? c->private_impl.pixsub : 0; } +static inline wuffs_base__rect_ie_u32 wuffs_base__image_config__bounds( + wuffs_base__image_config* c) { + return c ? ((wuffs_base__rect_ie_u32){ + .min_inclusive_x = 0, + .min_inclusive_y = 0, + .max_exclusive_x = c->private_impl.width, + .max_exclusive_y = c->private_impl.height, + }) + : ((wuffs_base__rect_ie_u32){}); +} + static inline uint32_t wuffs_base__image_config__width( wuffs_base__image_config* c) { return c ? c->private_impl.width : 0; diff --git a/gen/c/std/gzip.c b/gen/c/std/gzip.c index 334576b1..e9f1cae8 100644 --- a/gen/c/std/gzip.c +++ b/gen/c/std/gzip.c @@ -978,6 +978,17 @@ wuffs_base__image_config__pixel_subsampling(wuffs_base__image_config* c) { return c ? c->private_impl.pixsub : 0; } +static inline wuffs_base__rect_ie_u32 wuffs_base__image_config__bounds( + wuffs_base__image_config* c) { + return c ? ((wuffs_base__rect_ie_u32){ + .min_inclusive_x = 0, + .min_inclusive_y = 0, + .max_exclusive_x = c->private_impl.width, + .max_exclusive_y = c->private_impl.height, + }) + : ((wuffs_base__rect_ie_u32){}); +} + static inline uint32_t wuffs_base__image_config__width( wuffs_base__image_config* c) { return c ? c->private_impl.width : 0; diff --git a/gen/c/std/lzw.c b/gen/c/std/lzw.c index 347f2d31..bb03afc7 100644 --- a/gen/c/std/lzw.c +++ b/gen/c/std/lzw.c @@ -978,6 +978,17 @@ wuffs_base__image_config__pixel_subsampling(wuffs_base__image_config* c) { return c ? c->private_impl.pixsub : 0; } +static inline wuffs_base__rect_ie_u32 wuffs_base__image_config__bounds( + wuffs_base__image_config* c) { + return c ? ((wuffs_base__rect_ie_u32){ + .min_inclusive_x = 0, + .min_inclusive_y = 0, + .max_exclusive_x = c->private_impl.width, + .max_exclusive_y = c->private_impl.height, + }) + : ((wuffs_base__rect_ie_u32){}); +} + static inline uint32_t wuffs_base__image_config__width( wuffs_base__image_config* c) { return c ? c->private_impl.width : 0; diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index 7e193f23..86342c05 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -978,6 +978,17 @@ wuffs_base__image_config__pixel_subsampling(wuffs_base__image_config* c) { return c ? c->private_impl.pixsub : 0; } +static inline wuffs_base__rect_ie_u32 wuffs_base__image_config__bounds( + wuffs_base__image_config* c) { + return c ? ((wuffs_base__rect_ie_u32){ + .min_inclusive_x = 0, + .min_inclusive_y = 0, + .max_exclusive_x = c->private_impl.width, + .max_exclusive_y = c->private_impl.height, + }) + : ((wuffs_base__rect_ie_u32){}); +} + static inline uint32_t wuffs_base__image_config__width( wuffs_base__image_config* c) { return c ? c->private_impl.width : 0; diff --git a/gen/h/std/adler32.h b/gen/h/std/adler32.h index 4a024454..46ae0e23 100644 --- a/gen/h/std/adler32.h +++ b/gen/h/std/adler32.h @@ -978,6 +978,17 @@ wuffs_base__image_config__pixel_subsampling(wuffs_base__image_config* c) { return c ? c->private_impl.pixsub : 0; } +static inline wuffs_base__rect_ie_u32 wuffs_base__image_config__bounds( + wuffs_base__image_config* c) { + return c ? ((wuffs_base__rect_ie_u32){ + .min_inclusive_x = 0, + .min_inclusive_y = 0, + .max_exclusive_x = c->private_impl.width, + .max_exclusive_y = c->private_impl.height, + }) + : ((wuffs_base__rect_ie_u32){}); +} + static inline uint32_t wuffs_base__image_config__width( wuffs_base__image_config* c) { return c ? c->private_impl.width : 0; diff --git a/gen/h/std/crc32.h b/gen/h/std/crc32.h index ea1504ef..9743039b 100644 --- a/gen/h/std/crc32.h +++ b/gen/h/std/crc32.h @@ -978,6 +978,17 @@ wuffs_base__image_config__pixel_subsampling(wuffs_base__image_config* c) { return c ? c->private_impl.pixsub : 0; } +static inline wuffs_base__rect_ie_u32 wuffs_base__image_config__bounds( + wuffs_base__image_config* c) { + return c ? ((wuffs_base__rect_ie_u32){ + .min_inclusive_x = 0, + .min_inclusive_y = 0, + .max_exclusive_x = c->private_impl.width, + .max_exclusive_y = c->private_impl.height, + }) + : ((wuffs_base__rect_ie_u32){}); +} + static inline uint32_t wuffs_base__image_config__width( wuffs_base__image_config* c) { return c ? c->private_impl.width : 0; diff --git a/gen/h/std/deflate.h b/gen/h/std/deflate.h index bfd06368..a6c55a0f 100644 --- a/gen/h/std/deflate.h +++ b/gen/h/std/deflate.h @@ -978,6 +978,17 @@ wuffs_base__image_config__pixel_subsampling(wuffs_base__image_config* c) { return c ? c->private_impl.pixsub : 0; } +static inline wuffs_base__rect_ie_u32 wuffs_base__image_config__bounds( + wuffs_base__image_config* c) { + return c ? ((wuffs_base__rect_ie_u32){ + .min_inclusive_x = 0, + .min_inclusive_y = 0, + .max_exclusive_x = c->private_impl.width, + .max_exclusive_y = c->private_impl.height, + }) + : ((wuffs_base__rect_ie_u32){}); +} + static inline uint32_t wuffs_base__image_config__width( wuffs_base__image_config* c) { return c ? c->private_impl.width : 0; diff --git a/gen/h/std/gif.h b/gen/h/std/gif.h index a4ad9d4d..05064e48 100644 --- a/gen/h/std/gif.h +++ b/gen/h/std/gif.h @@ -978,6 +978,17 @@ wuffs_base__image_config__pixel_subsampling(wuffs_base__image_config* c) { return c ? c->private_impl.pixsub : 0; } +static inline wuffs_base__rect_ie_u32 wuffs_base__image_config__bounds( + wuffs_base__image_config* c) { + return c ? ((wuffs_base__rect_ie_u32){ + .min_inclusive_x = 0, + .min_inclusive_y = 0, + .max_exclusive_x = c->private_impl.width, + .max_exclusive_y = c->private_impl.height, + }) + : ((wuffs_base__rect_ie_u32){}); +} + static inline uint32_t wuffs_base__image_config__width( wuffs_base__image_config* c) { return c ? c->private_impl.width : 0; diff --git a/gen/h/std/gzip.h b/gen/h/std/gzip.h index fe4011ff..68c1ff5c 100644 --- a/gen/h/std/gzip.h +++ b/gen/h/std/gzip.h @@ -978,6 +978,17 @@ wuffs_base__image_config__pixel_subsampling(wuffs_base__image_config* c) { return c ? c->private_impl.pixsub : 0; } +static inline wuffs_base__rect_ie_u32 wuffs_base__image_config__bounds( + wuffs_base__image_config* c) { + return c ? ((wuffs_base__rect_ie_u32){ + .min_inclusive_x = 0, + .min_inclusive_y = 0, + .max_exclusive_x = c->private_impl.width, + .max_exclusive_y = c->private_impl.height, + }) + : ((wuffs_base__rect_ie_u32){}); +} + static inline uint32_t wuffs_base__image_config__width( wuffs_base__image_config* c) { return c ? c->private_impl.width : 0; diff --git a/gen/h/std/lzw.h b/gen/h/std/lzw.h index ef83c92c..8d192940 100644 --- a/gen/h/std/lzw.h +++ b/gen/h/std/lzw.h @@ -978,6 +978,17 @@ wuffs_base__image_config__pixel_subsampling(wuffs_base__image_config* c) { return c ? c->private_impl.pixsub : 0; } +static inline wuffs_base__rect_ie_u32 wuffs_base__image_config__bounds( + wuffs_base__image_config* c) { + return c ? ((wuffs_base__rect_ie_u32){ + .min_inclusive_x = 0, + .min_inclusive_y = 0, + .max_exclusive_x = c->private_impl.width, + .max_exclusive_y = c->private_impl.height, + }) + : ((wuffs_base__rect_ie_u32){}); +} + static inline uint32_t wuffs_base__image_config__width( wuffs_base__image_config* c) { return c ? c->private_impl.width : 0; diff --git a/gen/h/std/zlib.h b/gen/h/std/zlib.h index 716b97eb..22a51752 100644 --- a/gen/h/std/zlib.h +++ b/gen/h/std/zlib.h @@ -978,6 +978,17 @@ wuffs_base__image_config__pixel_subsampling(wuffs_base__image_config* c) { return c ? c->private_impl.pixsub : 0; } +static inline wuffs_base__rect_ie_u32 wuffs_base__image_config__bounds( + wuffs_base__image_config* c) { + return c ? ((wuffs_base__rect_ie_u32){ + .min_inclusive_x = 0, + .min_inclusive_y = 0, + .max_exclusive_x = c->private_impl.width, + .max_exclusive_y = c->private_impl.height, + }) + : ((wuffs_base__rect_ie_u32){}); +} + static inline uint32_t wuffs_base__image_config__width( wuffs_base__image_config* c) { return c ? c->private_impl.width : 0;