From 4834cb97c803c05f962923262075313d9ad5749c Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sun, 16 Apr 2023 11:12:06 +1000 Subject: [PATCH] base: deprecate ETC__PIXEL_FORMAT__NUM_PLANES_MAX --- internal/cgen/base/image-public.h | 7 +++++-- release/c/wuffs-unsupported-snapshot.c | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/internal/cgen/base/image-public.h b/internal/cgen/base/image-public.h index 9f3e1dc2..5f1e9435 100644 --- a/internal/cgen/base/image-public.h +++ b/internal/cgen/base/image-public.h @@ -227,8 +227,11 @@ typedef uint32_t wuffs_base__pixel_alpha_transparency; // -------- +// Deprecated: use WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX_INCL. #define WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX 4 +#define WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX_INCL 4 + #define WUFFS_BASE__PIXEL_FORMAT__INDEXED__INDEX_PLANE 0 #define WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE 3 @@ -1096,7 +1099,7 @@ typedef struct wuffs_base__pixel_buffer__struct { // Do not access the private_impl's fields directly. There is no API/ABI // compatibility or safety guarantee if you do so. struct { - wuffs_base__table_u8 planes[WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX]; + wuffs_base__table_u8 planes[WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX_INCL]; // TODO: color spaces. } private_impl; @@ -1302,7 +1305,7 @@ wuffs_base__pixel_buffer__pixel_format(const wuffs_base__pixel_buffer* pb) { static inline wuffs_base__table_u8 // wuffs_base__pixel_buffer__plane(wuffs_base__pixel_buffer* pb, uint32_t p) { - if (pb && (p < WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX)) { + if (pb && (p < WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX_INCL)) { return pb->private_impl.planes[p]; } diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 105b3519..4e12b100 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -3820,8 +3820,11 @@ typedef uint32_t wuffs_base__pixel_alpha_transparency; // -------- +// Deprecated: use WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX_INCL. #define WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX 4 +#define WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX_INCL 4 + #define WUFFS_BASE__PIXEL_FORMAT__INDEXED__INDEX_PLANE 0 #define WUFFS_BASE__PIXEL_FORMAT__INDEXED__COLOR_PLANE 3 @@ -4689,7 +4692,7 @@ typedef struct wuffs_base__pixel_buffer__struct { // Do not access the private_impl's fields directly. There is no API/ABI // compatibility or safety guarantee if you do so. struct { - wuffs_base__table_u8 planes[WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX]; + wuffs_base__table_u8 planes[WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX_INCL]; // TODO: color spaces. } private_impl; @@ -4895,7 +4898,7 @@ wuffs_base__pixel_buffer__pixel_format(const wuffs_base__pixel_buffer* pb) { static inline wuffs_base__table_u8 // wuffs_base__pixel_buffer__plane(wuffs_base__pixel_buffer* pb, uint32_t p) { - if (pb && (p < WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX)) { + if (pb && (p < WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX_INCL)) { return pb->private_impl.planes[p]; }