mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-21 16:47:28 +01:00
base: rename color_u32_at color_u32_argb_premul_at
This commit is contained in:
1 parent
d9cf0751ca
commit
7b71d6840a
7 files changed
+172
-65
No files matched your search
@@ -507,8 +507,9 @@ redirect:
|
||||
}
|
||||
wuffs_base__pixel_buffer pixel_buffer = alloc_pixbuf_result.pixbuf;
|
||||
if (valid_background_color) {
|
||||
wuffs_base__status pb_scufr_status = pixel_buffer.set_color_u32_fill_rect(
|
||||
pixel_buffer.pixcfg.bounds(), background_color);
|
||||
wuffs_base__status pb_scufr_status =
|
||||
pixel_buffer.set_color_u32_argb_premul_fill_rect(
|
||||
pixel_buffer.pixcfg.bounds(), background_color);
|
||||
if (pb_scufr_status.repr != nullptr) {
|
||||
return DecodeImageResult(pb_scufr_status.message());
|
||||
}
|
||||
|
||||
@@ -1527,16 +1527,29 @@ typedef struct wuffs_base__pixel_buffer__struct {
|
||||
inline wuffs_base__slice_u8 palette_or_else(wuffs_base__slice_u8 fallback);
|
||||
inline wuffs_base__pixel_format pixel_format() const;
|
||||
inline wuffs_base__table_u8 plane(uint32_t p);
|
||||
// Deprecated: use color_u32_argb_premul_at.
|
||||
inline wuffs_base__color_u32_argb_premul color_u32_at(uint32_t x,
|
||||
uint32_t y) const;
|
||||
inline wuffs_base__color_u32_argb_premul color_u32_argb_premul_at(
|
||||
uint32_t x,
|
||||
uint32_t y) const;
|
||||
// Deprecated: use set_color_u32_argb_premul_at.
|
||||
inline wuffs_base__status set_color_u32_at(
|
||||
uint32_t x,
|
||||
uint32_t y,
|
||||
wuffs_base__color_u32_argb_premul color);
|
||||
inline wuffs_base__status set_color_u32_argb_premul_at(
|
||||
uint32_t x,
|
||||
uint32_t y,
|
||||
wuffs_base__color_u32_argb_premul color);
|
||||
// Deprecated: use set_color_u32_argb_premul_fill_rect.
|
||||
inline wuffs_base__status set_color_u32_fill_rect(
|
||||
wuffs_base__rect_ie_u32 rect,
|
||||
wuffs_base__color_u32_argb_premul color);
|
||||
inline wuffs_base__status set_color_u32_nonpremul_at(
|
||||
inline wuffs_base__status set_color_u32_argb_premul_fill_rect(
|
||||
wuffs_base__rect_ie_u32 rect,
|
||||
wuffs_base__color_u32_argb_premul color);
|
||||
inline wuffs_base__status set_color_u32_argb_nonpremul_at(
|
||||
uint32_t x,
|
||||
uint32_t y,
|
||||
wuffs_base__color_u32_argb_nonpremul color);
|
||||
@@ -1734,26 +1747,39 @@ wuffs_base__pixel_buffer__plane(wuffs_base__pixel_buffer* pb, uint32_t p) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
// Deprecated: use the second name, not the first.
|
||||
#define wuffs_base__pixel_buffer__color_u32_at \
|
||||
wuffs_base__pixel_buffer__color_u32_argb_premul_at
|
||||
|
||||
// Deprecated: use the second name, not the first.
|
||||
#define wuffs_base__pixel_buffer__set_color_u32_at \
|
||||
wuffs_base__pixel_buffer__set_color_u32_argb_premul_at
|
||||
|
||||
// Deprecated: use the second name, not the first.
|
||||
#define wuffs_base__pixel_buffer__set_color_u32_fill_rect \
|
||||
wuffs_base__pixel_buffer__set_color_u32_argb_premul_fill_rect
|
||||
|
||||
WUFFS_BASE__MAYBE_STATIC wuffs_base__color_u32_argb_premul //
|
||||
wuffs_base__pixel_buffer__color_u32_at(const wuffs_base__pixel_buffer* pb,
|
||||
uint32_t x,
|
||||
uint32_t y);
|
||||
wuffs_base__pixel_buffer__color_u32_argb_premul_at(
|
||||
const wuffs_base__pixel_buffer* pb,
|
||||
uint32_t x,
|
||||
uint32_t y);
|
||||
|
||||
WUFFS_BASE__MAYBE_STATIC wuffs_base__status //
|
||||
wuffs_base__pixel_buffer__set_color_u32_at(
|
||||
wuffs_base__pixel_buffer__set_color_u32_argb_premul_at(
|
||||
wuffs_base__pixel_buffer* pb,
|
||||
uint32_t x,
|
||||
uint32_t y,
|
||||
wuffs_base__color_u32_argb_premul color);
|
||||
|
||||
WUFFS_BASE__MAYBE_STATIC wuffs_base__status //
|
||||
wuffs_base__pixel_buffer__set_color_u32_fill_rect(
|
||||
wuffs_base__pixel_buffer__set_color_u32_argb_premul_fill_rect(
|
||||
wuffs_base__pixel_buffer* pb,
|
||||
wuffs_base__rect_ie_u32 rect,
|
||||
wuffs_base__color_u32_argb_premul color);
|
||||
|
||||
WUFFS_BASE__MAYBE_STATIC wuffs_base__status //
|
||||
wuffs_base__pixel_buffer__set_color_u32_nonpremul_at(
|
||||
wuffs_base__pixel_buffer__set_color_u32_argb_nonpremul_at(
|
||||
wuffs_base__pixel_buffer* pb,
|
||||
uint32_t x,
|
||||
uint32_t y,
|
||||
@@ -1803,7 +1829,13 @@ wuffs_base__pixel_buffer::plane(uint32_t p) {
|
||||
|
||||
inline wuffs_base__color_u32_argb_premul //
|
||||
wuffs_base__pixel_buffer::color_u32_at(uint32_t x, uint32_t y) const {
|
||||
return wuffs_base__pixel_buffer__color_u32_at(this, x, y);
|
||||
return wuffs_base__pixel_buffer__color_u32_argb_premul_at(this, x, y);
|
||||
}
|
||||
|
||||
inline wuffs_base__color_u32_argb_premul //
|
||||
wuffs_base__pixel_buffer::color_u32_argb_premul_at(uint32_t x,
|
||||
uint32_t y) const {
|
||||
return wuffs_base__pixel_buffer__color_u32_argb_premul_at(this, x, y);
|
||||
}
|
||||
|
||||
inline wuffs_base__status //
|
||||
@@ -1811,23 +1843,42 @@ wuffs_base__pixel_buffer::set_color_u32_at(
|
||||
uint32_t x,
|
||||
uint32_t y,
|
||||
wuffs_base__color_u32_argb_premul color) {
|
||||
return wuffs_base__pixel_buffer__set_color_u32_at(this, x, y, color);
|
||||
return wuffs_base__pixel_buffer__set_color_u32_argb_premul_at(this, x, y,
|
||||
color);
|
||||
}
|
||||
|
||||
inline wuffs_base__status //
|
||||
wuffs_base__pixel_buffer::set_color_u32_argb_premul_at(
|
||||
uint32_t x,
|
||||
uint32_t y,
|
||||
wuffs_base__color_u32_argb_premul color) {
|
||||
return wuffs_base__pixel_buffer__set_color_u32_argb_premul_at(this, x, y,
|
||||
color);
|
||||
}
|
||||
|
||||
inline wuffs_base__status //
|
||||
wuffs_base__pixel_buffer::set_color_u32_fill_rect(
|
||||
wuffs_base__rect_ie_u32 rect,
|
||||
wuffs_base__color_u32_argb_premul color) {
|
||||
return wuffs_base__pixel_buffer__set_color_u32_fill_rect(this, rect, color);
|
||||
return wuffs_base__pixel_buffer__set_color_u32_argb_premul_fill_rect(
|
||||
this, rect, color);
|
||||
}
|
||||
|
||||
inline wuffs_base__status //
|
||||
wuffs_base__pixel_buffer::set_color_u32_nonpremul_at(
|
||||
wuffs_base__pixel_buffer::set_color_u32_argb_premul_fill_rect(
|
||||
wuffs_base__rect_ie_u32 rect,
|
||||
wuffs_base__color_u32_argb_premul color) {
|
||||
return wuffs_base__pixel_buffer__set_color_u32_argb_premul_fill_rect(
|
||||
this, rect, color);
|
||||
}
|
||||
|
||||
inline wuffs_base__status //
|
||||
wuffs_base__pixel_buffer::set_color_u32_argb_nonpremul_at(
|
||||
uint32_t x,
|
||||
uint32_t y,
|
||||
wuffs_base__color_u32_argb_nonpremul color) {
|
||||
return wuffs_base__pixel_buffer__set_color_u32_nonpremul_at(this, x, y,
|
||||
color);
|
||||
return wuffs_base__pixel_buffer__set_color_u32_argb_nonpremul_at(this, x, y,
|
||||
color);
|
||||
}
|
||||
|
||||
inline bool //
|
||||
|
||||
@@ -176,7 +176,7 @@ wuffs_base__pixel_buffer__color_u32_at(const wuffs_base__pixel_buffer* pb,
|
||||
// --------
|
||||
|
||||
WUFFS_BASE__MAYBE_STATIC wuffs_base__status //
|
||||
wuffs_base__pixel_buffer__set_color_u32_at(
|
||||
wuffs_base__pixel_buffer__set_color_u32_argb_premul_at(
|
||||
wuffs_base__pixel_buffer* pb,
|
||||
uint32_t x,
|
||||
uint32_t y,
|
||||
@@ -290,7 +290,7 @@ wuffs_base__pixel_buffer__set_color_u32_at(
|
||||
}
|
||||
|
||||
WUFFS_BASE__MAYBE_STATIC wuffs_base__status //
|
||||
wuffs_base__pixel_buffer__set_color_u32_nonpremul_at(
|
||||
wuffs_base__pixel_buffer__set_color_u32_argb_nonpremul_at(
|
||||
wuffs_base__pixel_buffer* pb,
|
||||
uint32_t x,
|
||||
uint32_t y,
|
||||
@@ -775,7 +775,7 @@ wuffs_private_impl__pixel_buffer__set_color_u32_fill_rect__xxxxxxxx(
|
||||
}
|
||||
|
||||
WUFFS_BASE__MAYBE_STATIC wuffs_base__status //
|
||||
wuffs_base__pixel_buffer__set_color_u32_fill_rect(
|
||||
wuffs_base__pixel_buffer__set_color_u32_argb_premul_fill_rect(
|
||||
wuffs_base__pixel_buffer* pb,
|
||||
wuffs_base__rect_ie_u32 rect,
|
||||
wuffs_base__color_u32_argb_premul color) {
|
||||
@@ -847,7 +847,7 @@ wuffs_base__pixel_buffer__set_color_u32_fill_rect(
|
||||
for (y = rect.min_incl_y; y < rect.max_excl_y; y++) {
|
||||
uint32_t x;
|
||||
for (x = rect.min_incl_x; x < rect.max_excl_x; x++) {
|
||||
wuffs_base__pixel_buffer__set_color_u32_at(pb, x, y, color);
|
||||
wuffs_base__pixel_buffer__set_color_u32_argb_premul_at(pb, x, y, color);
|
||||
}
|
||||
}
|
||||
return wuffs_base__make_status(NULL);
|
||||
|
||||
@@ -131,7 +131,7 @@ wuffs_private_impl__swizzle_ycca_bt601sr_src__convert_4_general(
|
||||
*up0++, *up1++, *up2++);
|
||||
color &= 0xFFFFFFu;
|
||||
color |= ((uint32_t)(*up3++)) << 24;
|
||||
wuffs_base__pixel_buffer__set_color_u32_nonpremul_at(dst, x, y, color);
|
||||
wuffs_base__pixel_buffer__set_color_u32_argb_nonpremul_at(dst, x, y, color);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -177,7 +177,7 @@ wuffs_private_impl__swizzle_cmyk__convert_4_general(
|
||||
r = ((r * w) + 0x7Fu) / 0xFFu;
|
||||
g = ((g * w) + 0x7Fu) / 0xFFu;
|
||||
b = ((b * w) + 0x7Fu) / 0xFFu;
|
||||
wuffs_base__pixel_buffer__set_color_u32_at(
|
||||
wuffs_base__pixel_buffer__set_color_u32_argb_premul_at(
|
||||
dst, x, y, 0xFF000000u | (r << 16u) | (g << 8u) | (b << 0u));
|
||||
}
|
||||
}
|
||||
@@ -204,7 +204,7 @@ wuffs_private_impl__swizzle_ycck__convert_4_general(
|
||||
r = ((r * w) + 0x7Fu) / 0xFFu;
|
||||
g = ((g * w) + 0x7Fu) / 0xFFu;
|
||||
b = ((b * w) + 0x7Fu) / 0xFFu;
|
||||
wuffs_base__pixel_buffer__set_color_u32_at(
|
||||
wuffs_base__pixel_buffer__set_color_u32_argb_premul_at(
|
||||
dst, x, y, 0xFF000000u | (r << 16u) | (g << 8u) | (b << 0u));
|
||||
}
|
||||
}
|
||||
@@ -234,7 +234,7 @@ wuffs_private_impl__swizzle_rgb__convert_3_general(
|
||||
(((uint32_t)(*up0++)) << 16u) | //
|
||||
(((uint32_t)(*up1++)) << 8u) | //
|
||||
(((uint32_t)(*up2++)) << 0u);
|
||||
wuffs_base__pixel_buffer__set_color_u32_at(dst, x, y, color);
|
||||
wuffs_base__pixel_buffer__set_color_u32_argb_premul_at(dst, x, y, color);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -251,7 +251,7 @@ wuffs_private_impl__swizzle_ycc_bt601fr__convert_3_general(
|
||||
uint32_t color = //
|
||||
wuffs_base__color_ycc_bt601fr__as__color_u32( //
|
||||
*up0++, *up1++, *up2++);
|
||||
wuffs_base__pixel_buffer__set_color_u32_at(dst, x, y, color);
|
||||
wuffs_base__pixel_buffer__set_color_u32_argb_premul_at(dst, x, y, color);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -312,7 +312,7 @@ wuffs_private_impl__swizzle_ycc_bt601sr__convert_3_general(
|
||||
uint32_t color = //
|
||||
wuffs_base__color_ycc_bt601sr__as__color_u32( //
|
||||
*up0++, *up1++, *up2++);
|
||||
wuffs_base__pixel_buffer__set_color_u32_at(dst, x, y, color);
|
||||
wuffs_base__pixel_buffer__set_color_u32_argb_premul_at(dst, x, y, color);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1518,7 +1518,7 @@ wuffs_base__pixel_swizzler__swizzle_ycck(
|
||||
}
|
||||
|
||||
if (wuffs_base__pixel_format__is_planar(&dst->pixcfg.private_impl.pixfmt)) {
|
||||
// TODO: see wuffs_base__pixel_buffer__set_color_u32_at's TODO.
|
||||
// TODO: see wuffs_base__pixel_buffer__set_color_u32_argb_premul_at's TODO.
|
||||
return wuffs_base__make_status(
|
||||
wuffs_base__error__unsupported_pixel_swizzler_option);
|
||||
}
|
||||
@@ -1593,7 +1593,8 @@ wuffs_base__pixel_swizzler__swizzle_ycck(
|
||||
break;
|
||||
|
||||
default:
|
||||
// TODO: see wuffs_base__pixel_buffer__set_color_u32_at's TODO.
|
||||
// TODO: see wuffs_base__pixel_buffer__set_color_u32_argb_premul_at's
|
||||
// TODO.
|
||||
return wuffs_base__make_status(
|
||||
wuffs_base__error__unsupported_pixel_swizzler_option);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user