mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-20 08:47:28 +01:00
Add frame_config.background_color
This commit is contained in:
1 parent
08dd41aa93
commit
5cdf3197bd
5 files changed
+85
-40
No files matched your search
@@ -2259,6 +2259,7 @@ typedef struct {
|
||||
uint64_t io_position;
|
||||
wuffs_base__animation_blend blend;
|
||||
wuffs_base__animation_disposal disposal;
|
||||
wuffs_base__color_u32_argb_premul background_color;
|
||||
} private_impl;
|
||||
|
||||
#ifdef __cplusplus
|
||||
@@ -2267,7 +2268,8 @@ typedef struct {
|
||||
uint64_t index,
|
||||
uint64_t io_position,
|
||||
wuffs_base__animation_blend blend,
|
||||
wuffs_base__animation_disposal disposal);
|
||||
wuffs_base__animation_disposal disposal,
|
||||
wuffs_base__color_u32_argb_premul background_color);
|
||||
inline wuffs_base__rect_ie_u32 bounds() const;
|
||||
inline uint32_t width() const;
|
||||
inline uint32_t height() const;
|
||||
@@ -2276,6 +2278,7 @@ typedef struct {
|
||||
inline uint64_t io_position() const;
|
||||
inline wuffs_base__animation_blend blend() const;
|
||||
inline wuffs_base__animation_disposal disposal() const;
|
||||
inline wuffs_base__color_u32_argb_premul background_color() const;
|
||||
#endif // __cplusplus
|
||||
|
||||
} wuffs_base__frame_config;
|
||||
@@ -2293,13 +2296,15 @@ wuffs_base__null_frame_config() {
|
||||
}
|
||||
|
||||
static inline void //
|
||||
wuffs_base__frame_config__update(wuffs_base__frame_config* c,
|
||||
wuffs_base__rect_ie_u32 bounds,
|
||||
wuffs_base__flicks duration,
|
||||
uint64_t index,
|
||||
uint64_t io_position,
|
||||
wuffs_base__animation_blend blend,
|
||||
wuffs_base__animation_disposal disposal) {
|
||||
wuffs_base__frame_config__update(
|
||||
wuffs_base__frame_config* c,
|
||||
wuffs_base__rect_ie_u32 bounds,
|
||||
wuffs_base__flicks duration,
|
||||
uint64_t index,
|
||||
uint64_t io_position,
|
||||
wuffs_base__animation_blend blend,
|
||||
wuffs_base__animation_disposal disposal,
|
||||
wuffs_base__color_u32_argb_premul background_color) {
|
||||
if (!c) {
|
||||
return;
|
||||
}
|
||||
@@ -2310,6 +2315,7 @@ wuffs_base__frame_config__update(wuffs_base__frame_config* c,
|
||||
c->private_impl.io_position = io_position;
|
||||
c->private_impl.blend = blend;
|
||||
c->private_impl.disposal = disposal;
|
||||
c->private_impl.background_color = background_color;
|
||||
}
|
||||
|
||||
static inline wuffs_base__rect_ie_u32 //
|
||||
@@ -2371,17 +2377,24 @@ wuffs_base__frame_config__disposal(const wuffs_base__frame_config* c) {
|
||||
return c ? c->private_impl.disposal : 0;
|
||||
}
|
||||
|
||||
static inline wuffs_base__color_u32_argb_premul //
|
||||
wuffs_base__frame_config__background_color(const wuffs_base__frame_config* c) {
|
||||
return c ? c->private_impl.background_color : 0;
|
||||
}
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
inline void //
|
||||
wuffs_base__frame_config::update(wuffs_base__rect_ie_u32 bounds,
|
||||
wuffs_base__flicks duration,
|
||||
uint64_t index,
|
||||
uint64_t io_position,
|
||||
wuffs_base__animation_blend blend,
|
||||
wuffs_base__animation_disposal disposal) {
|
||||
wuffs_base__frame_config::update(
|
||||
wuffs_base__rect_ie_u32 bounds,
|
||||
wuffs_base__flicks duration,
|
||||
uint64_t index,
|
||||
uint64_t io_position,
|
||||
wuffs_base__animation_blend blend,
|
||||
wuffs_base__animation_disposal disposal,
|
||||
wuffs_base__color_u32_argb_premul background_color) {
|
||||
wuffs_base__frame_config__update(this, bounds, duration, index, io_position,
|
||||
blend, disposal);
|
||||
blend, disposal, background_color);
|
||||
}
|
||||
|
||||
inline wuffs_base__rect_ie_u32 //
|
||||
@@ -2424,6 +2437,11 @@ wuffs_base__frame_config::disposal() const {
|
||||
return wuffs_base__frame_config__disposal(this);
|
||||
}
|
||||
|
||||
inline wuffs_base__color_u32_argb_premul //
|
||||
wuffs_base__frame_config::background_color() const {
|
||||
return wuffs_base__frame_config__background_color(this);
|
||||
}
|
||||
|
||||
#endif // __cplusplus
|
||||
|
||||
// --------
|
||||
@@ -9162,6 +9180,7 @@ wuffs_gif__decoder__decode_frame_config(wuffs_gif__decoder* self,
|
||||
wuffs_base__status status = NULL;
|
||||
|
||||
uint8_t v_blend = 0;
|
||||
uint32_t v_background_color = 0;
|
||||
|
||||
uint32_t coro_susp_point = self->private_impl.p_decode_frame_config[0];
|
||||
if (coro_susp_point) {
|
||||
@@ -9199,8 +9218,11 @@ wuffs_gif__decoder__decode_frame_config(wuffs_gif__decoder* self,
|
||||
goto ok;
|
||||
}
|
||||
v_blend = 0;
|
||||
v_background_color = 0;
|
||||
if (!self->private_impl.f_gc_has_transparent_index) {
|
||||
v_blend = 2;
|
||||
v_background_color =
|
||||
self->private_impl.f_background_color_u32_argb_premul;
|
||||
}
|
||||
if (a_dst != NULL) {
|
||||
wuffs_base__frame_config__update(
|
||||
@@ -9217,7 +9239,7 @@ wuffs_gif__decoder__decode_frame_config(wuffs_gif__decoder* self,
|
||||
((wuffs_base__flicks)(self->private_impl.f_gc_duration)),
|
||||
self->private_impl.f_num_decoded_frame_configs_value,
|
||||
self->private_impl.f_frame_config_io_position, v_blend,
|
||||
self->private_impl.f_gc_disposal);
|
||||
self->private_impl.f_gc_disposal, v_background_color);
|
||||
}
|
||||
wuffs_base__u64__sat_add_indirect(
|
||||
&self->private_impl.f_num_decoded_frame_configs_value, 1);
|
||||
|
||||
Reference in new issue
Block a user