diff --git a/internal/cgen/base/image-public.h b/internal/cgen/base/image-public.h index 4c8b49c4..9be4ed6d 100644 --- a/internal/cgen/base/image-public.h +++ b/internal/cgen/base/image-public.h @@ -365,47 +365,51 @@ wuffs_base__make_pixel_format(uint32_t repr) { // Common 8-bit-depth pixel formats. This list is not exhaustive; not all valid // wuffs_base__pixel_format values are present. -#define WUFFS_BASE__PIXEL_FORMAT__INVALID 0x00000000 +// clang-format off -#define WUFFS_BASE__PIXEL_FORMAT__A 0x02000008 +#define WUFFS_BASE__PIXEL_FORMAT__INVALID 0x00000000 -#define WUFFS_BASE__PIXEL_FORMAT__Y 0x20000008 -#define WUFFS_BASE__PIXEL_FORMAT__Y_16LE 0x2000000B -#define WUFFS_BASE__PIXEL_FORMAT__Y_16BE 0x2010000B -#define WUFFS_BASE__PIXEL_FORMAT__YA_NONPREMUL 0x21000088 -#define WUFFS_BASE__PIXEL_FORMAT__YA_PREMUL 0x22000088 +#define WUFFS_BASE__PIXEL_FORMAT__A 0x02000008 -#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__Y 0x20000008 +#define WUFFS_BASE__PIXEL_FORMAT__Y_16LE 0x2000000B +#define WUFFS_BASE__PIXEL_FORMAT__Y_16BE 0x2010000B +#define WUFFS_BASE__PIXEL_FORMAT__YA_NONPREMUL 0x21000088 +#define WUFFS_BASE__PIXEL_FORMAT__YA_PREMUL 0x22000088 -#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__YCBCR 0x40020888 +#define WUFFS_BASE__PIXEL_FORMAT__YCBCRA_NONPREMUL 0x41038888 +#define WUFFS_BASE__PIXEL_FORMAT__YCBCRK 0x50038888 -#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__YCOCG 0x60020888 +#define WUFFS_BASE__PIXEL_FORMAT__YCOCGA_NONPREMUL 0x61038888 +#define WUFFS_BASE__PIXEL_FORMAT__YCOCGK 0x70038888 -#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_NONPREMUL_4X16LE 0x8100BBBB -#define WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL 0x82008888 -#define WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL_4X16LE 0x8200BBBB -#define WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY 0x83008888 -#define WUFFS_BASE__PIXEL_FORMAT__BGRX 0x90008888 +#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__RGB 0xA0000888 -#define WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL 0xA1008888 -#define WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL_4X16LE 0xA100BBBB -#define WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL 0xA2008888 -#define WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL_4X16LE 0xA200BBBB -#define WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY 0xA3008888 -#define WUFFS_BASE__PIXEL_FORMAT__RGBX 0xB0008888 +#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_NONPREMUL_4X16LE 0x8100BBBB +#define WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL 0x82008888 +#define WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL_4X16LE 0x8200BBBB +#define WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY 0x83008888 +#define WUFFS_BASE__PIXEL_FORMAT__BGRX 0x90008888 -#define WUFFS_BASE__PIXEL_FORMAT__CMY 0xC0020888 -#define WUFFS_BASE__PIXEL_FORMAT__CMYK 0xD0038888 +#define WUFFS_BASE__PIXEL_FORMAT__RGB 0xA0000888 +#define WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL 0xA1008888 +#define WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL_4X16LE 0xA100BBBB +#define WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL 0xA2008888 +#define WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL_4X16LE 0xA200BBBB +#define WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY 0xA3008888 +#define WUFFS_BASE__PIXEL_FORMAT__RGBX 0xB0008888 + +#define WUFFS_BASE__PIXEL_FORMAT__CMY 0xC0020888 +#define WUFFS_BASE__PIXEL_FORMAT__CMYK 0xD0038888 + +// clang-format on extern const uint32_t wuffs_private_impl__pixel_format__bits_per_channel[16]; diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 9bd7f1d3..a764d846 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -4313,47 +4313,51 @@ wuffs_base__make_pixel_format(uint32_t repr) { // Common 8-bit-depth pixel formats. This list is not exhaustive; not all valid // wuffs_base__pixel_format values are present. -#define WUFFS_BASE__PIXEL_FORMAT__INVALID 0x00000000 +// clang-format off -#define WUFFS_BASE__PIXEL_FORMAT__A 0x02000008 +#define WUFFS_BASE__PIXEL_FORMAT__INVALID 0x00000000 -#define WUFFS_BASE__PIXEL_FORMAT__Y 0x20000008 -#define WUFFS_BASE__PIXEL_FORMAT__Y_16LE 0x2000000B -#define WUFFS_BASE__PIXEL_FORMAT__Y_16BE 0x2010000B -#define WUFFS_BASE__PIXEL_FORMAT__YA_NONPREMUL 0x21000088 -#define WUFFS_BASE__PIXEL_FORMAT__YA_PREMUL 0x22000088 +#define WUFFS_BASE__PIXEL_FORMAT__A 0x02000008 -#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__Y 0x20000008 +#define WUFFS_BASE__PIXEL_FORMAT__Y_16LE 0x2000000B +#define WUFFS_BASE__PIXEL_FORMAT__Y_16BE 0x2010000B +#define WUFFS_BASE__PIXEL_FORMAT__YA_NONPREMUL 0x21000088 +#define WUFFS_BASE__PIXEL_FORMAT__YA_PREMUL 0x22000088 -#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__YCBCR 0x40020888 +#define WUFFS_BASE__PIXEL_FORMAT__YCBCRA_NONPREMUL 0x41038888 +#define WUFFS_BASE__PIXEL_FORMAT__YCBCRK 0x50038888 -#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__YCOCG 0x60020888 +#define WUFFS_BASE__PIXEL_FORMAT__YCOCGA_NONPREMUL 0x61038888 +#define WUFFS_BASE__PIXEL_FORMAT__YCOCGK 0x70038888 -#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_NONPREMUL_4X16LE 0x8100BBBB -#define WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL 0x82008888 -#define WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL_4X16LE 0x8200BBBB -#define WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY 0x83008888 -#define WUFFS_BASE__PIXEL_FORMAT__BGRX 0x90008888 +#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__RGB 0xA0000888 -#define WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL 0xA1008888 -#define WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL_4X16LE 0xA100BBBB -#define WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL 0xA2008888 -#define WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL_4X16LE 0xA200BBBB -#define WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY 0xA3008888 -#define WUFFS_BASE__PIXEL_FORMAT__RGBX 0xB0008888 +#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_NONPREMUL_4X16LE 0x8100BBBB +#define WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL 0x82008888 +#define WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL_4X16LE 0x8200BBBB +#define WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY 0x83008888 +#define WUFFS_BASE__PIXEL_FORMAT__BGRX 0x90008888 -#define WUFFS_BASE__PIXEL_FORMAT__CMY 0xC0020888 -#define WUFFS_BASE__PIXEL_FORMAT__CMYK 0xD0038888 +#define WUFFS_BASE__PIXEL_FORMAT__RGB 0xA0000888 +#define WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL 0xA1008888 +#define WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL_4X16LE 0xA100BBBB +#define WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL 0xA2008888 +#define WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL_4X16LE 0xA200BBBB +#define WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY 0xA3008888 +#define WUFFS_BASE__PIXEL_FORMAT__RGBX 0xB0008888 + +#define WUFFS_BASE__PIXEL_FORMAT__CMY 0xC0020888 +#define WUFFS_BASE__PIXEL_FORMAT__CMYK 0xD0038888 + +// clang-format on extern const uint32_t wuffs_private_impl__pixel_format__bits_per_channel[16];