From 0c9b700df0067263a5c025011f628f938a86a496 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Wed, 27 Mar 2024 16:53:19 +1100 Subject: [PATCH] base: fix PIXEL_FORMAT__YA_{NON,}PREMUL values These pixel formats have two channels (gray, alpha), not one. Updates #143 --- doc/changelog.md | 9 +++++---- internal/cgen/base/image-public.h | 4 ++-- lang/builtin/builtin.go | 4 ++-- release/c/wuffs-unsupported-snapshot.c | 4 ++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/doc/changelog.md b/doc/changelog.md index 3425e48e..9548f5c6 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -29,10 +29,11 @@ The LICENSE has changed from a single license (Apache 2) to a dual license - Changed `set_quirk_enabled!(quirk: u32, enabled: bool)` to `set_quirk!(key: u32, value: u64) status`. - Changed `wuffs_base__empty_foo` to return non-NULL ptr. -- Deprecate `std/lzw.decoder.flush`. +- Deprecated `std/lzw.decoder.flush`. +- Fixed `PIXEL_FORMAT__YA_{NON,}PREMUL` constant values. - Generated constants now default to unsigned. -- Halve the sizeof `wuffs_foo__bar::unique_ptr`. -- Remove the `std/gif -> std/lzw` dependency. +- Halved the sizeof `wuffs_foo__bar::unique_ptr`. +- Removed the `std/gif -> std/lzw` dependency. - Removed `example/bzcat`. - Set image decoder pixel width and height inclusive maximum to `0xFF_FFFF`, down from `0x7FFF_FFFF`. @@ -44,7 +45,7 @@ code (instead of writing C/C++ code that _uses_ Wuffs' standard library). - Added `io_forget_history`. - Added `slice_var as nptr array[etc] etc` conversion. - Added read-only type decorators: `roarray`, `roslice` and `rotable`. -- Ban recursive function calls. +- Banned recursive function calls. - Renamed `base` `min/max` argument from `a` to `no_more/less_than`. - Wuffs struct private data now needs a "+" between the "()" pairs. - `wuffsfmt` double-indents hanging lines and each indent is now 4 spaces (not diff --git a/internal/cgen/base/image-public.h b/internal/cgen/base/image-public.h index 9fb72945..90df48fd 100644 --- a/internal/cgen/base/image-public.h +++ b/internal/cgen/base/image-public.h @@ -352,8 +352,8 @@ wuffs_base__make_pixel_format(uint32_t repr) { #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 0x21000008 -#define WUFFS_BASE__PIXEL_FORMAT__YA_PREMUL 0x22000008 +#define WUFFS_BASE__PIXEL_FORMAT__YA_NONPREMUL 0x21000088 +#define WUFFS_BASE__PIXEL_FORMAT__YA_PREMUL 0x22000088 #define WUFFS_BASE__PIXEL_FORMAT__YCBCR 0x40020888 #define WUFFS_BASE__PIXEL_FORMAT__YCBCRA_NONPREMUL 0x41038888 diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index 5aee7984..43fa9d9e 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -115,8 +115,8 @@ var Consts = [...]struct { {t.IDU32, "0x20000008", "PIXEL_FORMAT__Y"}, {t.IDU32, "0x2000000B", "PIXEL_FORMAT__Y_16LE"}, {t.IDU32, "0x2010000B", "PIXEL_FORMAT__Y_16BE"}, - {t.IDU32, "0x21000008", "PIXEL_FORMAT__YA_NONPREMUL"}, - {t.IDU32, "0x22000008", "PIXEL_FORMAT__YA_PREMUL"}, + {t.IDU32, "0x21000088", "PIXEL_FORMAT__YA_NONPREMUL"}, + {t.IDU32, "0x22000088", "PIXEL_FORMAT__YA_PREMUL"}, {t.IDU32, "0x40020888", "PIXEL_FORMAT__YCBCR"}, {t.IDU32, "0x41038888", "PIXEL_FORMAT__YCBCRA_NONPREMUL"}, diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index cac12c9f..85003e84 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -4300,8 +4300,8 @@ wuffs_base__make_pixel_format(uint32_t repr) { #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 0x21000008 -#define WUFFS_BASE__PIXEL_FORMAT__YA_PREMUL 0x22000008 +#define WUFFS_BASE__PIXEL_FORMAT__YA_NONPREMUL 0x21000088 +#define WUFFS_BASE__PIXEL_FORMAT__YA_PREMUL 0x22000088 #define WUFFS_BASE__PIXEL_FORMAT__YCBCR 0x40020888 #define WUFFS_BASE__PIXEL_FORMAT__YCBCRA_NONPREMUL 0x41038888