diff --git a/doc/note/pixel-formats.md b/doc/note/pixel-formats.md index 9eca00eb..1a4f7ddb 100644 --- a/doc/note/pixel-formats.md +++ b/doc/note/pixel-formats.md @@ -3,10 +3,9 @@ `wuffs_base__pixel_format` is a `uint32_t` that encodes the format of the bytes that constitute an image frame's pixel data. Its bits: -- Bit `31` is reserved. -- Bits `28 ..= 30` encodes color (and channel order, in terms of memory). -- Bit `27` is reserved. -- Bits `24 ..= 26` encodes transparency. +- Bits `28 ..= 31` encodes color (and channel order, in terms of memory). +- Bits `26 ..= 27` are reserved. +- Bits `24 ..= 25` encodes transparency. - Bits `21 ..= 23` are reserved. - Bit `20` indicates big-endian/MSB-first (instead of little/LSB). - Bit `19` indicates floating point (instead of integer). @@ -22,8 +21,8 @@ that constitute an image frame's pixel data. Its bits: The bit fields of a `wuffs_base__pixel_format` are not independent. For example, the number of planes should not be greater than the number of channels. Similarly, bits `4 ..= 15` are unused (and should be zero) if bits -`24 ..= 31` (color and transparency) together imply only 1 channel (gray, no -alpha) and floating point samples should mean a bit depth of 16, 32 or 64. +`24 ..= 31` (color and transparency) together imply only 1 channel (e.g. gray, +no alpha) and floating point samples should mean a bit depth of 16, 32 or 64. Formats hold between 1 and 4 channels. For example: Y (1 channel: gray), YA (2 channels: gray and alpha), BGR (3 channels: blue, green, red) or CMYK (4 @@ -39,15 +38,20 @@ channel non-alpha-premultiplied BGRA color data. There is only 1 plane (for the index), as the format is considered interleaved. Plane 0 holds the per-pixel indices. Plane 3 is re-purposed to hold the per-index colors. -The color field is encoded in 3 bits: +Color is encoded in 4 bits: -- 0 means A (Alpha). -- 1 means Y or YA (Gray, Alpha). -- 2 means YCbCr or YCbCrA (Luma, Chroma-blue, Chroma-red, Alpha). -- 3 means YCoCg or YCoCgA (Luma, Chroma-orange, Chroma-green, Alpha). -- 4 means BGR, BGRX or BGRA (Blue, Green, Red, X-padding or Alpha). -- 5 means RGB, RGBX or RGBA (Red, Green, Blue, X-padding or Alpha). -- 6 means CMY or CMYK (Cyan, Magenta, Yellow, Black). +- 0 means A (Alpha). +- 2 means Y or YA (Gray, Alpha). +- 4 means YCbCr or YCbCrA (Luma, Chroma-blue, Chroma-red, Alpha). +- 5 means YCbCrK (Luma, Chroma-blue, Chroma-red, Black). +- 6 means YCoCg or YCoCgA (Luma, Chroma-orange, Chroma-green, Alpha). +- 7 means YCoCgK (Luma, Chroma-orange, Chroma-green, Black). +- 8 means BGR or BGRA (Blue, Green, Red, Alpha). +- 9 means BGRX (Blue, Green, Red, X-padding). +- 10 means RGB or RGBA (Red, Green, Blue, Alpha). +- 11 means RGBX (Red, Green, Blue, X-padding). +- 12 means CMY or CMYA (Cyan, Magenta, Yellow, Alpha). +- 13 means CMYK (Cyan, Magenta, Yellow, Black). - all other values are reserved. In Wuffs, channels are given in memory order (also known as byte order), @@ -57,15 +61,12 @@ per channel means that the bytes in memory are always Blue, Green, Red then Alpha. On big-endian systems, that is the `uint32_t 0xBBGGRRAA`. On little-endian, `0xAARRGGBB`. -When the color field (3 bits) encodes multiple options, the transparency field -(3 bits) distinguishes them: +Transparency is encoded in 2 bits: -- 0 means fully opaque, no extra channels -- 1 means fully opaque, one extra channel (X or K, padding or black). -- 5 means one extra alpha channel, other channels are non-premultiplied. -- 6 means one extra alpha channel, other channels are premultiplied. -- 7 means one extra alpha channel, binary alpha. -- all other values are reserved. +- 0 means no alpha channel, fully opaque. +- 1 means an alpha channel, other channels are non-premultiplied. +- 2 means an alpha channel, other channels are premultiplied. +- 3 means an alpha channel, binary alpha. Binary alpha means that if a color is not completely opaque, it is completely transparent black. As a source pixel format, it can therefore be treated as @@ -86,7 +87,7 @@ Bit depth is encoded in 4 bits: - 14 means a bit depth of 48. - 15 means a bit depth of 64. -For example, the value `wuffs_base__pixel_format` `0x40000565` means BGR with +For example, the value `wuffs_base__pixel_format` `0x80000565` means BGR with no alpha or padding, 5/6/5 bits for blue/green/red, interleaved 2 bytes per pixel, laid out LSB-first in memory order: diff --git a/internal/cgen/base/image-impl.c b/internal/cgen/base/image-impl.c index a4dfb382..00ef3633 100644 --- a/internal/cgen/base/image-impl.c +++ b/internal/cgen/base/image-impl.c @@ -78,12 +78,10 @@ wuffs_base__pixel_buffer__color_u32_at(const wuffs_base__pixel_buffer* pb, switch (pb->pixcfg.private_impl.pixfmt.repr) { case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL: - WUFFS_BASE__FALLTHROUGH; case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY: return wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x))); case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL: - WUFFS_BASE__FALLTHROUGH; case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY: { uint8_t* palette = pb->private_impl.planes[3].ptr; return wuffs_base__load_u32le__no_bounds_check(palette + @@ -116,29 +114,28 @@ wuffs_base__pixel_buffer__color_u32_at(const wuffs_base__pixel_buffer* pb, case WUFFS_BASE__PIXEL_FORMAT__BGR: return 0xFF000000 | wuffs_base__load_u24le__no_bounds_check(row + (3 * ((size_t)x))); - case WUFFS_BASE__PIXEL_FORMAT__BGRX: - return 0xFF000000 | - wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x))); case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL: return wuffs_base__premul_u32_axxx( wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x)))); + case WUFFS_BASE__PIXEL_FORMAT__BGRX: + return 0xFF000000 | + wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x))); case WUFFS_BASE__PIXEL_FORMAT__RGB: return wuffs_base__swap_u32_argb_abgr( 0xFF000000 | wuffs_base__load_u24le__no_bounds_check(row + (3 * ((size_t)x)))); - case WUFFS_BASE__PIXEL_FORMAT__RGBX: - return wuffs_base__swap_u32_argb_abgr( - 0xFF000000 | - wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x)))); case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL: return wuffs_base__swap_u32_argb_abgr(wuffs_base__premul_u32_axxx( wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x))))); case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL: - WUFFS_BASE__FALLTHROUGH; case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY: return wuffs_base__swap_u32_argb_abgr( wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x)))); + case WUFFS_BASE__PIXEL_FORMAT__RGBX: + return wuffs_base__swap_u32_argb_abgr( + 0xFF000000 | + wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x)))); default: // TODO: support more formats. @@ -172,7 +169,6 @@ wuffs_base__pixel_buffer__set_color_u32_at( switch (pb->pixcfg.private_impl.pixfmt.repr) { case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL: - WUFFS_BASE__FALLTHROUGH; case WUFFS_BASE__PIXEL_FORMAT__BGRX: wuffs_base__store_u32le__no_bounds_check(row + (4 * ((size_t)x)), color); break; @@ -676,14 +672,14 @@ wuffs_base__pixel_swizzler__prepare__y(wuffs_base__pixel_swizzler* p, // TODO. break; - case WUFFS_BASE__PIXEL_FORMAT__BGRX: case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL: case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL: case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY: - case WUFFS_BASE__PIXEL_FORMAT__RGBX: + case WUFFS_BASE__PIXEL_FORMAT__BGRX: case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL: case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL: case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY: + case WUFFS_BASE__PIXEL_FORMAT__RGBX: return wuffs_base__pixel_swizzler__xxxx__y; } return NULL; @@ -796,16 +792,16 @@ wuffs_base__pixel_swizzler__prepare__bgr(wuffs_base__pixel_swizzler* p, // TODO. break; - case WUFFS_BASE__PIXEL_FORMAT__BGRX: case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL: case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL: case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY: + case WUFFS_BASE__PIXEL_FORMAT__BGRX: return wuffs_base__pixel_swizzler__xxxx__xxx; - case WUFFS_BASE__PIXEL_FORMAT__RGBX: case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL: case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL: case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY: + case WUFFS_BASE__PIXEL_FORMAT__RGBX: // TODO. break; } @@ -829,8 +825,8 @@ wuffs_base__pixel_swizzler__prepare__bgra_nonpremul( // TODO. break; - case WUFFS_BASE__PIXEL_FORMAT__BGRX: case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL: + case WUFFS_BASE__PIXEL_FORMAT__BGRX: switch (blend) { case WUFFS_BASE__PIXEL_BLEND__SRC: return wuffs_base__pixel_swizzler__copy_4_4; @@ -850,10 +846,10 @@ wuffs_base__pixel_swizzler__prepare__bgra_nonpremul( // TODO. break; - case WUFFS_BASE__PIXEL_FORMAT__RGBX: case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL: case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL: case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY: + case WUFFS_BASE__PIXEL_FORMAT__RGBX: // TODO. break; } diff --git a/internal/cgen/base/image-public.h b/internal/cgen/base/image-public.h index 754320be..1fd3f283 100644 --- a/internal/cgen/base/image-public.h +++ b/internal/cgen/base/image-public.h @@ -83,6 +83,23 @@ typedef uint8_t wuffs_base__pixel_blend; // -------- +// wuffs_base__pixel_alpha_transparency is a pixel format's alpha channel +// model. It is a property of the pixel format in general, not of a specific +// pixel. An RGBA pixel format (with alpha) can still have fully opaque pixels. +typedef uint32_t wuffs_base__pixel_alpha_transparency; + +#define WUFFS_BASE__PIXEL_ALPHA_TRANSPARENCY__OPAQUE 0 +#define WUFFS_BASE__PIXEL_ALPHA_TRANSPARENCY__NON_PREMULTIPLIED_ALPHA 1 +#define WUFFS_BASE__PIXEL_ALPHA_TRANSPARENCY__PREMULTIPLIED_ALPHA 2 +#define WUFFS_BASE__PIXEL_ALPHA_TRANSPARENCY__BINARY_ALPHA 3 + +// -------- + +#define WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX 4 + +#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__INDEX_PLANE 0 +#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE 3 + // wuffs_base__pixel_format encodes the format of the bytes that constitute an // image frame's pixel data. // @@ -96,10 +113,12 @@ typedef struct { #ifdef __cplusplus inline bool is_valid() const; inline uint32_t bits_per_pixel() const; + inline bool is_direct() const; inline bool is_indexed() const; inline bool is_interleaved() const; inline bool is_planar() const; inline uint32_t num_planes() const; + inline wuffs_base__pixel_alpha_transparency transparency() const; #endif // __cplusplus } wuffs_base__pixel_format; @@ -118,37 +137,37 @@ wuffs_base__make_pixel_format(uint32_t repr) { #define WUFFS_BASE__PIXEL_FORMAT__A 0x02000008 -#define WUFFS_BASE__PIXEL_FORMAT__Y 0x10000008 -#define WUFFS_BASE__PIXEL_FORMAT__YA_NONPREMUL 0x15000008 -#define WUFFS_BASE__PIXEL_FORMAT__YA_PREMUL 0x16000008 +#define WUFFS_BASE__PIXEL_FORMAT__Y 0x20000008 +#define WUFFS_BASE__PIXEL_FORMAT__YA_NONPREMUL 0x21000008 +#define WUFFS_BASE__PIXEL_FORMAT__YA_PREMUL 0x22000008 -#define WUFFS_BASE__PIXEL_FORMAT__YCBCR 0x20020888 -#define WUFFS_BASE__PIXEL_FORMAT__YCBCRK 0x21038888 -#define WUFFS_BASE__PIXEL_FORMAT__YCBCRA_NONPREMUL 0x25038888 +#define WUFFS_BASE__PIXEL_FORMAT__YCBCR 0x40020888 +#define WUFFS_BASE__PIXEL_FORMAT__YCBCRA_NONPREMUL 0x41038888 +#define WUFFS_BASE__PIXEL_FORMAT__YCBCRK 0x50038888 -#define WUFFS_BASE__PIXEL_FORMAT__YCOCG 0x30020888 -#define WUFFS_BASE__PIXEL_FORMAT__YCOCGK 0x31038888 -#define WUFFS_BASE__PIXEL_FORMAT__YCOCGA_NONPREMUL 0x35038888 +#define WUFFS_BASE__PIXEL_FORMAT__YCOCG 0x60020888 +#define WUFFS_BASE__PIXEL_FORMAT__YCOCGA_NONPREMUL 0x61038888 +#define WUFFS_BASE__PIXEL_FORMAT__YCOCGK 0x70038888 -#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL 0x45040008 -#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL 0x46040008 -#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY 0x47040008 +#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL 0x81040008 +#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL 0x82040008 +#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY 0x83040008 -#define WUFFS_BASE__PIXEL_FORMAT__BGR_565 0x40000565 -#define WUFFS_BASE__PIXEL_FORMAT__BGR 0x40000888 -#define WUFFS_BASE__PIXEL_FORMAT__BGRX 0x41008888 -#define WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL 0x45008888 -#define WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL 0x46008888 -#define WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY 0x47008888 +#define WUFFS_BASE__PIXEL_FORMAT__BGR_565 0x80000565 +#define WUFFS_BASE__PIXEL_FORMAT__BGR 0x80000888 +#define WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL 0x81008888 +#define WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL 0x82008888 +#define WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY 0x83008888 +#define WUFFS_BASE__PIXEL_FORMAT__BGRX 0x90008888 -#define WUFFS_BASE__PIXEL_FORMAT__RGB 0x50000888 -#define WUFFS_BASE__PIXEL_FORMAT__RGBX 0x51008888 -#define WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL 0x55008888 -#define WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL 0x56008888 -#define WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY 0x57008888 +#define WUFFS_BASE__PIXEL_FORMAT__RGB 0xA0000888 +#define WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL 0xA1008888 +#define WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL 0xA2008888 +#define WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY 0xA3008888 +#define WUFFS_BASE__PIXEL_FORMAT__RGBX 0xB0008888 -#define WUFFS_BASE__PIXEL_FORMAT__CMY 0x60020888 -#define WUFFS_BASE__PIXEL_FORMAT__CMYK 0x61038888 +#define WUFFS_BASE__PIXEL_FORMAT__CMY 0xC0020888 +#define WUFFS_BASE__PIXEL_FORMAT__CMYK 0xD0038888 extern const uint32_t wuffs_base__pixel_format__bits_per_channel[16]; @@ -170,9 +189,14 @@ wuffs_base__pixel_format__bits_per_pixel(const wuffs_base__pixel_format* f) { wuffs_base__pixel_format__bits_per_channel[0x0F & (f->repr >> 12)]; } +static inline bool // +wuffs_base__pixel_format__is_direct(const wuffs_base__pixel_format* f) { + return ((f->repr >> 18) & 0x01) == 0; +} + static inline bool // wuffs_base__pixel_format__is_indexed(const wuffs_base__pixel_format* f) { - return (f->repr >> 18) & 0x01; + return ((f->repr >> 18) & 0x01) != 0; } static inline bool // @@ -190,10 +214,10 @@ wuffs_base__pixel_format__num_planes(const wuffs_base__pixel_format* f) { return ((f->repr >> 16) & 0x03) + 1; } -#define WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX 4 - -#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__INDEX_PLANE 0 -#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE 3 +static inline wuffs_base__pixel_alpha_transparency // +wuffs_base__pixel_format__transparency(const wuffs_base__pixel_format* f) { + return (wuffs_base__pixel_alpha_transparency)((f->repr >> 24) & 0x03); +} #ifdef __cplusplus @@ -207,6 +231,11 @@ wuffs_base__pixel_format::bits_per_pixel() const { return wuffs_base__pixel_format__bits_per_pixel(this); } +inline bool // +wuffs_base__pixel_format::is_direct() const { + return wuffs_base__pixel_format__is_direct(this); +} + inline bool // wuffs_base__pixel_format::is_indexed() const { return wuffs_base__pixel_format__is_indexed(this); @@ -227,6 +256,11 @@ wuffs_base__pixel_format::num_planes() const { return wuffs_base__pixel_format__num_planes(this); } +inline wuffs_base__pixel_alpha_transparency // +wuffs_base__pixel_format::transparency() const { + return wuffs_base__pixel_format__transparency(this); +} + #endif // __cplusplus // -------- diff --git a/internal/cgen/data.go b/internal/cgen/data.go index f5d45d7a..2285cdf2 100644 --- a/internal/cgen/data.go +++ b/internal/cgen/data.go @@ -29,12 +29,12 @@ const baseAllImplC = "" + const baseImageImplC = "" + "// ---------------- Images\n\nconst uint32_t wuffs_base__pixel_format__bits_per_channel[16] = {\n 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,\n 0x08, 0x0A, 0x0C, 0x10, 0x18, 0x20, 0x30, 0x40,\n};\n\nstatic inline uint32_t //\nwuffs_base__swap_u32_argb_abgr(uint32_t u) {\n uint32_t o = u & 0xFF00FF00;\n uint32_t r = u & 0x00FF0000;\n uint32_t b = u & 0x000000FF;\n return o | (r >> 16) | (b << 16);\n}\n\nstatic inline uint32_t //\nwuffs_base__composite_premul_nonpremul_u32_axxx(uint32_t dst_premul,\n uint32_t src_nonpremul) {\n // Convert from 8-bit color to 16-bit color.\n uint32_t sa = 0x101 * (0xFF & (src_nonpremul >> 24));\n uint32_t sr = 0x101 * (0xFF & (src_nonpremul >> 16));\n uint32_t sg = 0x101 * (0xFF & (src_nonpremul >> 8));\n uint32_t sb = 0x101 * (0xFF & (src_nonpremul >> 0));\n uint32_t da = 0x101 * (0xFF & (dst_premul >> 24));\n uint32_t dr = 0x101 * (0xFF & (dst_premul >> 16));\n uint32_t dg = 0x101 * (0xFF & (dst_premul >> 8));\n uint32_t db = 0x101" + " * (0xFF & (dst_premul >> 0));\n\n // Calculate the inverse of the src-alpha: how much of the dst to keep.\n uint32_t ia = 0xFFFF - sa;\n\n // Composite src (nonpremul) over dst (premul).\n da = sa + ((da * ia) / 0xFFFF);\n dr = ((sr * sa) + (dr * ia)) / 0xFFFF;\n dg = ((sg * sa) + (dg * ia)) / 0xFFFF;\n db = ((sb * sa) + (db * ia)) / 0xFFFF;\n\n // Convert from 16-bit color to 8-bit color and combine the components.\n da >>= 8;\n dr >>= 8;\n dg >>= 8;\n db >>= 8;\n return (db << 0) | (dg << 8) | (dr << 16) | (da << 24);\n}\n\nwuffs_base__color_u32_argb_premul //\nwuffs_base__pixel_buffer__color_u32_at(const wuffs_base__pixel_buffer* pb,\n uint32_t x,\n uint32_t y) {\n if (!pb || (x >= pb->pixcfg.private_impl.width) ||\n (y >= pb->pixcfg.private_impl.height)) {\n return 0;\n }\n\n if (wuffs_base__pixel_format__is_planar(&pb->pixcfg.private_impl.pixfmt)) {\n // TODO: support planar formats.\n return 0;\n }\n\n size_t stride = pb->priva" + - "te_impl.planes[0].stride;\n uint8_t* row = pb->private_impl.planes[0].ptr + (stride * ((size_t)y));\n\n switch (pb->pixcfg.private_impl.pixfmt.repr) {\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:\n WUFFS_BASE__FALLTHROUGH;\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:\n return wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x)));\n\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL:\n WUFFS_BASE__FALLTHROUGH;\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY: {\n uint8_t* palette = pb->private_impl.planes[3].ptr;\n return wuffs_base__load_u32le__no_bounds_check(palette +\n (4 * ((size_t)row[x])));\n }\n\n // Common formats above. Rarer formats below.\n\n case WUFFS_BASE__PIXEL_FORMAT__Y:\n return 0xFF000000 | (0x00010101 * ((uint32_t)(row[x])));\n\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL: {\n uint8_t* palette = pb->private_impl.planes[3].ptr;\n return wuffs_base__premul_u32_axxx(" + - "\n wuffs_base__load_u32le__no_bounds_check(palette +\n (4 * ((size_t)row[x]))));\n }\n\n case WUFFS_BASE__PIXEL_FORMAT__BGR_565: {\n uint16_t bgr =\n wuffs_base__load_u16le__no_bounds_check(row + (2 * ((size_t)x)));\n uint32_t b5 = 0x1F & (bgr >> 0);\n uint32_t b = (b5 << 3) | (b5 >> 2);\n uint32_t g6 = 0x3F & (bgr >> 5);\n uint32_t g = (g6 << 2) | (g6 >> 4);\n uint32_t r5 = 0x1F & (bgr >> 11);\n uint32_t r = (r5 << 3) | (r5 >> 2);\n return 0xFF000000 | (r << 16) | (g << 8) | (b << 0);\n }\n case WUFFS_BASE__PIXEL_FORMAT__BGR:\n return 0xFF000000 |\n wuffs_base__load_u24le__no_bounds_check(row + (3 * ((size_t)x)));\n case WUFFS_BASE__PIXEL_FORMAT__BGRX:\n return 0xFF000000 |\n wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x)));\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:\n return wuffs_base__premul_u32_axxx(\n wuffs_base__load_u32le__no_bounds_" + - "check(row + (4 * ((size_t)x))));\n\n case WUFFS_BASE__PIXEL_FORMAT__RGB:\n return wuffs_base__swap_u32_argb_abgr(\n 0xFF000000 |\n wuffs_base__load_u24le__no_bounds_check(row + (3 * ((size_t)x))));\n case WUFFS_BASE__PIXEL_FORMAT__RGBX:\n return wuffs_base__swap_u32_argb_abgr(\n 0xFF000000 |\n wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x))));\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:\n return wuffs_base__swap_u32_argb_abgr(wuffs_base__premul_u32_axxx(\n wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x)))));\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:\n WUFFS_BASE__FALLTHROUGH;\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:\n return wuffs_base__swap_u32_argb_abgr(\n wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x))));\n\n default:\n // TODO: support more formats.\n break;\n }\n\n return 0;\n}\n\nwuffs_base__status //\nwuffs_base__pixel_buffer__set_color_u32_at(\n wuffs_base__p" + - "ixel_buffer* pb,\n uint32_t x,\n uint32_t y,\n wuffs_base__color_u32_argb_premul color) {\n if (!pb) {\n return wuffs_base__make_status(wuffs_base__error__bad_receiver);\n }\n if ((x >= pb->pixcfg.private_impl.width) ||\n (y >= pb->pixcfg.private_impl.height)) {\n return wuffs_base__make_status(wuffs_base__error__bad_argument);\n }\n\n if (wuffs_base__pixel_format__is_planar(&pb->pixcfg.private_impl.pixfmt)) {\n // TODO: support planar formats.\n return wuffs_base__make_status(wuffs_base__error__unsupported_option);\n }\n\n size_t stride = pb->private_impl.planes[0].stride;\n uint8_t* row = pb->private_impl.planes[0].ptr + (stride * ((size_t)y));\n\n switch (pb->pixcfg.private_impl.pixfmt.repr) {\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:\n WUFFS_BASE__FALLTHROUGH;\n case WUFFS_BASE__PIXEL_FORMAT__BGRX:\n wuffs_base__store_u32le__no_bounds_check(row + (4 * ((size_t)x)), color);\n break;\n\n // Common formats above. Rarer formats below.\n\n case WUFFS_BASE__PIXEL_FORMAT__B" + - "GR_565: {\n uint32_t b5 = 0x1F & (color >> (8 - 5));\n uint32_t g6 = 0x3F & (color >> (16 - 6));\n uint32_t r5 = 0x1F & (color >> (24 - 5));\n uint32_t bgr565 = (b5 << 0) | (g6 << 5) | (r5 << 11);\n wuffs_base__store_u16le__no_bounds_check(row + (2 * ((size_t)x)),\n (uint16_t)bgr565);\n break;\n }\n case WUFFS_BASE__PIXEL_FORMAT__BGR:\n wuffs_base__store_u24le__no_bounds_check(row + (3 * ((size_t)x)), color);\n break;\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:\n wuffs_base__store_u32le__no_bounds_check(\n row + (4 * ((size_t)x)), wuffs_base__nonpremul_u32_axxx(color));\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__RGB:\n wuffs_base__store_u24le__no_bounds_check(\n row + (3 * ((size_t)x)), wuffs_base__swap_u32_argb_abgr(color));\n break;\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:\n wuffs_base__store_u32le__no_bounds_check(\n row + (4 * ((size_t)x)), wuffs_base__nonpremul_u" + - "32_axxx(\n wuffs_base__swap_u32_argb_abgr(color)));\n break;\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:\n WUFFS_BASE__FALLTHROUGH;\n case WUFFS_BASE__PIXEL_FORMAT__RGBX:\n wuffs_base__store_u32le__no_bounds_check(\n row + (4 * ((size_t)x)), wuffs_base__swap_u32_argb_abgr(color));\n break;\n\n default:\n // TODO: support more formats.\n return wuffs_base__make_status(wuffs_base__error__unsupported_option);\n }\n\n return wuffs_base__make_status(NULL);\n}\n\n" + + "te_impl.planes[0].stride;\n uint8_t* row = pb->private_impl.planes[0].ptr + (stride * ((size_t)y));\n\n switch (pb->pixcfg.private_impl.pixfmt.repr) {\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:\n return wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x)));\n\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY: {\n uint8_t* palette = pb->private_impl.planes[3].ptr;\n return wuffs_base__load_u32le__no_bounds_check(palette +\n (4 * ((size_t)row[x])));\n }\n\n // Common formats above. Rarer formats below.\n\n case WUFFS_BASE__PIXEL_FORMAT__Y:\n return 0xFF000000 | (0x00010101 * ((uint32_t)(row[x])));\n\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL: {\n uint8_t* palette = pb->private_impl.planes[3].ptr;\n return wuffs_base__premul_u32_axxx(\n wuffs_base__load_u32le__no_bounds_check(palette +\n " + + " (4 * ((size_t)row[x]))));\n }\n\n case WUFFS_BASE__PIXEL_FORMAT__BGR_565: {\n uint16_t bgr =\n wuffs_base__load_u16le__no_bounds_check(row + (2 * ((size_t)x)));\n uint32_t b5 = 0x1F & (bgr >> 0);\n uint32_t b = (b5 << 3) | (b5 >> 2);\n uint32_t g6 = 0x3F & (bgr >> 5);\n uint32_t g = (g6 << 2) | (g6 >> 4);\n uint32_t r5 = 0x1F & (bgr >> 11);\n uint32_t r = (r5 << 3) | (r5 >> 2);\n return 0xFF000000 | (r << 16) | (g << 8) | (b << 0);\n }\n case WUFFS_BASE__PIXEL_FORMAT__BGR:\n return 0xFF000000 |\n wuffs_base__load_u24le__no_bounds_check(row + (3 * ((size_t)x)));\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:\n return wuffs_base__premul_u32_axxx(\n wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x))));\n case WUFFS_BASE__PIXEL_FORMAT__BGRX:\n return 0xFF000000 |\n wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x)));\n\n case WUFFS_BASE__PIXEL_F" + + "ORMAT__RGB:\n return wuffs_base__swap_u32_argb_abgr(\n 0xFF000000 |\n wuffs_base__load_u24le__no_bounds_check(row + (3 * ((size_t)x))));\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:\n return wuffs_base__swap_u32_argb_abgr(wuffs_base__premul_u32_axxx(\n wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x)))));\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:\n return wuffs_base__swap_u32_argb_abgr(\n wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x))));\n case WUFFS_BASE__PIXEL_FORMAT__RGBX:\n return wuffs_base__swap_u32_argb_abgr(\n 0xFF000000 |\n wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x))));\n\n default:\n // TODO: support more formats.\n break;\n }\n\n return 0;\n}\n\nwuffs_base__status //\nwuffs_base__pixel_buffer__set_color_u32_at(\n wuffs_base__pixel_buffer* pb,\n uint32_t x,\n uint32_t y,\n wuffs_base__color_u32_argb_premul color)" + + " {\n if (!pb) {\n return wuffs_base__make_status(wuffs_base__error__bad_receiver);\n }\n if ((x >= pb->pixcfg.private_impl.width) ||\n (y >= pb->pixcfg.private_impl.height)) {\n return wuffs_base__make_status(wuffs_base__error__bad_argument);\n }\n\n if (wuffs_base__pixel_format__is_planar(&pb->pixcfg.private_impl.pixfmt)) {\n // TODO: support planar formats.\n return wuffs_base__make_status(wuffs_base__error__unsupported_option);\n }\n\n size_t stride = pb->private_impl.planes[0].stride;\n uint8_t* row = pb->private_impl.planes[0].ptr + (stride * ((size_t)y));\n\n switch (pb->pixcfg.private_impl.pixfmt.repr) {\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__BGRX:\n wuffs_base__store_u32le__no_bounds_check(row + (4 * ((size_t)x)), color);\n break;\n\n // Common formats above. Rarer formats below.\n\n case WUFFS_BASE__PIXEL_FORMAT__BGR_565: {\n uint32_t b5 = 0x1F & (color >> (8 - 5));\n uint32_t g6 = 0x3F & (color >> (16 - 6));\n uint32_t r5 =" + + " 0x1F & (color >> (24 - 5));\n uint32_t bgr565 = (b5 << 0) | (g6 << 5) | (r5 << 11);\n wuffs_base__store_u16le__no_bounds_check(row + (2 * ((size_t)x)),\n (uint16_t)bgr565);\n break;\n }\n case WUFFS_BASE__PIXEL_FORMAT__BGR:\n wuffs_base__store_u24le__no_bounds_check(row + (3 * ((size_t)x)), color);\n break;\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:\n wuffs_base__store_u32le__no_bounds_check(\n row + (4 * ((size_t)x)), wuffs_base__nonpremul_u32_axxx(color));\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__RGB:\n wuffs_base__store_u24le__no_bounds_check(\n row + (3 * ((size_t)x)), wuffs_base__swap_u32_argb_abgr(color));\n break;\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:\n wuffs_base__store_u32le__no_bounds_check(\n row + (4 * ((size_t)x)), wuffs_base__nonpremul_u32_axxx(\n wuffs_base__swap_u32_argb_abgr(color)));\n break;\n case WUFFS_BASE__P" + + "IXEL_FORMAT__RGBA_PREMUL:\n WUFFS_BASE__FALLTHROUGH;\n case WUFFS_BASE__PIXEL_FORMAT__RGBX:\n wuffs_base__store_u32le__no_bounds_check(\n row + (4 * ((size_t)x)), wuffs_base__swap_u32_argb_abgr(color));\n break;\n\n default:\n // TODO: support more formats.\n return wuffs_base__make_status(wuffs_base__error__unsupported_option);\n }\n\n return wuffs_base__make_status(NULL);\n}\n\n" + "" + "// --------\n\nstatic uint64_t //\nwuffs_base__pixel_swizzler__bgra_premul__bgra_nonpremul__src(\n wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src) {\n size_t dst_len4 = dst.len / 4;\n size_t src_len4 = src.len / 4;\n size_t len = dst_len4 < src_len4 ? dst_len4 : src_len4;\n uint8_t* d = dst.ptr;\n uint8_t* s = src.ptr;\n size_t n = len;\n\n // TODO: unroll.\n\n while (n >= 1) {\n uint32_t s0 = wuffs_base__premul_u32_axxx(\n wuffs_base__load_u32le__no_bounds_check(s + (0 * 4)));\n wuffs_base__store_u32le__no_bounds_check(d + (0 * 4), s0);\n\n s += 1 * 4;\n d += 1 * 4;\n n -= 1;\n }\n\n return len;\n}\n\nstatic uint64_t //\nwuffs_base__pixel_swizzler__bgra_premul__bgra_nonpremul__src_over(\n wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src) {\n size_t dst_len4 = dst.len / 4;\n size_t src_len4 = src.len / 4;\n size_t len = dst_len4 < src_len4 ? dst_len4 : src_len4;\n uint8_t* d = dst.ptr;\n uint8_t* s = src.ptr;\n" + " size_t n = len;\n\n // TODO: unroll.\n\n while (n >= 1) {\n uint32_t d0 = wuffs_base__load_u32le__no_bounds_check(d + (0 * 4));\n uint32_t s0 = wuffs_base__load_u32le__no_bounds_check(s + (0 * 4));\n wuffs_base__store_u32le__no_bounds_check(\n d + (0 * 4), wuffs_base__composite_premul_nonpremul_u32_axxx(d0, s0));\n\n s += 1 * 4;\n d += 1 * 4;\n n -= 1;\n }\n\n return len;\n}\n\nstatic uint64_t //\nwuffs_base__pixel_swizzler__copy_1_1(wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src) {\n return wuffs_base__slice_u8__copy_from_slice(dst, src);\n}\n\nstatic uint64_t //\nwuffs_base__pixel_swizzler__copy_4_4(wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src) {\n size_t dst_len4 = dst.len / 4;\n size_t src_len4 = src.len / 4;\n size_t len = dst_len4 < src_len4 ? dst_len4 : src_len4;\n if (l" + @@ -52,13 +52,13 @@ const baseImageImplC = "" + "// --------\n\nstatic uint64_t //\nwuffs_base__pixel_swizzler__squash_bgr_565_888(wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 src) {\n size_t len4 = (dst.len < src.len ? dst.len : src.len) / 4;\n uint8_t* d = dst.ptr;\n uint8_t* s = src.ptr;\n\n size_t n = len4;\n while (n--) {\n uint32_t argb = wuffs_base__load_u32le__no_bounds_check(s);\n uint32_t b5 = 0x1F & (argb >> (8 - 5));\n uint32_t g6 = 0x3F & (argb >> (16 - 6));\n uint32_t r5 = 0x1F & (argb >> (24 - 5));\n wuffs_base__store_u32le__no_bounds_check(\n d, (b5 << 0) | (g6 << 5) | (r5 << 11));\n s += 4;\n d += 4;\n }\n return len4 * 4;\n}\n\nstatic uint64_t //\nwuffs_base__pixel_swizzler__swap_rgbx_bgrx(wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 src) {\n size_t len4 = (dst.len < src.len ? dst.len : src.len) / 4;\n uint8_t* d = dst.ptr;\n uint8_t* s = src.ptr;\n\n size_t n = len4;\n while (n--) {\n uint8_t b0 = s[0];\n uint8_t b1 = s[1];\n u" + "int8_t b2 = s[2];\n uint8_t b3 = s[3];\n d[0] = b2;\n d[1] = b1;\n d[2] = b0;\n d[3] = b3;\n s += 4;\n d += 4;\n }\n return len4 * 4;\n}\n\n" + "" + - "// --------\n\nstatic wuffs_base__pixel_swizzler__func //\nwuffs_base__pixel_swizzler__prepare__y(wuffs_base__pixel_swizzler* p,\n wuffs_base__pixel_format dst_format,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src_palette,\n wuffs_base__pixel_blend blend) {\n switch (dst_format.repr) {\n case WUFFS_BASE__PIXEL_FORMAT__BGR_565:\n // TODO.\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGR:\n case WUFFS_BASE__PIXEL_FORMAT__RGB:\n // TODO.\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGRX:\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:\n case WUFFS_BASE__PIXEL_FORMAT__RGBX:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:\n return wuf" + + "// --------\n\nstatic wuffs_base__pixel_swizzler__func //\nwuffs_base__pixel_swizzler__prepare__y(wuffs_base__pixel_swizzler* p,\n wuffs_base__pixel_format dst_format,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src_palette,\n wuffs_base__pixel_blend blend) {\n switch (dst_format.repr) {\n case WUFFS_BASE__PIXEL_FORMAT__BGR_565:\n // TODO.\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGR:\n case WUFFS_BASE__PIXEL_FORMAT__RGB:\n // TODO.\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:\n case WUFFS_BASE__PIXEL_FORMAT__BGRX:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:\n case WUFFS_BASE__PIXEL_FORMAT__RGBX:\n return wuf" + "fs_base__pixel_swizzler__xxxx__y;\n }\n return NULL;\n}\n\nstatic wuffs_base__pixel_swizzler__func //\nwuffs_base__pixel_swizzler__prepare__indexed__bgra_binary(\n wuffs_base__pixel_swizzler* p,\n wuffs_base__pixel_format dst_format,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src_palette,\n wuffs_base__pixel_blend blend) {\n switch (dst_format.repr) {\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY:\n if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=\n 1024) {\n return NULL;\n }\n switch (blend) {\n case WUFFS_BASE__PIXEL_BLEND__SRC:\n return wuffs_base__pixel_swizzler__copy_1_1;\n }\n return NULL;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGR_565:\n if (wuffs_base__pixel_swizzler__squash_bgr_565_888(dst_palette,\n src_palette) != 1024) {\n " + " return NULL;\n }\n switch (blend) {\n case WUFFS_BASE__PIXEL_BLEND__SRC:\n return wuffs_base__pixel_swizzler__xx__index__src;\n }\n return NULL;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGR:\n if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=\n 1024) {\n return NULL;\n }\n switch (blend) {\n case WUFFS_BASE__PIXEL_BLEND__SRC:\n return wuffs_base__pixel_swizzler__xxx__index__src;\n case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:\n return wuffs_base__pixel_swizzler__xxx__index_binary_alpha__src_over;\n }\n return NULL;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:\n if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=\n 1024) {\n return NULL;\n }\n switch (blend) {\n case WUFFS_BASE__PIXEL_BLEND__SRC:\n return wuffs_base__pixel_swizzler__xxxx__index__sr" + "c;\n case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:\n return wuffs_base__pixel_swizzler__xxxx__index_binary_alpha__src_over;\n }\n return NULL;\n\n case WUFFS_BASE__PIXEL_FORMAT__RGB:\n if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(dst_palette,\n src_palette) != 1024) {\n return NULL;\n }\n switch (blend) {\n case WUFFS_BASE__PIXEL_BLEND__SRC:\n return wuffs_base__pixel_swizzler__xxx__index__src;\n case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:\n return wuffs_base__pixel_swizzler__xxx__index_binary_alpha__src_over;\n }\n return NULL;\n\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:\n if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(dst_palette,\n src_palette) != 1024) {\n return NULL;\n }\n switch (blend) {\n case WUFFS_BASE__P" + - "IXEL_BLEND__SRC:\n return wuffs_base__pixel_swizzler__xxxx__index__src;\n case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:\n return wuffs_base__pixel_swizzler__xxxx__index_binary_alpha__src_over;\n }\n return NULL;\n }\n return NULL;\n}\n\nstatic wuffs_base__pixel_swizzler__func //\nwuffs_base__pixel_swizzler__prepare__bgr(wuffs_base__pixel_swizzler* p,\n wuffs_base__pixel_format dst_format,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src_palette,\n wuffs_base__pixel_blend blend) {\n switch (dst_format.repr) {\n case WUFFS_BASE__PIXEL_FORMAT__BGR_565:\n // TODO.\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGR:\n case WUFFS_BASE__PIXEL_FORMAT__RGB:\n // TODO.\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGRX:\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMU" + - "L:\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:\n return wuffs_base__pixel_swizzler__xxxx__xxx;\n\n case WUFFS_BASE__PIXEL_FORMAT__RGBX:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:\n // TODO.\n break;\n }\n return NULL;\n}\n\nstatic wuffs_base__pixel_swizzler__func //\nwuffs_base__pixel_swizzler__prepare__bgra_nonpremul(\n wuffs_base__pixel_swizzler* p,\n wuffs_base__pixel_format dst_format,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src_palette,\n wuffs_base__pixel_blend blend) {\n switch (dst_format.repr) {\n case WUFFS_BASE__PIXEL_FORMAT__BGR_565:\n // TODO.\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGR:\n case WUFFS_BASE__PIXEL_FORMAT__RGB:\n // TODO.\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGRX:\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:\n switch (blend) {\n case WUFFS_BASE__PIXEL_BLEND__SRC:\n return wuffs_base" + - "__pixel_swizzler__copy_4_4;\n }\n return NULL;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:\n switch (blend) {\n case WUFFS_BASE__PIXEL_BLEND__SRC:\n return wuffs_base__pixel_swizzler__bgra_premul__bgra_nonpremul__src;\n case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:\n return wuffs_base__pixel_swizzler__bgra_premul__bgra_nonpremul__src_over;\n }\n return NULL;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:\n // TODO.\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__RGBX:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:\n // TODO.\n break;\n }\n return NULL;\n}\n\n" + + "IXEL_BLEND__SRC:\n return wuffs_base__pixel_swizzler__xxxx__index__src;\n case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:\n return wuffs_base__pixel_swizzler__xxxx__index_binary_alpha__src_over;\n }\n return NULL;\n }\n return NULL;\n}\n\nstatic wuffs_base__pixel_swizzler__func //\nwuffs_base__pixel_swizzler__prepare__bgr(wuffs_base__pixel_swizzler* p,\n wuffs_base__pixel_format dst_format,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src_palette,\n wuffs_base__pixel_blend blend) {\n switch (dst_format.repr) {\n case WUFFS_BASE__PIXEL_FORMAT__BGR_565:\n // TODO.\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGR:\n case WUFFS_BASE__PIXEL_FORMAT__RGB:\n // TODO.\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__BGR" + + "A_BINARY:\n case WUFFS_BASE__PIXEL_FORMAT__BGRX:\n return wuffs_base__pixel_swizzler__xxxx__xxx;\n\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:\n case WUFFS_BASE__PIXEL_FORMAT__RGBX:\n // TODO.\n break;\n }\n return NULL;\n}\n\nstatic wuffs_base__pixel_swizzler__func //\nwuffs_base__pixel_swizzler__prepare__bgra_nonpremul(\n wuffs_base__pixel_swizzler* p,\n wuffs_base__pixel_format dst_format,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src_palette,\n wuffs_base__pixel_blend blend) {\n switch (dst_format.repr) {\n case WUFFS_BASE__PIXEL_FORMAT__BGR_565:\n // TODO.\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGR:\n case WUFFS_BASE__PIXEL_FORMAT__RGB:\n // TODO.\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__BGRX:\n switch (blend) {\n case WUFFS_BASE__PIXEL_BLEND__SRC:\n return wuffs_base" + + "__pixel_swizzler__copy_4_4;\n }\n return NULL;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:\n switch (blend) {\n case WUFFS_BASE__PIXEL_BLEND__SRC:\n return wuffs_base__pixel_swizzler__bgra_premul__bgra_nonpremul__src;\n case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:\n return wuffs_base__pixel_swizzler__bgra_premul__bgra_nonpremul__src_over;\n }\n return NULL;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:\n // TODO.\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:\n case WUFFS_BASE__PIXEL_FORMAT__RGBX:\n // TODO.\n break;\n }\n return NULL;\n}\n\n" + "" + "// --------\n\nwuffs_base__status //\nwuffs_base__pixel_swizzler__prepare(wuffs_base__pixel_swizzler* p,\n wuffs_base__pixel_format dst_format,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__pixel_format src_format,\n wuffs_base__slice_u8 src_palette,\n wuffs_base__pixel_blend blend) {\n if (!p) {\n return wuffs_base__make_status(wuffs_base__error__bad_receiver);\n }\n\n // TODO: support many more formats.\n\n wuffs_base__pixel_swizzler__func func = NULL;\n\n switch (src_format.repr) {\n case WUFFS_BASE__PIXEL_FORMAT__Y:\n func = wuffs_base__pixel_swizzler__prepare__y(p, dst_format, dst_palette,\n src_palette, blend);\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY:\n func = wuffs_base__pixel_swizzler__prepare__indexed__bgra_binary(\n p, dst_format, dst_" + "palette, src_palette, blend);\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGR:\n func = wuffs_base__pixel_swizzler__prepare__bgr(\n p, dst_format, dst_palette, src_palette, blend);\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:\n func = wuffs_base__pixel_swizzler__prepare__bgra_nonpremul(\n p, dst_format, dst_palette, src_palette, blend);\n break;\n }\n\n p->private_impl.func = func;\n return wuffs_base__make_status(\n func ? NULL : wuffs_base__error__unsupported_pixel_swizzler_option);\n}\n\nuint64_t //\nwuffs_base__pixel_swizzler__swizzle_interleaved(\n const wuffs_base__pixel_swizzler* p,\n wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src) {\n if (p && p->private_impl.func) {\n return (*p->private_impl.func)(dst, dst_palette, src);\n }\n return 0;\n}\n" + @@ -232,11 +232,14 @@ const baseImagePublicH = "" + "" + "// --------\n\ntypedef uint8_t wuffs_base__pixel_blend;\n\n// wuffs_base__pixel_blend encodes how to blend source and destination pixels,\n// accounting for transparency. It encompasses the Porter-Duff compositing\n// operators as well as the other blending modes defined by PDF.\n//\n// TODO: implement the other modes.\n#define WUFFS_BASE__PIXEL_BLEND__SRC ((wuffs_base__pixel_blend)0)\n#define WUFFS_BASE__PIXEL_BLEND__SRC_OVER ((wuffs_base__pixel_blend)1)\n\n" + "" + - "// --------\n\n// wuffs_base__pixel_format encodes the format of the bytes that constitute an\n// image frame's pixel data.\n//\n// See https://github.com/google/wuffs/blob/master/doc/note/pixel-formats.md\n//\n// Do not manipulate its bits directly; they are private implementation\n// details. Use methods such as wuffs_base__pixel_format__num_planes instead.\ntypedef struct {\n uint32_t repr;\n\n#ifdef __cplusplus\n inline bool is_valid() const;\n inline uint32_t bits_per_pixel() const;\n inline bool is_indexed() const;\n inline bool is_interleaved() const;\n inline bool is_planar() const;\n inline uint32_t num_planes() const;\n#endif // __cplusplus\n\n} wuffs_base__pixel_format;\n\nstatic inline wuffs_base__pixel_format //\nwuffs_base__make_pixel_format(uint32_t repr) {\n wuffs_base__pixel_format f;\n f.repr = repr;\n return f;\n}\n\n // Common 8-bit-depth pixel formats. This list is not exhaustive; not all\n // valid wuffs_base__pixel_format values are present.\n\n#define WUFFS_BASE__PIXEL_FORMAT__INVALID 0x00000000\n\n#define" + - " WUFFS_BASE__PIXEL_FORMAT__A 0x02000008\n\n#define WUFFS_BASE__PIXEL_FORMAT__Y 0x10000008\n#define WUFFS_BASE__PIXEL_FORMAT__YA_NONPREMUL 0x15000008\n#define WUFFS_BASE__PIXEL_FORMAT__YA_PREMUL 0x16000008\n\n#define WUFFS_BASE__PIXEL_FORMAT__YCBCR 0x20020888\n#define WUFFS_BASE__PIXEL_FORMAT__YCBCRK 0x21038888\n#define WUFFS_BASE__PIXEL_FORMAT__YCBCRA_NONPREMUL 0x25038888\n\n#define WUFFS_BASE__PIXEL_FORMAT__YCOCG 0x30020888\n#define WUFFS_BASE__PIXEL_FORMAT__YCOCGK 0x31038888\n#define WUFFS_BASE__PIXEL_FORMAT__YCOCGA_NONPREMUL 0x35038888\n\n#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL 0x45040008\n#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL 0x46040008\n#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY 0x47040008\n\n#define WUFFS_BASE__PIXEL_FORMAT__BGR_565 0x40000565\n#define WUFFS_BASE__PIXEL_FORMAT__BGR 0x40000888\n#define WUFFS_BASE__PIXEL_FORMAT__BGRX 0x41008888\n#define WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL 0x45008888\n#define WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL 0x46008888\n#define WUFFS_BASE_" + - "_PIXEL_FORMAT__BGRA_BINARY 0x47008888\n\n#define WUFFS_BASE__PIXEL_FORMAT__RGB 0x50000888\n#define WUFFS_BASE__PIXEL_FORMAT__RGBX 0x51008888\n#define WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL 0x55008888\n#define WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL 0x56008888\n#define WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY 0x57008888\n\n#define WUFFS_BASE__PIXEL_FORMAT__CMY 0x60020888\n#define WUFFS_BASE__PIXEL_FORMAT__CMYK 0x61038888\n\nextern const uint32_t wuffs_base__pixel_format__bits_per_channel[16];\n\nstatic inline bool //\nwuffs_base__pixel_format__is_valid(const wuffs_base__pixel_format* f) {\n return f->repr != 0;\n}\n\n// wuffs_base__pixel_format__bits_per_pixel returns the number of bits per\n// pixel for interleaved pixel formats, and returns 0 for planar pixel formats.\nstatic inline uint32_t //\nwuffs_base__pixel_format__bits_per_pixel(const wuffs_base__pixel_format* f) {\n if (((f->repr >> 16) & 0x03) != 0) {\n return 0;\n }\n return wuffs_base__pixel_format__bits_per_channel[0x0F & (f->repr >> 0)] +\n wuffs_base__pixe" + - "l_format__bits_per_channel[0x0F & (f->repr >> 4)] +\n wuffs_base__pixel_format__bits_per_channel[0x0F & (f->repr >> 8)] +\n wuffs_base__pixel_format__bits_per_channel[0x0F & (f->repr >> 12)];\n}\n\nstatic inline bool //\nwuffs_base__pixel_format__is_indexed(const wuffs_base__pixel_format* f) {\n return (f->repr >> 18) & 0x01;\n}\n\nstatic inline bool //\nwuffs_base__pixel_format__is_interleaved(const wuffs_base__pixel_format* f) {\n return ((f->repr >> 16) & 0x03) == 0;\n}\n\nstatic inline bool //\nwuffs_base__pixel_format__is_planar(const wuffs_base__pixel_format* f) {\n return ((f->repr >> 16) & 0x03) != 0;\n}\n\nstatic inline uint32_t //\nwuffs_base__pixel_format__num_planes(const wuffs_base__pixel_format* f) {\n return ((f->repr >> 16) & 0x03) + 1;\n}\n\n#define WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX 4\n\n#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__INDEX_PLANE 0\n#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE 3\n\n#ifdef __cplusplus\n\ninline bool //\nwuffs_base__pixel_format::is_valid() const {\n return" + - " wuffs_base__pixel_format__is_valid(this);\n}\n\ninline uint32_t //\nwuffs_base__pixel_format::bits_per_pixel() const {\n return wuffs_base__pixel_format__bits_per_pixel(this);\n}\n\ninline bool //\nwuffs_base__pixel_format::is_indexed() const {\n return wuffs_base__pixel_format__is_indexed(this);\n}\n\ninline bool //\nwuffs_base__pixel_format::is_interleaved() const {\n return wuffs_base__pixel_format__is_interleaved(this);\n}\n\ninline bool //\nwuffs_base__pixel_format::is_planar() const {\n return wuffs_base__pixel_format__is_planar(this);\n}\n\ninline uint32_t //\nwuffs_base__pixel_format::num_planes() const {\n return wuffs_base__pixel_format__num_planes(this);\n}\n\n#endif // __cplusplus\n\n" + + "// --------\n\n// wuffs_base__pixel_alpha_transparency is a pixel format's alpha channel\n// model. It is a property of the pixel format in general, not of a specific\n// pixel. An RGBA pixel format (with alpha) can still have fully opaque pixels.\ntypedef uint32_t wuffs_base__pixel_alpha_transparency;\n\n#define WUFFS_BASE__PIXEL_ALPHA_TRANSPARENCY__OPAQUE 0\n#define WUFFS_BASE__PIXEL_ALPHA_TRANSPARENCY__NON_PREMULTIPLIED_ALPHA 1\n#define WUFFS_BASE__PIXEL_ALPHA_TRANSPARENCY__PREMULTIPLIED_ALPHA 2\n#define WUFFS_BASE__PIXEL_ALPHA_TRANSPARENCY__BINARY_ALPHA 3\n\n" + + "" + + "// --------\n\n#define WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX 4\n\n#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__INDEX_PLANE 0\n#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE 3\n\n// wuffs_base__pixel_format encodes the format of the bytes that constitute an\n// image frame's pixel data.\n//\n// See https://github.com/google/wuffs/blob/master/doc/note/pixel-formats.md\n//\n// Do not manipulate its bits directly; they are private implementation\n// details. Use methods such as wuffs_base__pixel_format__num_planes instead.\ntypedef struct {\n uint32_t repr;\n\n#ifdef __cplusplus\n inline bool is_valid() const;\n inline uint32_t bits_per_pixel() const;\n inline bool is_direct() const;\n inline bool is_indexed() const;\n inline bool is_interleaved() const;\n inline bool is_planar() const;\n inline uint32_t num_planes() const;\n inline wuffs_base__pixel_alpha_transparency transparency() const;\n#endif // __cplusplus\n\n} wuffs_base__pixel_format;\n\nstatic inline wuffs_base__pixel_format //\nwuffs_base__make_pixel_format(uint3" + + "2_t repr) {\n wuffs_base__pixel_format f;\n f.repr = repr;\n return f;\n}\n\n // Common 8-bit-depth pixel formats. This list is not exhaustive; not all\n // valid wuffs_base__pixel_format values are present.\n\n#define WUFFS_BASE__PIXEL_FORMAT__INVALID 0x00000000\n\n#define WUFFS_BASE__PIXEL_FORMAT__A 0x02000008\n\n#define WUFFS_BASE__PIXEL_FORMAT__Y 0x20000008\n#define WUFFS_BASE__PIXEL_FORMAT__YA_NONPREMUL 0x21000008\n#define WUFFS_BASE__PIXEL_FORMAT__YA_PREMUL 0x22000008\n\n#define WUFFS_BASE__PIXEL_FORMAT__YCBCR 0x40020888\n#define WUFFS_BASE__PIXEL_FORMAT__YCBCRA_NONPREMUL 0x41038888\n#define WUFFS_BASE__PIXEL_FORMAT__YCBCRK 0x50038888\n\n#define WUFFS_BASE__PIXEL_FORMAT__YCOCG 0x60020888\n#define WUFFS_BASE__PIXEL_FORMAT__YCOCGA_NONPREMUL 0x61038888\n#define WUFFS_BASE__PIXEL_FORMAT__YCOCGK 0x70038888\n\n#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL 0x81040008\n#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL 0x82040008\n#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY 0x83040008\n\n#define WUFFS_BASE__" + + "PIXEL_FORMAT__BGR_565 0x80000565\n#define WUFFS_BASE__PIXEL_FORMAT__BGR 0x80000888\n#define WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL 0x81008888\n#define WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL 0x82008888\n#define WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY 0x83008888\n#define WUFFS_BASE__PIXEL_FORMAT__BGRX 0x90008888\n\n#define WUFFS_BASE__PIXEL_FORMAT__RGB 0xA0000888\n#define WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL 0xA1008888\n#define WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL 0xA2008888\n#define WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY 0xA3008888\n#define WUFFS_BASE__PIXEL_FORMAT__RGBX 0xB0008888\n\n#define WUFFS_BASE__PIXEL_FORMAT__CMY 0xC0020888\n#define WUFFS_BASE__PIXEL_FORMAT__CMYK 0xD0038888\n\nextern const uint32_t wuffs_base__pixel_format__bits_per_channel[16];\n\nstatic inline bool //\nwuffs_base__pixel_format__is_valid(const wuffs_base__pixel_format* f) {\n return f->repr != 0;\n}\n\n// wuffs_base__pixel_format__bits_per_pixel returns the number of bits per\n// pixel for interleaved pixel formats, and returns 0 for planar pixel forma" + + "ts.\nstatic inline uint32_t //\nwuffs_base__pixel_format__bits_per_pixel(const wuffs_base__pixel_format* f) {\n if (((f->repr >> 16) & 0x03) != 0) {\n return 0;\n }\n return wuffs_base__pixel_format__bits_per_channel[0x0F & (f->repr >> 0)] +\n wuffs_base__pixel_format__bits_per_channel[0x0F & (f->repr >> 4)] +\n wuffs_base__pixel_format__bits_per_channel[0x0F & (f->repr >> 8)] +\n wuffs_base__pixel_format__bits_per_channel[0x0F & (f->repr >> 12)];\n}\n\nstatic inline bool //\nwuffs_base__pixel_format__is_direct(const wuffs_base__pixel_format* f) {\n return ((f->repr >> 18) & 0x01) == 0;\n}\n\nstatic inline bool //\nwuffs_base__pixel_format__is_indexed(const wuffs_base__pixel_format* f) {\n return ((f->repr >> 18) & 0x01) != 0;\n}\n\nstatic inline bool //\nwuffs_base__pixel_format__is_interleaved(const wuffs_base__pixel_format* f) {\n return ((f->repr >> 16) & 0x03) == 0;\n}\n\nstatic inline bool //\nwuffs_base__pixel_format__is_planar(const wuffs_base__pixel_format* f) {\n return ((f->repr >> 16) & " + + "0x03) != 0;\n}\n\nstatic inline uint32_t //\nwuffs_base__pixel_format__num_planes(const wuffs_base__pixel_format* f) {\n return ((f->repr >> 16) & 0x03) + 1;\n}\n\nstatic inline wuffs_base__pixel_alpha_transparency //\nwuffs_base__pixel_format__transparency(const wuffs_base__pixel_format* f) {\n return (wuffs_base__pixel_alpha_transparency)((f->repr >> 24) & 0x03);\n}\n\n#ifdef __cplusplus\n\ninline bool //\nwuffs_base__pixel_format::is_valid() const {\n return wuffs_base__pixel_format__is_valid(this);\n}\n\ninline uint32_t //\nwuffs_base__pixel_format::bits_per_pixel() const {\n return wuffs_base__pixel_format__bits_per_pixel(this);\n}\n\ninline bool //\nwuffs_base__pixel_format::is_direct() const {\n return wuffs_base__pixel_format__is_direct(this);\n}\n\ninline bool //\nwuffs_base__pixel_format::is_indexed() const {\n return wuffs_base__pixel_format__is_indexed(this);\n}\n\ninline bool //\nwuffs_base__pixel_format::is_interleaved() const {\n return wuffs_base__pixel_format__is_interleaved(this);\n}\n\ninline bool //\nwuffs_base__pi" + + "xel_format::is_planar() const {\n return wuffs_base__pixel_format__is_planar(this);\n}\n\ninline uint32_t //\nwuffs_base__pixel_format::num_planes() const {\n return wuffs_base__pixel_format__num_planes(this);\n}\n\ninline wuffs_base__pixel_alpha_transparency //\nwuffs_base__pixel_format::transparency() const {\n return wuffs_base__pixel_format__transparency(this);\n}\n\n#endif // __cplusplus\n\n" + "" + "// --------\n\n// wuffs_base__pixel_subsampling encodes whether sample values cover one pixel\n// or cover multiple pixels.\n//\n// See https://github.com/google/wuffs/blob/master/doc/note/pixel-subsampling.md\n//\n// Do not manipulate its bits directly; they are private implementation\n// details. Use methods such as wuffs_base__pixel_subsampling__bias_x instead.\ntypedef struct {\n uint32_t repr;\n\n#ifdef __cplusplus\n inline uint32_t bias_x(uint32_t plane) const;\n inline uint32_t denominator_x(uint32_t plane) const;\n inline uint32_t bias_y(uint32_t plane) const;\n inline uint32_t denominator_y(uint32_t plane) const;\n#endif // __cplusplus\n\n} wuffs_base__pixel_subsampling;\n\nstatic inline wuffs_base__pixel_subsampling //\nwuffs_base__make_pixel_subsampling(uint32_t repr) {\n wuffs_base__pixel_subsampling s;\n s.repr = repr;\n return s;\n}\n\n#define WUFFS_BASE__PIXEL_SUBSAMPLING__NONE 0x00000000\n\n#define WUFFS_BASE__PIXEL_SUBSAMPLING__444 0x000000\n#define WUFFS_BASE__PIXEL_SUBSAMPLING__440 0x010100\n#define WUFFS_BASE__" + "PIXEL_SUBSAMPLING__422 0x101000\n#define WUFFS_BASE__PIXEL_SUBSAMPLING__420 0x111100\n#define WUFFS_BASE__PIXEL_SUBSAMPLING__411 0x303000\n#define WUFFS_BASE__PIXEL_SUBSAMPLING__410 0x313100\n\nstatic inline uint32_t //\nwuffs_base__pixel_subsampling__bias_x(const wuffs_base__pixel_subsampling* s,\n uint32_t plane) {\n uint32_t shift = ((plane & 0x03) * 8) + 6;\n return (s->repr >> shift) & 0x03;\n}\n\nstatic inline uint32_t //\nwuffs_base__pixel_subsampling__denominator_x(\n const wuffs_base__pixel_subsampling* s,\n uint32_t plane) {\n uint32_t shift = ((plane & 0x03) * 8) + 4;\n return ((s->repr >> shift) & 0x03) + 1;\n}\n\nstatic inline uint32_t //\nwuffs_base__pixel_subsampling__bias_y(const wuffs_base__pixel_subsampling* s,\n uint32_t plane) {\n uint32_t shift = ((plane & 0x03) * 8) + 2;\n return (s->repr >> shift) & 0x03;\n}\n\nstatic inline uint32_t //\nwuffs_base__pixel_subsampling__denominator_y(\n const wuffs_base__pixel_subsampling* s," + diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 61fc598a..d86140ef 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -2569,6 +2569,23 @@ typedef uint8_t wuffs_base__pixel_blend; // -------- +// wuffs_base__pixel_alpha_transparency is a pixel format's alpha channel +// model. It is a property of the pixel format in general, not of a specific +// pixel. An RGBA pixel format (with alpha) can still have fully opaque pixels. +typedef uint32_t wuffs_base__pixel_alpha_transparency; + +#define WUFFS_BASE__PIXEL_ALPHA_TRANSPARENCY__OPAQUE 0 +#define WUFFS_BASE__PIXEL_ALPHA_TRANSPARENCY__NON_PREMULTIPLIED_ALPHA 1 +#define WUFFS_BASE__PIXEL_ALPHA_TRANSPARENCY__PREMULTIPLIED_ALPHA 2 +#define WUFFS_BASE__PIXEL_ALPHA_TRANSPARENCY__BINARY_ALPHA 3 + +// -------- + +#define WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX 4 + +#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__INDEX_PLANE 0 +#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE 3 + // wuffs_base__pixel_format encodes the format of the bytes that constitute an // image frame's pixel data. // @@ -2582,10 +2599,12 @@ typedef struct { #ifdef __cplusplus inline bool is_valid() const; inline uint32_t bits_per_pixel() const; + inline bool is_direct() const; inline bool is_indexed() const; inline bool is_interleaved() const; inline bool is_planar() const; inline uint32_t num_planes() const; + inline wuffs_base__pixel_alpha_transparency transparency() const; #endif // __cplusplus } wuffs_base__pixel_format; @@ -2604,37 +2623,37 @@ wuffs_base__make_pixel_format(uint32_t repr) { #define WUFFS_BASE__PIXEL_FORMAT__A 0x02000008 -#define WUFFS_BASE__PIXEL_FORMAT__Y 0x10000008 -#define WUFFS_BASE__PIXEL_FORMAT__YA_NONPREMUL 0x15000008 -#define WUFFS_BASE__PIXEL_FORMAT__YA_PREMUL 0x16000008 +#define WUFFS_BASE__PIXEL_FORMAT__Y 0x20000008 +#define WUFFS_BASE__PIXEL_FORMAT__YA_NONPREMUL 0x21000008 +#define WUFFS_BASE__PIXEL_FORMAT__YA_PREMUL 0x22000008 -#define WUFFS_BASE__PIXEL_FORMAT__YCBCR 0x20020888 -#define WUFFS_BASE__PIXEL_FORMAT__YCBCRK 0x21038888 -#define WUFFS_BASE__PIXEL_FORMAT__YCBCRA_NONPREMUL 0x25038888 +#define WUFFS_BASE__PIXEL_FORMAT__YCBCR 0x40020888 +#define WUFFS_BASE__PIXEL_FORMAT__YCBCRA_NONPREMUL 0x41038888 +#define WUFFS_BASE__PIXEL_FORMAT__YCBCRK 0x50038888 -#define WUFFS_BASE__PIXEL_FORMAT__YCOCG 0x30020888 -#define WUFFS_BASE__PIXEL_FORMAT__YCOCGK 0x31038888 -#define WUFFS_BASE__PIXEL_FORMAT__YCOCGA_NONPREMUL 0x35038888 +#define WUFFS_BASE__PIXEL_FORMAT__YCOCG 0x60020888 +#define WUFFS_BASE__PIXEL_FORMAT__YCOCGA_NONPREMUL 0x61038888 +#define WUFFS_BASE__PIXEL_FORMAT__YCOCGK 0x70038888 -#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL 0x45040008 -#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL 0x46040008 -#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY 0x47040008 +#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL 0x81040008 +#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL 0x82040008 +#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY 0x83040008 -#define WUFFS_BASE__PIXEL_FORMAT__BGR_565 0x40000565 -#define WUFFS_BASE__PIXEL_FORMAT__BGR 0x40000888 -#define WUFFS_BASE__PIXEL_FORMAT__BGRX 0x41008888 -#define WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL 0x45008888 -#define WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL 0x46008888 -#define WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY 0x47008888 +#define WUFFS_BASE__PIXEL_FORMAT__BGR_565 0x80000565 +#define WUFFS_BASE__PIXEL_FORMAT__BGR 0x80000888 +#define WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL 0x81008888 +#define WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL 0x82008888 +#define WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY 0x83008888 +#define WUFFS_BASE__PIXEL_FORMAT__BGRX 0x90008888 -#define WUFFS_BASE__PIXEL_FORMAT__RGB 0x50000888 -#define WUFFS_BASE__PIXEL_FORMAT__RGBX 0x51008888 -#define WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL 0x55008888 -#define WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL 0x56008888 -#define WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY 0x57008888 +#define WUFFS_BASE__PIXEL_FORMAT__RGB 0xA0000888 +#define WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL 0xA1008888 +#define WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL 0xA2008888 +#define WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY 0xA3008888 +#define WUFFS_BASE__PIXEL_FORMAT__RGBX 0xB0008888 -#define WUFFS_BASE__PIXEL_FORMAT__CMY 0x60020888 -#define WUFFS_BASE__PIXEL_FORMAT__CMYK 0x61038888 +#define WUFFS_BASE__PIXEL_FORMAT__CMY 0xC0020888 +#define WUFFS_BASE__PIXEL_FORMAT__CMYK 0xD0038888 extern const uint32_t wuffs_base__pixel_format__bits_per_channel[16]; @@ -2656,9 +2675,14 @@ wuffs_base__pixel_format__bits_per_pixel(const wuffs_base__pixel_format* f) { wuffs_base__pixel_format__bits_per_channel[0x0F & (f->repr >> 12)]; } +static inline bool // +wuffs_base__pixel_format__is_direct(const wuffs_base__pixel_format* f) { + return ((f->repr >> 18) & 0x01) == 0; +} + static inline bool // wuffs_base__pixel_format__is_indexed(const wuffs_base__pixel_format* f) { - return (f->repr >> 18) & 0x01; + return ((f->repr >> 18) & 0x01) != 0; } static inline bool // @@ -2676,10 +2700,10 @@ wuffs_base__pixel_format__num_planes(const wuffs_base__pixel_format* f) { return ((f->repr >> 16) & 0x03) + 1; } -#define WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX 4 - -#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__INDEX_PLANE 0 -#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE 3 +static inline wuffs_base__pixel_alpha_transparency // +wuffs_base__pixel_format__transparency(const wuffs_base__pixel_format* f) { + return (wuffs_base__pixel_alpha_transparency)((f->repr >> 24) & 0x03); +} #ifdef __cplusplus @@ -2693,6 +2717,11 @@ wuffs_base__pixel_format::bits_per_pixel() const { return wuffs_base__pixel_format__bits_per_pixel(this); } +inline bool // +wuffs_base__pixel_format::is_direct() const { + return wuffs_base__pixel_format__is_direct(this); +} + inline bool // wuffs_base__pixel_format::is_indexed() const { return wuffs_base__pixel_format__is_indexed(this); @@ -2713,6 +2742,11 @@ wuffs_base__pixel_format::num_planes() const { return wuffs_base__pixel_format__num_planes(this); } +inline wuffs_base__pixel_alpha_transparency // +wuffs_base__pixel_format::transparency() const { + return wuffs_base__pixel_format__transparency(this); +} + #endif // __cplusplus // -------- @@ -8495,12 +8529,10 @@ wuffs_base__pixel_buffer__color_u32_at(const wuffs_base__pixel_buffer* pb, switch (pb->pixcfg.private_impl.pixfmt.repr) { case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL: - WUFFS_BASE__FALLTHROUGH; case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY: return wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x))); case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL: - WUFFS_BASE__FALLTHROUGH; case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY: { uint8_t* palette = pb->private_impl.planes[3].ptr; return wuffs_base__load_u32le__no_bounds_check(palette + @@ -8533,29 +8565,28 @@ wuffs_base__pixel_buffer__color_u32_at(const wuffs_base__pixel_buffer* pb, case WUFFS_BASE__PIXEL_FORMAT__BGR: return 0xFF000000 | wuffs_base__load_u24le__no_bounds_check(row + (3 * ((size_t)x))); - case WUFFS_BASE__PIXEL_FORMAT__BGRX: - return 0xFF000000 | - wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x))); case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL: return wuffs_base__premul_u32_axxx( wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x)))); + case WUFFS_BASE__PIXEL_FORMAT__BGRX: + return 0xFF000000 | + wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x))); case WUFFS_BASE__PIXEL_FORMAT__RGB: return wuffs_base__swap_u32_argb_abgr( 0xFF000000 | wuffs_base__load_u24le__no_bounds_check(row + (3 * ((size_t)x)))); - case WUFFS_BASE__PIXEL_FORMAT__RGBX: - return wuffs_base__swap_u32_argb_abgr( - 0xFF000000 | - wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x)))); case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL: return wuffs_base__swap_u32_argb_abgr(wuffs_base__premul_u32_axxx( wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x))))); case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL: - WUFFS_BASE__FALLTHROUGH; case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY: return wuffs_base__swap_u32_argb_abgr( wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x)))); + case WUFFS_BASE__PIXEL_FORMAT__RGBX: + return wuffs_base__swap_u32_argb_abgr( + 0xFF000000 | + wuffs_base__load_u32le__no_bounds_check(row + (4 * ((size_t)x)))); default: // TODO: support more formats. @@ -8589,7 +8620,6 @@ wuffs_base__pixel_buffer__set_color_u32_at( switch (pb->pixcfg.private_impl.pixfmt.repr) { case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL: - WUFFS_BASE__FALLTHROUGH; case WUFFS_BASE__PIXEL_FORMAT__BGRX: wuffs_base__store_u32le__no_bounds_check(row + (4 * ((size_t)x)), color); break; @@ -9093,14 +9123,14 @@ wuffs_base__pixel_swizzler__prepare__y(wuffs_base__pixel_swizzler* p, // TODO. break; - case WUFFS_BASE__PIXEL_FORMAT__BGRX: case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL: case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL: case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY: - case WUFFS_BASE__PIXEL_FORMAT__RGBX: + case WUFFS_BASE__PIXEL_FORMAT__BGRX: case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL: case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL: case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY: + case WUFFS_BASE__PIXEL_FORMAT__RGBX: return wuffs_base__pixel_swizzler__xxxx__y; } return NULL; @@ -9213,16 +9243,16 @@ wuffs_base__pixel_swizzler__prepare__bgr(wuffs_base__pixel_swizzler* p, // TODO. break; - case WUFFS_BASE__PIXEL_FORMAT__BGRX: case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL: case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL: case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY: + case WUFFS_BASE__PIXEL_FORMAT__BGRX: return wuffs_base__pixel_swizzler__xxxx__xxx; - case WUFFS_BASE__PIXEL_FORMAT__RGBX: case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL: case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL: case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY: + case WUFFS_BASE__PIXEL_FORMAT__RGBX: // TODO. break; } @@ -9246,8 +9276,8 @@ wuffs_base__pixel_swizzler__prepare__bgra_nonpremul( // TODO. break; - case WUFFS_BASE__PIXEL_FORMAT__BGRX: case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL: + case WUFFS_BASE__PIXEL_FORMAT__BGRX: switch (blend) { case WUFFS_BASE__PIXEL_BLEND__SRC: return wuffs_base__pixel_swizzler__copy_4_4; @@ -9267,10 +9297,10 @@ wuffs_base__pixel_swizzler__prepare__bgra_nonpremul( // TODO. break; - case WUFFS_BASE__PIXEL_FORMAT__RGBX: case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL: case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL: case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY: + case WUFFS_BASE__PIXEL_FORMAT__RGBX: // TODO. break; } @@ -11757,14 +11787,14 @@ wuffs_bmp__decoder__decode_image_config(wuffs_bmp__decoder* self, ((((((uint64_t)(self->private_impl.f_width)) * 3) + 3) >> 2) << 2); self->private_impl.f_pad_per_row = (self->private_impl.f_width & 3); self->private_impl.f_pixfmt = - wuffs_base__utility__make_pixel_format(1073744008); + wuffs_base__utility__make_pixel_format(2147485832); } else if (v_bits_per_pixel == 32) { self->private_impl.f_bits_per_pixel = 32; self->private_impl.f_bytes_per_row = (((uint64_t)(self->private_impl.f_width)) * 4); self->private_impl.f_pad_per_row = 0; self->private_impl.f_pixfmt = - wuffs_base__utility__make_pixel_format(1157662856); + wuffs_base__utility__make_pixel_format(2164295816); } else { status = wuffs_base__make_status(wuffs_bmp__error__unsupported_bmp_file); goto exit; @@ -11966,7 +11996,7 @@ wuffs_bmp__decoder__decode_image_config(wuffs_bmp__decoder* self, a_src->meta.pos, ((uint64_t)(iop_a_src - io0_a_src))); if (a_dst != NULL) { wuffs_base__image_config__set( - a_dst, 1157662856, 0, self->private_impl.f_width, + a_dst, 2164295816, 0, self->private_impl.f_width, self->private_impl.f_height, self->private_impl.f_frame_config_io_position, true); } @@ -16751,7 +16781,7 @@ wuffs_gif__config_decoder__decode_image_config(wuffs_gif__config_decoder* self, } if (a_dst != NULL) { wuffs_base__image_config__set( - a_dst, 1191444488, 0, self->private_impl.f_width, + a_dst, 2198077448, 0, self->private_impl.f_width, self->private_impl.f_height, self->private_impl.f_frame_config_io_position, v_ffio); } @@ -18579,7 +18609,7 @@ wuffs_gif__decoder__decode_image_config(wuffs_gif__decoder* self, } if (a_dst != NULL) { wuffs_base__image_config__set( - a_dst, 1191444488, 0, self->private_impl.f_width, + a_dst, 2198077448, 0, self->private_impl.f_width, self->private_impl.f_height, self->private_impl.f_frame_config_io_position, v_ffio); } @@ -20503,7 +20533,7 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, v_status = wuffs_base__pixel_swizzler__prepare( &self->private_impl.f_swizzler, wuffs_base__pixel_buffer__pixel_format(a_dst), v_dst_palette, - wuffs_base__utility__make_pixel_format(1191444488), + wuffs_base__utility__make_pixel_format(2198077448), wuffs_base__make_slice_u8( self->private_data.f_palettes[v_which_palette], 1024), a_blend); @@ -24046,7 +24076,7 @@ wuffs_wbmp__decoder__decode_image_config(wuffs_wbmp__decoder* self, a_src->meta.pos, ((uint64_t)(iop_a_src - io0_a_src))); if (a_dst != NULL) { wuffs_base__image_config__set( - a_dst, 1191444488, 0, self->private_impl.f_width, + a_dst, 2198077448, 0, self->private_impl.f_width, self->private_impl.f_height, self->private_impl.f_frame_config_io_position, true); } @@ -24276,7 +24306,7 @@ wuffs_wbmp__decoder__decode_frame(wuffs_wbmp__decoder* self, &self->private_impl.f_swizzler, wuffs_base__pixel_buffer__pixel_format(a_dst), wuffs_base__pixel_buffer__palette(a_dst), - wuffs_base__utility__make_pixel_format(268435464), + wuffs_base__utility__make_pixel_format(536870920), wuffs_base__utility__empty_slice_u8(), a_blend); if (!wuffs_base__status__is_ok(&v_status)) { status = v_status; diff --git a/std/bmp/decode_bmp.wuffs b/std/bmp/decode_bmp.wuffs index 021ba8c8..5af01c6d 100644 --- a/std/bmp/decode_bmp.wuffs +++ b/std/bmp/decode_bmp.wuffs @@ -128,14 +128,14 @@ pub func decoder.decode_image_config?(dst: nptr base.image_config, src: base.io_ this.pad_per_row = this.width & 3 // TODO: a Wuffs (not just C) name for the // WUFFS_BASE__PIXEL_FORMAT__BGR magic pixfmt constant. - this.pixfmt = this.util.make_pixel_format(repr: 0x4000_0888) + this.pixfmt = this.util.make_pixel_format(repr: 0x8000_0888) } else if bits_per_pixel == 32 { this.bits_per_pixel = 32 this.bytes_per_row = (this.width as base.u64) * 4 this.pad_per_row = 0 // TODO: a Wuffs (not just C) name for the // WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL magic pixfmt constant. - this.pixfmt = this.util.make_pixel_format(repr: 0x4500_8888) + this.pixfmt = this.util.make_pixel_format(repr: 0x8100_8888) } else { // TODO: support other bits_per_pixel's. return "#unsupported BMP file" @@ -181,7 +181,7 @@ pub func decoder.decode_image_config?(dst: nptr base.image_config, src: base.io_ // TODO: a Wuffs (not just C) name for the // WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL magic pixfmt constant. args.dst.set!( - pixfmt: 0x4500_8888, // TODO: this.pixfmt instead? + pixfmt: 0x8100_8888, // TODO: this.pixfmt instead? pixsub: 0, width: this.width, height: this.height, diff --git a/std/gif/decode_config.wuffs b/std/gif/decode_config.wuffs index 6fa32a9f..b61ebae0 100644 --- a/std/gif/decode_config.wuffs +++ b/std/gif/decode_config.wuffs @@ -150,7 +150,7 @@ pub func config_decoder.decode_image_config?(dst: nptr base.image_config, src: b // TODO: a Wuffs (not just C) name for the // WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY magic pixfmt constant. args.dst.set!( - pixfmt: 0x4704_0008, + pixfmt: 0x8304_0008, pixsub: 0, width: this.width, height: this.height, diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index 375bde48..87d779fc 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -189,7 +189,7 @@ pub func decoder.decode_image_config?(dst: nptr base.image_config, src: base.io_ // TODO: a Wuffs (not just C) name for the // WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY magic pixfmt constant. args.dst.set!( - pixfmt: 0x4704_0008, + pixfmt: 0x8304_0008, pixsub: 0, width: this.width, height: this.height, @@ -873,7 +873,7 @@ pri func decoder.decode_id_part1?(dst: ptr base.pixel_buffer, src: base.io_reade status = this.swizzler.prepare!( dst_pixfmt: args.dst.pixel_format(), dst_palette: dst_palette, - src_pixfmt: this.util.make_pixel_format(repr: 0x4704_0008), + src_pixfmt: this.util.make_pixel_format(repr: 0x8304_0008), src_palette: this.palettes[which_palette][..], blend: args.blend) if not status.is_ok() { diff --git a/std/wbmp/decode_wbmp.wuffs b/std/wbmp/decode_wbmp.wuffs index 35c371e0..b91ac9ce 100644 --- a/std/wbmp/decode_wbmp.wuffs +++ b/std/wbmp/decode_wbmp.wuffs @@ -85,7 +85,7 @@ pub func decoder.decode_image_config?(dst: nptr base.image_config, src: base.io_ // TODO: a Wuffs (not just C) name for the // WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY magic pixfmt constant. args.dst.set!( - pixfmt: 0x4704_0008, + pixfmt: 0x8304_0008, pixsub: 0, width: this.width, height: this.height, @@ -150,7 +150,7 @@ pub func decoder.decode_frame?(dst: ptr base.pixel_buffer, src: base.io_reader, status = this.swizzler.prepare!( dst_pixfmt: args.dst.pixel_format(), dst_palette: args.dst.palette(), - src_pixfmt: this.util.make_pixel_format(repr: 0x1000_0008), + src_pixfmt: this.util.make_pixel_format(repr: 0x2000_0008), src_palette: this.util.empty_slice_u8(), blend: args.blend) if not status.is_ok() {