diff --git a/cmd/wuffs-c/internal/cgen/base-header.h b/cmd/wuffs-c/internal/cgen/base-header.h index e5c5a464..bab258b7 100644 --- a/cmd/wuffs-c/internal/cgen/base-header.h +++ b/cmd/wuffs-c/internal/cgen/base-header.h @@ -812,20 +812,20 @@ typedef struct { // details. Use methods such as wuffs_base__pixel_subsampling__bias_x instead. typedef uint32_t wuffs_base__pixel_subsampling; -#define WUFFS_BASE__PIXEL_SUBSAMPLING__NONE ((wuffs_base__pixel_subsampling)0); +#define WUFFS_BASE__PIXEL_SUBSAMPLING__NONE ((wuffs_base__pixel_subsampling)0) #define WUFFS_BASE__PIXEL_SUBSAMPLING__444 \ - ((wuffs_base__pixel_subsampling)0x000000); + ((wuffs_base__pixel_subsampling)0x000000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__440 \ - ((wuffs_base__pixel_subsampling)0x010100); + ((wuffs_base__pixel_subsampling)0x010100) #define WUFFS_BASE__PIXEL_SUBSAMPLING__422 \ - ((wuffs_base__pixel_subsampling)0x101000); + ((wuffs_base__pixel_subsampling)0x101000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__420 \ - ((wuffs_base__pixel_subsampling)0x111100); + ((wuffs_base__pixel_subsampling)0x111100) #define WUFFS_BASE__PIXEL_SUBSAMPLING__411 \ - ((wuffs_base__pixel_subsampling)0x202000); + ((wuffs_base__pixel_subsampling)0x202000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__410 \ - ((wuffs_base__pixel_subsampling)0x212100); + ((wuffs_base__pixel_subsampling)0x212100) static inline uint32_t wuffs_base__pixel_subsampling__bias_x( wuffs_base__pixel_subsampling s, diff --git a/cmd/wuffs-c/internal/cgen/data.go b/cmd/wuffs-c/internal/cgen/data.go index 574f5ad0..ac484db7 100644 --- a/cmd/wuffs-c/internal/cgen/data.go +++ b/cmd/wuffs-c/internal/cgen/data.go @@ -65,9 +65,9 @@ const baseHeader = "" + "return f ? (((f >> 20) & 0x03) + 1) : 0;\n}\n\ntypedef struct {\n wuffs_base__table_u8 planes[WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX];\n} wuffs_base__pixel_buffer;\n\n" + "" + "// --------\n\n// wuffs_base__pixel_subsampling encodes the mapping of pixel space coordinates\n// (x, y) to pixel buffer indices (i, j). That mapping can differ for each\n// plane p. For a depth of 8 bits (1 byte), the p'th plane's sample starts at\n// (planes[p].ptr + (j * planes[p].stride) + i).\n//\n// For packed pixel formats, the mapping is trivial: i = x and j = y. For\n// planar pixel formats, the mapping can differ due to chroma subsampling. For\n// example, consider a three plane YUV pixel format with 4:2:2 subsampling. For\n// the luma (Y) channel, there is one sample for every pixel, but for the\n// chroma (U, V) channels, there is one sample for every two pixels: pairs of\n// horizontally adjacent pixels form one macropixel, i = x / 2 and j == y. In\n// general, for a given p:\n// - i = (x + bias_x) >> shift_x.\n// - j = (y + bias_y) >> shift_y.\n// where biases and shifts are in the range 0..3 and 0..2 respectively.\n//\n// In general, the biases will be zero after decoding an image. However, making\n// a sub-im" + - "age may change the bias, since the (x, y) coordinates are relative\n// to the sub-image's top-left origin, but the backing pixel buffers were\n// created relative to the original image's origin.\n//\n// For each plane p, each of those four numbers (biases and shifts) are encoded\n// in two bits, which combine to form an 8 bit unsigned integer:\n//\n// e_p = (bias_x << 6) | (shift_x << 4) | (bias_y << 2) | (shift_y << 0)\n//\n// Those e_p values (e_0 for the first plane, e_1 for the second plane, etc)\n// combine to form a wuffs_base__pixel_subsampling value:\n//\n// pixsub = (e_3 << 24) | (e_2 << 16) | (e_1 << 8) | (e_0 << 0)\n//\n// Do not manipulate these bits directly; they are private implementation\n// details. Use methods such as wuffs_base__pixel_subsampling__bias_x instead.\ntypedef uint32_t wuffs_base__pixel_subsampling;\n\n#define WUFFS_BASE__PIXEL_SUBSAMPLING__NONE ((wuffs_base__pixel_subsampling)0);\n\n#define WUFFS_BASE__PIXEL_SUBSAMPLING__444 \\\n ((wuffs_base__pixel_subsampling)0x000000);\n#define WUFFS_BASE__PIXE" + - "L_SUBSAMPLING__440 \\\n ((wuffs_base__pixel_subsampling)0x010100);\n#define WUFFS_BASE__PIXEL_SUBSAMPLING__422 \\\n ((wuffs_base__pixel_subsampling)0x101000);\n#define WUFFS_BASE__PIXEL_SUBSAMPLING__420 \\\n ((wuffs_base__pixel_subsampling)0x111100);\n#define WUFFS_BASE__PIXEL_SUBSAMPLING__411 \\\n ((wuffs_base__pixel_subsampling)0x202000);\n#define WUFFS_BASE__PIXEL_SUBSAMPLING__410 \\\n ((wuffs_base__pixel_subsampling)0x212100);\n\nstatic inline uint32_t wuffs_base__pixel_subsampling__bias_x(\n wuffs_base__pixel_subsampling s,\n uint32_t plane) {\n uint32_t shift = ((plane & 0x03) * 8) + 6;\n return (s >> shift) & 0x03;\n}\n\nstatic inline uint32_t wuffs_base__pixel_subsampling__shift_x(\n wuffs_base__pixel_subsampling s,\n uint32_t plane) {\n uint32_t shift = ((plane & 0x03) * 8) + 4;\n return (s >> shift) & 0x03;\n}\n\nstatic inline uint32_t wuffs_base__pixel_subsampling__bias_y(\n wuffs_base__pixel_subsampling s,\n uint32_t plane) {\n uint32_t shift = ((plane & 0x03) * 8) + 2;\n return (s >> shift) & 0x03;\n}\n" + - "\nstatic 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" + + "age may change the bias, since the (x, y) coordinates are relative\n// to the sub-image's top-left origin, but the backing pixel buffers were\n// created relative to the original image's origin.\n//\n// For each plane p, each of those four numbers (biases and shifts) are encoded\n// in two bits, which combine to form an 8 bit unsigned integer:\n//\n// e_p = (bias_x << 6) | (shift_x << 4) | (bias_y << 2) | (shift_y << 0)\n//\n// Those e_p values (e_0 for the first plane, e_1 for the second plane, etc)\n// combine to form a wuffs_base__pixel_subsampling value:\n//\n// pixsub = (e_3 << 24) | (e_2 << 16) | (e_1 << 8) | (e_0 << 0)\n//\n// Do not manipulate these bits directly; they are private implementation\n// details. Use methods such as wuffs_base__pixel_subsampling__bias_x instead.\ntypedef uint32_t wuffs_base__pixel_subsampling;\n\n#define WUFFS_BASE__PIXEL_SUBSAMPLING__NONE ((wuffs_base__pixel_subsampling)0)\n\n#define WUFFS_BASE__PIXEL_SUBSAMPLING__444 \\\n ((wuffs_base__pixel_subsampling)0x000000)\n#define WUFFS_BASE__PIXEL_" + + "SUBSAMPLING__440 \\\n ((wuffs_base__pixel_subsampling)0x010100)\n#define WUFFS_BASE__PIXEL_SUBSAMPLING__422 \\\n ((wuffs_base__pixel_subsampling)0x101000)\n#define WUFFS_BASE__PIXEL_SUBSAMPLING__420 \\\n ((wuffs_base__pixel_subsampling)0x111100)\n#define WUFFS_BASE__PIXEL_SUBSAMPLING__411 \\\n ((wuffs_base__pixel_subsampling)0x202000)\n#define WUFFS_BASE__PIXEL_SUBSAMPLING__410 \\\n ((wuffs_base__pixel_subsampling)0x212100)\n\nstatic inline uint32_t wuffs_base__pixel_subsampling__bias_x(\n wuffs_base__pixel_subsampling s,\n uint32_t plane) {\n uint32_t shift = ((plane & 0x03) * 8) + 6;\n return (s >> shift) & 0x03;\n}\n\nstatic inline uint32_t wuffs_base__pixel_subsampling__shift_x(\n wuffs_base__pixel_subsampling s,\n uint32_t plane) {\n uint32_t shift = ((plane & 0x03) * 8) + 4;\n return (s >> shift) & 0x03;\n}\n\nstatic inline uint32_t wuffs_base__pixel_subsampling__bias_y(\n wuffs_base__pixel_subsampling s,\n uint32_t plane) {\n uint32_t shift = ((plane & 0x03) * 8) + 2;\n return (s >> shift) & 0x03;\n}\n\nstatic" + + " 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\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 // TODO: move the check from wuffs_base__image_config__is_valid here. Should\n // this function return bool? An error type?\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_impl.num_loops = num_loops;\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 if (!c || !c->private_impl.pixfmt) {\n return false;\n }\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 //\n // TODO: move the check to wuffs_base__image_config__initialize.\n return wh <= ((uint64_t)SIZE_MAX);\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 wuffs_base__image_config__is_valid(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 wuffs_base__image_config__is_valid(c) ? c->private_impl.width : 0;\n}\n\nstatic inline uint32_t wuff" + diff --git a/gen/c/std/adler32.c b/gen/c/std/adler32.c index c726506f..7d1ca7c2 100644 --- a/gen/c/std/adler32.c +++ b/gen/c/std/adler32.c @@ -815,20 +815,20 @@ typedef struct { // details. Use methods such as wuffs_base__pixel_subsampling__bias_x instead. typedef uint32_t wuffs_base__pixel_subsampling; -#define WUFFS_BASE__PIXEL_SUBSAMPLING__NONE ((wuffs_base__pixel_subsampling)0); +#define WUFFS_BASE__PIXEL_SUBSAMPLING__NONE ((wuffs_base__pixel_subsampling)0) #define WUFFS_BASE__PIXEL_SUBSAMPLING__444 \ - ((wuffs_base__pixel_subsampling)0x000000); + ((wuffs_base__pixel_subsampling)0x000000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__440 \ - ((wuffs_base__pixel_subsampling)0x010100); + ((wuffs_base__pixel_subsampling)0x010100) #define WUFFS_BASE__PIXEL_SUBSAMPLING__422 \ - ((wuffs_base__pixel_subsampling)0x101000); + ((wuffs_base__pixel_subsampling)0x101000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__420 \ - ((wuffs_base__pixel_subsampling)0x111100); + ((wuffs_base__pixel_subsampling)0x111100) #define WUFFS_BASE__PIXEL_SUBSAMPLING__411 \ - ((wuffs_base__pixel_subsampling)0x202000); + ((wuffs_base__pixel_subsampling)0x202000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__410 \ - ((wuffs_base__pixel_subsampling)0x212100); + ((wuffs_base__pixel_subsampling)0x212100) static inline uint32_t wuffs_base__pixel_subsampling__bias_x( wuffs_base__pixel_subsampling s, diff --git a/gen/c/std/crc32.c b/gen/c/std/crc32.c index d9692ac8..3c849300 100644 --- a/gen/c/std/crc32.c +++ b/gen/c/std/crc32.c @@ -815,20 +815,20 @@ typedef struct { // details. Use methods such as wuffs_base__pixel_subsampling__bias_x instead. typedef uint32_t wuffs_base__pixel_subsampling; -#define WUFFS_BASE__PIXEL_SUBSAMPLING__NONE ((wuffs_base__pixel_subsampling)0); +#define WUFFS_BASE__PIXEL_SUBSAMPLING__NONE ((wuffs_base__pixel_subsampling)0) #define WUFFS_BASE__PIXEL_SUBSAMPLING__444 \ - ((wuffs_base__pixel_subsampling)0x000000); + ((wuffs_base__pixel_subsampling)0x000000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__440 \ - ((wuffs_base__pixel_subsampling)0x010100); + ((wuffs_base__pixel_subsampling)0x010100) #define WUFFS_BASE__PIXEL_SUBSAMPLING__422 \ - ((wuffs_base__pixel_subsampling)0x101000); + ((wuffs_base__pixel_subsampling)0x101000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__420 \ - ((wuffs_base__pixel_subsampling)0x111100); + ((wuffs_base__pixel_subsampling)0x111100) #define WUFFS_BASE__PIXEL_SUBSAMPLING__411 \ - ((wuffs_base__pixel_subsampling)0x202000); + ((wuffs_base__pixel_subsampling)0x202000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__410 \ - ((wuffs_base__pixel_subsampling)0x212100); + ((wuffs_base__pixel_subsampling)0x212100) static inline uint32_t wuffs_base__pixel_subsampling__bias_x( wuffs_base__pixel_subsampling s, diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index 993fce4a..bdc409b6 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -815,20 +815,20 @@ typedef struct { // details. Use methods such as wuffs_base__pixel_subsampling__bias_x instead. typedef uint32_t wuffs_base__pixel_subsampling; -#define WUFFS_BASE__PIXEL_SUBSAMPLING__NONE ((wuffs_base__pixel_subsampling)0); +#define WUFFS_BASE__PIXEL_SUBSAMPLING__NONE ((wuffs_base__pixel_subsampling)0) #define WUFFS_BASE__PIXEL_SUBSAMPLING__444 \ - ((wuffs_base__pixel_subsampling)0x000000); + ((wuffs_base__pixel_subsampling)0x000000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__440 \ - ((wuffs_base__pixel_subsampling)0x010100); + ((wuffs_base__pixel_subsampling)0x010100) #define WUFFS_BASE__PIXEL_SUBSAMPLING__422 \ - ((wuffs_base__pixel_subsampling)0x101000); + ((wuffs_base__pixel_subsampling)0x101000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__420 \ - ((wuffs_base__pixel_subsampling)0x111100); + ((wuffs_base__pixel_subsampling)0x111100) #define WUFFS_BASE__PIXEL_SUBSAMPLING__411 \ - ((wuffs_base__pixel_subsampling)0x202000); + ((wuffs_base__pixel_subsampling)0x202000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__410 \ - ((wuffs_base__pixel_subsampling)0x212100); + ((wuffs_base__pixel_subsampling)0x212100) static inline uint32_t wuffs_base__pixel_subsampling__bias_x( wuffs_base__pixel_subsampling s, diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 84b882ee..0fd31e61 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -815,20 +815,20 @@ typedef struct { // details. Use methods such as wuffs_base__pixel_subsampling__bias_x instead. typedef uint32_t wuffs_base__pixel_subsampling; -#define WUFFS_BASE__PIXEL_SUBSAMPLING__NONE ((wuffs_base__pixel_subsampling)0); +#define WUFFS_BASE__PIXEL_SUBSAMPLING__NONE ((wuffs_base__pixel_subsampling)0) #define WUFFS_BASE__PIXEL_SUBSAMPLING__444 \ - ((wuffs_base__pixel_subsampling)0x000000); + ((wuffs_base__pixel_subsampling)0x000000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__440 \ - ((wuffs_base__pixel_subsampling)0x010100); + ((wuffs_base__pixel_subsampling)0x010100) #define WUFFS_BASE__PIXEL_SUBSAMPLING__422 \ - ((wuffs_base__pixel_subsampling)0x101000); + ((wuffs_base__pixel_subsampling)0x101000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__420 \ - ((wuffs_base__pixel_subsampling)0x111100); + ((wuffs_base__pixel_subsampling)0x111100) #define WUFFS_BASE__PIXEL_SUBSAMPLING__411 \ - ((wuffs_base__pixel_subsampling)0x202000); + ((wuffs_base__pixel_subsampling)0x202000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__410 \ - ((wuffs_base__pixel_subsampling)0x212100); + ((wuffs_base__pixel_subsampling)0x212100) static inline uint32_t wuffs_base__pixel_subsampling__bias_x( wuffs_base__pixel_subsampling s, diff --git a/gen/c/std/gzip.c b/gen/c/std/gzip.c index f24bef56..91d4178d 100644 --- a/gen/c/std/gzip.c +++ b/gen/c/std/gzip.c @@ -815,20 +815,20 @@ typedef struct { // details. Use methods such as wuffs_base__pixel_subsampling__bias_x instead. typedef uint32_t wuffs_base__pixel_subsampling; -#define WUFFS_BASE__PIXEL_SUBSAMPLING__NONE ((wuffs_base__pixel_subsampling)0); +#define WUFFS_BASE__PIXEL_SUBSAMPLING__NONE ((wuffs_base__pixel_subsampling)0) #define WUFFS_BASE__PIXEL_SUBSAMPLING__444 \ - ((wuffs_base__pixel_subsampling)0x000000); + ((wuffs_base__pixel_subsampling)0x000000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__440 \ - ((wuffs_base__pixel_subsampling)0x010100); + ((wuffs_base__pixel_subsampling)0x010100) #define WUFFS_BASE__PIXEL_SUBSAMPLING__422 \ - ((wuffs_base__pixel_subsampling)0x101000); + ((wuffs_base__pixel_subsampling)0x101000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__420 \ - ((wuffs_base__pixel_subsampling)0x111100); + ((wuffs_base__pixel_subsampling)0x111100) #define WUFFS_BASE__PIXEL_SUBSAMPLING__411 \ - ((wuffs_base__pixel_subsampling)0x202000); + ((wuffs_base__pixel_subsampling)0x202000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__410 \ - ((wuffs_base__pixel_subsampling)0x212100); + ((wuffs_base__pixel_subsampling)0x212100) static inline uint32_t wuffs_base__pixel_subsampling__bias_x( wuffs_base__pixel_subsampling s, diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index 5931a5fa..1e9a749f 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -815,20 +815,20 @@ typedef struct { // details. Use methods such as wuffs_base__pixel_subsampling__bias_x instead. typedef uint32_t wuffs_base__pixel_subsampling; -#define WUFFS_BASE__PIXEL_SUBSAMPLING__NONE ((wuffs_base__pixel_subsampling)0); +#define WUFFS_BASE__PIXEL_SUBSAMPLING__NONE ((wuffs_base__pixel_subsampling)0) #define WUFFS_BASE__PIXEL_SUBSAMPLING__444 \ - ((wuffs_base__pixel_subsampling)0x000000); + ((wuffs_base__pixel_subsampling)0x000000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__440 \ - ((wuffs_base__pixel_subsampling)0x010100); + ((wuffs_base__pixel_subsampling)0x010100) #define WUFFS_BASE__PIXEL_SUBSAMPLING__422 \ - ((wuffs_base__pixel_subsampling)0x101000); + ((wuffs_base__pixel_subsampling)0x101000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__420 \ - ((wuffs_base__pixel_subsampling)0x111100); + ((wuffs_base__pixel_subsampling)0x111100) #define WUFFS_BASE__PIXEL_SUBSAMPLING__411 \ - ((wuffs_base__pixel_subsampling)0x202000); + ((wuffs_base__pixel_subsampling)0x202000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__410 \ - ((wuffs_base__pixel_subsampling)0x212100); + ((wuffs_base__pixel_subsampling)0x212100) static inline uint32_t wuffs_base__pixel_subsampling__bias_x( wuffs_base__pixel_subsampling s, diff --git a/gen/h/std/adler32.h b/gen/h/std/adler32.h index 76242b38..d3212e8e 100644 --- a/gen/h/std/adler32.h +++ b/gen/h/std/adler32.h @@ -815,20 +815,20 @@ typedef struct { // details. Use methods such as wuffs_base__pixel_subsampling__bias_x instead. typedef uint32_t wuffs_base__pixel_subsampling; -#define WUFFS_BASE__PIXEL_SUBSAMPLING__NONE ((wuffs_base__pixel_subsampling)0); +#define WUFFS_BASE__PIXEL_SUBSAMPLING__NONE ((wuffs_base__pixel_subsampling)0) #define WUFFS_BASE__PIXEL_SUBSAMPLING__444 \ - ((wuffs_base__pixel_subsampling)0x000000); + ((wuffs_base__pixel_subsampling)0x000000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__440 \ - ((wuffs_base__pixel_subsampling)0x010100); + ((wuffs_base__pixel_subsampling)0x010100) #define WUFFS_BASE__PIXEL_SUBSAMPLING__422 \ - ((wuffs_base__pixel_subsampling)0x101000); + ((wuffs_base__pixel_subsampling)0x101000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__420 \ - ((wuffs_base__pixel_subsampling)0x111100); + ((wuffs_base__pixel_subsampling)0x111100) #define WUFFS_BASE__PIXEL_SUBSAMPLING__411 \ - ((wuffs_base__pixel_subsampling)0x202000); + ((wuffs_base__pixel_subsampling)0x202000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__410 \ - ((wuffs_base__pixel_subsampling)0x212100); + ((wuffs_base__pixel_subsampling)0x212100) static inline uint32_t wuffs_base__pixel_subsampling__bias_x( wuffs_base__pixel_subsampling s, diff --git a/gen/h/std/crc32.h b/gen/h/std/crc32.h index 3206b67f..dbd7ceb9 100644 --- a/gen/h/std/crc32.h +++ b/gen/h/std/crc32.h @@ -815,20 +815,20 @@ typedef struct { // details. Use methods such as wuffs_base__pixel_subsampling__bias_x instead. typedef uint32_t wuffs_base__pixel_subsampling; -#define WUFFS_BASE__PIXEL_SUBSAMPLING__NONE ((wuffs_base__pixel_subsampling)0); +#define WUFFS_BASE__PIXEL_SUBSAMPLING__NONE ((wuffs_base__pixel_subsampling)0) #define WUFFS_BASE__PIXEL_SUBSAMPLING__444 \ - ((wuffs_base__pixel_subsampling)0x000000); + ((wuffs_base__pixel_subsampling)0x000000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__440 \ - ((wuffs_base__pixel_subsampling)0x010100); + ((wuffs_base__pixel_subsampling)0x010100) #define WUFFS_BASE__PIXEL_SUBSAMPLING__422 \ - ((wuffs_base__pixel_subsampling)0x101000); + ((wuffs_base__pixel_subsampling)0x101000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__420 \ - ((wuffs_base__pixel_subsampling)0x111100); + ((wuffs_base__pixel_subsampling)0x111100) #define WUFFS_BASE__PIXEL_SUBSAMPLING__411 \ - ((wuffs_base__pixel_subsampling)0x202000); + ((wuffs_base__pixel_subsampling)0x202000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__410 \ - ((wuffs_base__pixel_subsampling)0x212100); + ((wuffs_base__pixel_subsampling)0x212100) static inline uint32_t wuffs_base__pixel_subsampling__bias_x( wuffs_base__pixel_subsampling s, diff --git a/gen/h/std/deflate.h b/gen/h/std/deflate.h index e3052795..0656a6cc 100644 --- a/gen/h/std/deflate.h +++ b/gen/h/std/deflate.h @@ -815,20 +815,20 @@ typedef struct { // details. Use methods such as wuffs_base__pixel_subsampling__bias_x instead. typedef uint32_t wuffs_base__pixel_subsampling; -#define WUFFS_BASE__PIXEL_SUBSAMPLING__NONE ((wuffs_base__pixel_subsampling)0); +#define WUFFS_BASE__PIXEL_SUBSAMPLING__NONE ((wuffs_base__pixel_subsampling)0) #define WUFFS_BASE__PIXEL_SUBSAMPLING__444 \ - ((wuffs_base__pixel_subsampling)0x000000); + ((wuffs_base__pixel_subsampling)0x000000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__440 \ - ((wuffs_base__pixel_subsampling)0x010100); + ((wuffs_base__pixel_subsampling)0x010100) #define WUFFS_BASE__PIXEL_SUBSAMPLING__422 \ - ((wuffs_base__pixel_subsampling)0x101000); + ((wuffs_base__pixel_subsampling)0x101000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__420 \ - ((wuffs_base__pixel_subsampling)0x111100); + ((wuffs_base__pixel_subsampling)0x111100) #define WUFFS_BASE__PIXEL_SUBSAMPLING__411 \ - ((wuffs_base__pixel_subsampling)0x202000); + ((wuffs_base__pixel_subsampling)0x202000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__410 \ - ((wuffs_base__pixel_subsampling)0x212100); + ((wuffs_base__pixel_subsampling)0x212100) static inline uint32_t wuffs_base__pixel_subsampling__bias_x( wuffs_base__pixel_subsampling s, diff --git a/gen/h/std/gif.h b/gen/h/std/gif.h index f21c2430..30e18e0f 100644 --- a/gen/h/std/gif.h +++ b/gen/h/std/gif.h @@ -815,20 +815,20 @@ typedef struct { // details. Use methods such as wuffs_base__pixel_subsampling__bias_x instead. typedef uint32_t wuffs_base__pixel_subsampling; -#define WUFFS_BASE__PIXEL_SUBSAMPLING__NONE ((wuffs_base__pixel_subsampling)0); +#define WUFFS_BASE__PIXEL_SUBSAMPLING__NONE ((wuffs_base__pixel_subsampling)0) #define WUFFS_BASE__PIXEL_SUBSAMPLING__444 \ - ((wuffs_base__pixel_subsampling)0x000000); + ((wuffs_base__pixel_subsampling)0x000000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__440 \ - ((wuffs_base__pixel_subsampling)0x010100); + ((wuffs_base__pixel_subsampling)0x010100) #define WUFFS_BASE__PIXEL_SUBSAMPLING__422 \ - ((wuffs_base__pixel_subsampling)0x101000); + ((wuffs_base__pixel_subsampling)0x101000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__420 \ - ((wuffs_base__pixel_subsampling)0x111100); + ((wuffs_base__pixel_subsampling)0x111100) #define WUFFS_BASE__PIXEL_SUBSAMPLING__411 \ - ((wuffs_base__pixel_subsampling)0x202000); + ((wuffs_base__pixel_subsampling)0x202000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__410 \ - ((wuffs_base__pixel_subsampling)0x212100); + ((wuffs_base__pixel_subsampling)0x212100) static inline uint32_t wuffs_base__pixel_subsampling__bias_x( wuffs_base__pixel_subsampling s, diff --git a/gen/h/std/gzip.h b/gen/h/std/gzip.h index c36254e0..b923ddc8 100644 --- a/gen/h/std/gzip.h +++ b/gen/h/std/gzip.h @@ -815,20 +815,20 @@ typedef struct { // details. Use methods such as wuffs_base__pixel_subsampling__bias_x instead. typedef uint32_t wuffs_base__pixel_subsampling; -#define WUFFS_BASE__PIXEL_SUBSAMPLING__NONE ((wuffs_base__pixel_subsampling)0); +#define WUFFS_BASE__PIXEL_SUBSAMPLING__NONE ((wuffs_base__pixel_subsampling)0) #define WUFFS_BASE__PIXEL_SUBSAMPLING__444 \ - ((wuffs_base__pixel_subsampling)0x000000); + ((wuffs_base__pixel_subsampling)0x000000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__440 \ - ((wuffs_base__pixel_subsampling)0x010100); + ((wuffs_base__pixel_subsampling)0x010100) #define WUFFS_BASE__PIXEL_SUBSAMPLING__422 \ - ((wuffs_base__pixel_subsampling)0x101000); + ((wuffs_base__pixel_subsampling)0x101000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__420 \ - ((wuffs_base__pixel_subsampling)0x111100); + ((wuffs_base__pixel_subsampling)0x111100) #define WUFFS_BASE__PIXEL_SUBSAMPLING__411 \ - ((wuffs_base__pixel_subsampling)0x202000); + ((wuffs_base__pixel_subsampling)0x202000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__410 \ - ((wuffs_base__pixel_subsampling)0x212100); + ((wuffs_base__pixel_subsampling)0x212100) static inline uint32_t wuffs_base__pixel_subsampling__bias_x( wuffs_base__pixel_subsampling s, diff --git a/gen/h/std/zlib.h b/gen/h/std/zlib.h index 4d7827c1..b0956472 100644 --- a/gen/h/std/zlib.h +++ b/gen/h/std/zlib.h @@ -815,20 +815,20 @@ typedef struct { // details. Use methods such as wuffs_base__pixel_subsampling__bias_x instead. typedef uint32_t wuffs_base__pixel_subsampling; -#define WUFFS_BASE__PIXEL_SUBSAMPLING__NONE ((wuffs_base__pixel_subsampling)0); +#define WUFFS_BASE__PIXEL_SUBSAMPLING__NONE ((wuffs_base__pixel_subsampling)0) #define WUFFS_BASE__PIXEL_SUBSAMPLING__444 \ - ((wuffs_base__pixel_subsampling)0x000000); + ((wuffs_base__pixel_subsampling)0x000000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__440 \ - ((wuffs_base__pixel_subsampling)0x010100); + ((wuffs_base__pixel_subsampling)0x010100) #define WUFFS_BASE__PIXEL_SUBSAMPLING__422 \ - ((wuffs_base__pixel_subsampling)0x101000); + ((wuffs_base__pixel_subsampling)0x101000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__420 \ - ((wuffs_base__pixel_subsampling)0x111100); + ((wuffs_base__pixel_subsampling)0x111100) #define WUFFS_BASE__PIXEL_SUBSAMPLING__411 \ - ((wuffs_base__pixel_subsampling)0x202000); + ((wuffs_base__pixel_subsampling)0x202000) #define WUFFS_BASE__PIXEL_SUBSAMPLING__410 \ - ((wuffs_base__pixel_subsampling)0x212100); + ((wuffs_base__pixel_subsampling)0x212100) static inline uint32_t wuffs_base__pixel_subsampling__bias_x( wuffs_base__pixel_subsampling s,