mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 00:32:11 +01:00
Promote pixcfg field out of private_impl
This commit is contained in:
1 parent
10ae70448f
commit
5e8801d866
6 files changed
+54
-290
No files matched your search
@@ -440,10 +440,11 @@ wuffs_base__pixel_config::pixbuf_size() {
|
||||
// --------
|
||||
|
||||
typedef struct {
|
||||
wuffs_base__pixel_config pixcfg;
|
||||
|
||||
// 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__pixel_config pixcfg;
|
||||
uint32_t num_loops;
|
||||
bool first_frame_is_opaque;
|
||||
} private_impl;
|
||||
@@ -457,12 +458,6 @@ typedef struct {
|
||||
bool first_frame_is_opaque);
|
||||
inline void invalidate();
|
||||
inline bool is_valid();
|
||||
inline wuffs_base__pixel_config* pixel_config();
|
||||
inline wuffs_base__pixel_format pixel_format();
|
||||
inline wuffs_base__pixel_subsampling pixel_subsampling();
|
||||
inline wuffs_base__rect_ie_u32 bounds();
|
||||
inline uint32_t width();
|
||||
inline uint32_t height();
|
||||
inline uint32_t num_loops();
|
||||
inline uint32_t first_frame_is_opaque();
|
||||
#endif // __cplusplus
|
||||
@@ -482,10 +477,10 @@ wuffs_base__image_config__initialize(wuffs_base__image_config* c,
|
||||
return;
|
||||
}
|
||||
if (wuffs_base__pixel_format__is_valid(pixfmt)) {
|
||||
c->private_impl.pixcfg.private_impl.pixfmt = pixfmt;
|
||||
c->private_impl.pixcfg.private_impl.pixsub = pixsub;
|
||||
c->private_impl.pixcfg.private_impl.width = width;
|
||||
c->private_impl.pixcfg.private_impl.height = height;
|
||||
c->pixcfg.private_impl.pixfmt = pixfmt;
|
||||
c->pixcfg.private_impl.pixsub = pixsub;
|
||||
c->pixcfg.private_impl.width = width;
|
||||
c->pixcfg.private_impl.height = height;
|
||||
c->private_impl.num_loops = num_loops;
|
||||
c->private_impl.first_frame_is_opaque = first_frame_is_opaque;
|
||||
return;
|
||||
@@ -502,43 +497,7 @@ wuffs_base__image_config__invalidate(wuffs_base__image_config* c) {
|
||||
|
||||
static inline bool //
|
||||
wuffs_base__image_config__is_valid(wuffs_base__image_config* c) {
|
||||
return c && wuffs_base__pixel_config__is_valid(&(c->private_impl.pixcfg));
|
||||
}
|
||||
|
||||
static inline wuffs_base__pixel_config* //
|
||||
wuffs_base__image_config__pixel_config(wuffs_base__image_config* c) {
|
||||
return c ? &c->private_impl.pixcfg : NULL;
|
||||
}
|
||||
|
||||
static inline wuffs_base__pixel_format //
|
||||
wuffs_base__image_config__pixel_format(wuffs_base__image_config* c) {
|
||||
return c ? c->private_impl.pixcfg.private_impl.pixfmt : 0;
|
||||
}
|
||||
|
||||
static inline wuffs_base__pixel_subsampling //
|
||||
wuffs_base__image_config__pixel_subsampling(wuffs_base__image_config* c) {
|
||||
return c ? c->private_impl.pixcfg.private_impl.pixsub : 0;
|
||||
}
|
||||
|
||||
static inline wuffs_base__rect_ie_u32 //
|
||||
wuffs_base__image_config__bounds(wuffs_base__image_config* c) {
|
||||
return c ? ((wuffs_base__rect_ie_u32){
|
||||
.min_incl_x = 0,
|
||||
.min_incl_y = 0,
|
||||
.max_excl_x = c->private_impl.pixcfg.private_impl.width,
|
||||
.max_excl_y = c->private_impl.pixcfg.private_impl.height,
|
||||
})
|
||||
: ((wuffs_base__rect_ie_u32){});
|
||||
}
|
||||
|
||||
static inline uint32_t //
|
||||
wuffs_base__image_config__width(wuffs_base__image_config* c) {
|
||||
return c ? c->private_impl.pixcfg.private_impl.width : 0;
|
||||
}
|
||||
|
||||
static inline uint32_t //
|
||||
wuffs_base__image_config__height(wuffs_base__image_config* c) {
|
||||
return c ? c->private_impl.pixcfg.private_impl.height : 0;
|
||||
return c && wuffs_base__pixel_config__is_valid(&(c->pixcfg));
|
||||
}
|
||||
|
||||
static inline uint32_t //
|
||||
@@ -574,36 +533,6 @@ wuffs_base__image_config::is_valid() {
|
||||
return wuffs_base__image_config__is_valid(this);
|
||||
}
|
||||
|
||||
inline wuffs_base__pixel_config* //
|
||||
wuffs_base__image_config::pixel_config() {
|
||||
return wuffs_base__image_config__pixel_config(this);
|
||||
}
|
||||
|
||||
inline wuffs_base__pixel_format //
|
||||
wuffs_base__image_config::pixel_format() {
|
||||
return wuffs_base__image_config__pixel_format(this);
|
||||
}
|
||||
|
||||
inline wuffs_base__pixel_subsampling //
|
||||
wuffs_base__image_config::pixel_subsampling() {
|
||||
return wuffs_base__image_config__pixel_subsampling(this);
|
||||
}
|
||||
|
||||
inline wuffs_base__rect_ie_u32 //
|
||||
wuffs_base__image_config::bounds() {
|
||||
return wuffs_base__image_config__bounds(this);
|
||||
}
|
||||
|
||||
inline uint32_t //
|
||||
wuffs_base__image_config::width() {
|
||||
return wuffs_base__image_config__width(this);
|
||||
}
|
||||
|
||||
inline uint32_t //
|
||||
wuffs_base__image_config::height() {
|
||||
return wuffs_base__image_config__height(this);
|
||||
}
|
||||
|
||||
inline uint32_t //
|
||||
wuffs_base__image_config::num_loops() {
|
||||
return wuffs_base__image_config__num_loops(this);
|
||||
@@ -781,10 +710,11 @@ wuffs_base__frame_config::palette_changed() {
|
||||
// --------
|
||||
|
||||
typedef struct {
|
||||
wuffs_base__pixel_config pixcfg;
|
||||
|
||||
// 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__pixel_config pixcfg;
|
||||
wuffs_base__table_u8 planes[WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX];
|
||||
uint8_t palette[1024];
|
||||
// TODO: color spaces.
|
||||
@@ -794,10 +724,6 @@ typedef struct {
|
||||
inline wuffs_base__status set_from_slice(wuffs_base__pixel_config* pixcfg,
|
||||
wuffs_base__slice_u8 pixbuf_memory);
|
||||
inline void set_palette(wuffs_base__slice_u8 palette);
|
||||
inline wuffs_base__pixel_config* pixel_config();
|
||||
inline wuffs_base__rect_ie_u32 bounds();
|
||||
inline uint32_t width();
|
||||
inline uint32_t height();
|
||||
inline wuffs_base__table_u8 plane(uint32_t p);
|
||||
inline wuffs_base__slice_u8 palette();
|
||||
#endif // __cplusplus
|
||||
@@ -821,7 +747,7 @@ wuffs_base__pixel_buffer__set_from_slice(wuffs_base__pixel_buffer* b,
|
||||
if (wh > pixbuf_memory.len) {
|
||||
return wuffs_base__error__bad_argument_length_too_short;
|
||||
}
|
||||
b->private_impl.pixcfg = *pixcfg;
|
||||
b->pixcfg = *pixcfg;
|
||||
wuffs_base__table_u8* tab = &b->private_impl.planes[0];
|
||||
tab->ptr = pixbuf_memory.ptr;
|
||||
tab->width = pixcfg->private_impl.width;
|
||||
@@ -839,28 +765,6 @@ wuffs_base__pixel_buffer__set_palette(wuffs_base__pixel_buffer* b,
|
||||
}
|
||||
}
|
||||
|
||||
// wuffs_base__pixel_config returns the overall configuration for this frame.
|
||||
static inline wuffs_base__pixel_config* //
|
||||
wuffs_base__pixel_buffer__pixel_config(wuffs_base__pixel_buffer* b) {
|
||||
return b ? &b->private_impl.pixcfg : NULL;
|
||||
}
|
||||
|
||||
static inline wuffs_base__rect_ie_u32 //
|
||||
wuffs_base__pixel_buffer__bounds(wuffs_base__pixel_buffer* b) {
|
||||
return b ? wuffs_base__pixel_config__bounds(&b->private_impl.pixcfg)
|
||||
: ((wuffs_base__rect_ie_u32){});
|
||||
}
|
||||
|
||||
static inline uint32_t //
|
||||
wuffs_base__pixel_buffer__width(wuffs_base__pixel_buffer* b) {
|
||||
return b ? wuffs_base__pixel_config__width(&b->private_impl.pixcfg) : 0;
|
||||
}
|
||||
|
||||
static inline uint32_t //
|
||||
wuffs_base__pixel_buffer__height(wuffs_base__pixel_buffer* b) {
|
||||
return b ? wuffs_base__pixel_config__height(&b->private_impl.pixcfg) : 0;
|
||||
}
|
||||
|
||||
static inline wuffs_base__table_u8 //
|
||||
wuffs_base__pixel_buffer__plane(wuffs_base__pixel_buffer* b, uint32_t p) {
|
||||
return (b && (p < WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX))
|
||||
@@ -890,26 +794,6 @@ wuffs_base__pixel_buffer::set_palette(wuffs_base__slice_u8 palette) {
|
||||
wuffs_base__pixel_buffer__set_palette(this, palette);
|
||||
}
|
||||
|
||||
inline wuffs_base__pixel_config* //
|
||||
wuffs_base__pixel_buffer::pixel_config() {
|
||||
return wuffs_base__pixel_buffer__pixel_config(this);
|
||||
}
|
||||
|
||||
inline wuffs_base__rect_ie_u32 //
|
||||
wuffs_base__pixel_buffer::bounds() {
|
||||
return wuffs_base__pixel_buffer__bounds(this);
|
||||
}
|
||||
|
||||
inline uint32_t //
|
||||
wuffs_base__pixel_buffer::width() {
|
||||
return wuffs_base__pixel_buffer__width(this);
|
||||
}
|
||||
|
||||
inline uint32_t //
|
||||
wuffs_base__pixel_buffer::height() {
|
||||
return wuffs_base__pixel_buffer__height(this);
|
||||
}
|
||||
|
||||
inline wuffs_base__table_u8 //
|
||||
wuffs_base__pixel_buffer::plane(uint32_t p) {
|
||||
return wuffs_base__pixel_buffer__plane(this, p);
|
||||
|
||||
@@ -137,12 +137,10 @@ const baseImagePublicH = "" +
|
||||
"nt from the format's intrinsic one? For\n// example, decoding a JPEG image straight to RGBA instead of to YCbCr?\nstatic inline size_t //\nwuffs_base__pixel_config__pixbuf_size(wuffs_base__pixel_config* c) {\n if (c) {\n uint64_t wh =\n ((uint64_t)c->private_impl.width) * ((uint64_t)c->private_impl.height);\n // TODO: handle things other than 1 byte per pixel.\n return (size_t)wh;\n }\n return 0;\n}\n\n#ifdef __cplusplus\n\ninline void //\nwuffs_base__pixel_config::initialize(wuffs_base__pixel_format pixfmt,\n wuffs_base__pixel_subsampling pixsub,\n uint32_t width,\n uint32_t height) {\n wuffs_base__pixel_config__initialize(this, pixfmt, pixsub, width, height);\n}\n\ninline void //\nwuffs_base__pixel_config::invalidate() {\n wuffs_base__pixel_config__invalidate(this);\n}\n\ninline bool //\nwuffs_base__pixel_config::is_valid() {\n return wuffs_base__pixel_config__is_valid(this);\n}\n\ninline wuffs_base__pixel_f" +
|
||||
"ormat //\nwuffs_base__pixel_config::pixel_format() {\n return wuffs_base__pixel_config__pixel_format(this);\n}\n\ninline wuffs_base__pixel_subsampling //\nwuffs_base__pixel_config::pixel_subsampling() {\n return wuffs_base__pixel_config__pixel_subsampling(this);\n}\n\ninline wuffs_base__rect_ie_u32 //\nwuffs_base__pixel_config::bounds() {\n return wuffs_base__pixel_config__bounds(this);\n}\n\ninline uint32_t //\nwuffs_base__pixel_config::width() {\n return wuffs_base__pixel_config__width(this);\n}\n\ninline uint32_t //\nwuffs_base__pixel_config::height() {\n return wuffs_base__pixel_config__height(this);\n}\n\ninline size_t //\nwuffs_base__pixel_config::pixbuf_size() {\n return wuffs_base__pixel_config__pixbuf_size(this);\n}\n\n#endif // __cplusplus\n\n" +
|
||||
"" +
|
||||
"// --------\n\ntypedef struct {\n // Do not access the private_impl's fields directly. There is no API/ABI\n // compatibility or safety guarantee if you do so.\n struct {\n wuffs_base__pixel_config pixcfg;\n uint32_t num_loops;\n bool first_frame_is_opaque;\n } private_impl;\n\n#ifdef __cplusplus\n inline void initialize(wuffs_base__pixel_format pixfmt,\n wuffs_base__pixel_subsampling pixsub,\n uint32_t width,\n uint32_t height,\n uint32_t num_loops,\n bool first_frame_is_opaque);\n inline void invalidate();\n inline bool is_valid();\n inline wuffs_base__pixel_config* pixel_config();\n inline wuffs_base__pixel_format pixel_format();\n inline wuffs_base__pixel_subsampling pixel_subsampling();\n inline wuffs_base__rect_ie_u32 bounds();\n inline uint32_t width();\n inline uint32_t height();\n inline uint32_t num_loops();\n inline uint32_t first_frame_is_opaque();\n#endif // __cplusplus\n\n} wuffs_ba" +
|
||||
"se__image_config;\n\n// TODO: Should this function return bool? An error type?\nstatic inline void //\nwuffs_base__image_config__initialize(wuffs_base__image_config* c,\n wuffs_base__pixel_format pixfmt,\n wuffs_base__pixel_subsampling pixsub,\n uint32_t width,\n uint32_t height,\n uint32_t num_loops,\n bool first_frame_is_opaque) {\n if (!c) {\n return;\n }\n if (wuffs_base__pixel_format__is_valid(pixfmt)) {\n c->private_impl.pixcfg.private_impl.pixfmt = pixfmt;\n c->private_impl.pixcfg.private_impl.pixsub = pixsub;\n c->private_impl.pixcfg.private_impl.width = width;\n c->private_impl.pixcfg.private_impl.height = height;\n c->private_impl.num_loops = num_loops;\n c->private_impl.first_frame_is_opaque = first_frame_is_opaque;\n return;\n }\n *c = ((wuffs_base__image_config){});\n}\n\nstatic i" +
|
||||
"nline void //\nwuffs_base__image_config__invalidate(wuffs_base__image_config* c) {\n if (c) {\n *c = ((wuffs_base__image_config){});\n }\n}\n\nstatic inline bool //\nwuffs_base__image_config__is_valid(wuffs_base__image_config* c) {\n return c && wuffs_base__pixel_config__is_valid(&(c->private_impl.pixcfg));\n}\n\nstatic inline wuffs_base__pixel_config* //\nwuffs_base__image_config__pixel_config(wuffs_base__image_config* c) {\n return c ? &c->private_impl.pixcfg : NULL;\n}\n\nstatic inline wuffs_base__pixel_format //\nwuffs_base__image_config__pixel_format(wuffs_base__image_config* c) {\n return c ? c->private_impl.pixcfg.private_impl.pixfmt : 0;\n}\n\nstatic inline wuffs_base__pixel_subsampling //\nwuffs_base__image_config__pixel_subsampling(wuffs_base__image_config* c) {\n return c ? c->private_impl.pixcfg.private_impl.pixsub : 0;\n}\n\nstatic inline wuffs_base__rect_ie_u32 //\nwuffs_base__image_config__bounds(wuffs_base__image_config* c) {\n return c ? ((wuffs_base__rect_ie_u32){\n .min_incl_x = 0,\n " +
|
||||
" .min_incl_y = 0,\n .max_excl_x = c->private_impl.pixcfg.private_impl.width,\n .max_excl_y = c->private_impl.pixcfg.private_impl.height,\n })\n : ((wuffs_base__rect_ie_u32){});\n}\n\nstatic inline uint32_t //\nwuffs_base__image_config__width(wuffs_base__image_config* c) {\n return c ? c->private_impl.pixcfg.private_impl.width : 0;\n}\n\nstatic inline uint32_t //\nwuffs_base__image_config__height(wuffs_base__image_config* c) {\n return c ? c->private_impl.pixcfg.private_impl.height : 0;\n}\n\nstatic inline uint32_t //\nwuffs_base__image_config__num_loops(wuffs_base__image_config* c) {\n return c ? c->private_impl.num_loops : 0;\n}\n\nstatic inline uint32_t //\nwuffs_base__image_config__first_frame_is_opaque(wuffs_base__image_config* c) {\n return c ? c->private_impl.first_frame_is_opaque : false;\n}\n\n#ifdef __cplusplus\n\ninline void //\nwuffs_base__image_config::initialize(wuffs_base__pixel_format pixfmt,\n wuffs_base__pixel_subsa" +
|
||||
"mpling pixsub,\n uint32_t width,\n uint32_t height,\n uint32_t num_loops,\n bool first_frame_is_opaque) {\n wuffs_base__image_config__initialize(this, pixfmt, pixsub, width, height,\n num_loops, first_frame_is_opaque);\n}\n\ninline void //\nwuffs_base__image_config::invalidate() {\n wuffs_base__image_config__invalidate(this);\n}\n\ninline bool //\nwuffs_base__image_config::is_valid() {\n return wuffs_base__image_config__is_valid(this);\n}\n\ninline wuffs_base__pixel_config* //\nwuffs_base__image_config::pixel_config() {\n return wuffs_base__image_config__pixel_config(this);\n}\n\ninline wuffs_base__pixel_format //\nwuffs_base__image_config::pixel_format() {\n return wuffs_base__image_config__pixel_format(this);\n}\n\ninline wuffs_base__pixel_subsampling //\nwuffs_base__image_config::pixel_subsampling() {\n return wuffs_base__image_config__pixel_subsa" +
|
||||
"mpling(this);\n}\n\ninline wuffs_base__rect_ie_u32 //\nwuffs_base__image_config::bounds() {\n return wuffs_base__image_config__bounds(this);\n}\n\ninline uint32_t //\nwuffs_base__image_config::width() {\n return wuffs_base__image_config__width(this);\n}\n\ninline uint32_t //\nwuffs_base__image_config::height() {\n return wuffs_base__image_config__height(this);\n}\n\ninline uint32_t //\nwuffs_base__image_config::num_loops() {\n return wuffs_base__image_config__num_loops(this);\n}\n\ninline uint32_t //\nwuffs_base__image_config::first_frame_is_opaque() {\n return wuffs_base__image_config__first_frame_is_opaque(this);\n}\n\n#endif // __cplusplus\n\n" +
|
||||
"// --------\n\ntypedef struct {\n wuffs_base__pixel_config pixcfg;\n\n // Do not access the private_impl's fields directly. There is no API/ABI\n // compatibility or safety guarantee if you do so.\n struct {\n uint32_t num_loops;\n bool first_frame_is_opaque;\n } private_impl;\n\n#ifdef __cplusplus\n inline void initialize(wuffs_base__pixel_format pixfmt,\n wuffs_base__pixel_subsampling pixsub,\n uint32_t width,\n uint32_t height,\n uint32_t num_loops,\n bool first_frame_is_opaque);\n inline void invalidate();\n inline bool is_valid();\n inline uint32_t num_loops();\n inline uint32_t first_frame_is_opaque();\n#endif // __cplusplus\n\n} wuffs_base__image_config;\n\n// TODO: Should this function return bool? An error type?\nstatic inline void //\nwuffs_base__image_config__initialize(wuffs_base__image_config* c,\n wuffs_base__pixel_format pixfmt,\n " +
|
||||
" wuffs_base__pixel_subsampling pixsub,\n uint32_t width,\n uint32_t height,\n uint32_t num_loops,\n bool first_frame_is_opaque) {\n if (!c) {\n return;\n }\n if (wuffs_base__pixel_format__is_valid(pixfmt)) {\n c->pixcfg.private_impl.pixfmt = pixfmt;\n c->pixcfg.private_impl.pixsub = pixsub;\n c->pixcfg.private_impl.width = width;\n c->pixcfg.private_impl.height = height;\n c->private_impl.num_loops = num_loops;\n c->private_impl.first_frame_is_opaque = first_frame_is_opaque;\n return;\n }\n *c = ((wuffs_base__image_config){});\n}\n\nstatic inline void //\nwuffs_base__image_config__invalidate(wuffs_base__image_config* c) {\n if (c) {\n *c = ((wuffs_base__image_config){});\n }\n}\n\nstatic inline bool //\nwuffs_base__image_config__is_valid(wuffs_base__image_config* c) {\n return c && wuffs_base__pixel_config__is_valid(&(c->pixcfg));\n}\n\nstatic inline " +
|
||||
"uint32_t //\nwuffs_base__image_config__num_loops(wuffs_base__image_config* c) {\n return c ? c->private_impl.num_loops : 0;\n}\n\nstatic inline uint32_t //\nwuffs_base__image_config__first_frame_is_opaque(wuffs_base__image_config* c) {\n return c ? c->private_impl.first_frame_is_opaque : false;\n}\n\n#ifdef __cplusplus\n\ninline void //\nwuffs_base__image_config::initialize(wuffs_base__pixel_format pixfmt,\n wuffs_base__pixel_subsampling pixsub,\n uint32_t width,\n uint32_t height,\n uint32_t num_loops,\n bool first_frame_is_opaque) {\n wuffs_base__image_config__initialize(this, pixfmt, pixsub, width, height,\n num_loops, first_frame_is_opaque);\n}\n\ninline void //\nwuffs_base__image_config::invalidate() {\n wuffs_base__image_config__invalidate(this);\n}\n\ninline bool //\nwuffs_base__image_config::is_valid() {\n " +
|
||||
"return wuffs_base__image_config__is_valid(this);\n}\n\ninline uint32_t //\nwuffs_base__image_config::num_loops() {\n return wuffs_base__image_config__num_loops(this);\n}\n\ninline uint32_t //\nwuffs_base__image_config::first_frame_is_opaque() {\n return wuffs_base__image_config__first_frame_is_opaque(this);\n}\n\n#endif // __cplusplus\n\n" +
|
||||
"" +
|
||||
"// --------\n\n// wuffs_base__animation_disposal encodes, for an animated image, how to\n// dispose of a frame after displaying it:\n// - None means to draw the next frame on top of this one.\n// - Restore Background means to clear the frame's dirty rectangle to \"the\n// background color\" (in practice, this means transparent black) before\n// drawing the next frame.\n// - Restore Previous means to undo the current frame, so that the next frame\n// is drawn on top of the previous one.\ntypedef uint8_t wuffs_base__animation_disposal;\n\n#define WUFFS_BASE__ANIMATION_DISPOSAL__NONE ((wuffs_base__animation_disposal)0)\n#define WUFFS_BASE__ANIMATION_DISPOSAL__RESTORE_BACKGROUND \\\n ((wuffs_base__animation_disposal)1)\n#define WUFFS_BASE__ANIMATION_DISPOSAL__RESTORE_PREVIOUS \\\n ((wuffs_base__animation_disposal)2)\n\n" +
|
||||
"" +
|
||||
@@ -152,9 +150,8 @@ const baseImagePublicH = "" +
|
||||
"rs from the previous frame. It is conservative and may return\n// false positives (but never false negatives).\nstatic inline bool //\nwuffs_base__frame_config__palette_changed(wuffs_base__frame_config* c) {\n return c && c->private_impl.palette_changed;\n}\n\n#ifdef __cplusplus\n\ninline void //\nwuffs_base__frame_config::update(wuffs_base__rect_ie_u32 bounds,\n wuffs_base__flicks duration,\n bool blend,\n wuffs_base__animation_disposal disposal,\n bool palette_changed) {\n wuffs_base__frame_config__update(this, bounds, duration, blend, disposal,\n palette_changed);\n}\n\ninline wuffs_base__rect_ie_u32 //\nwuffs_base__frame_config::bounds() {\n return wuffs_base__frame_config__bounds(this);\n}\n\ninline uint32_t //\nwuffs_base__frame_config::width() {\n return wuffs_base__frame_config__width(this);\n}\n\ninline uint32_t //\nwuffs_base__frame_config::height() {\n return " +
|
||||
"wuffs_base__frame_config__height(this);\n}\n\ninline wuffs_base__flicks //\nwuffs_base__frame_config::duration() {\n return wuffs_base__frame_config__duration(this);\n}\n\ninline bool //\nwuffs_base__frame_config::blend() {\n return wuffs_base__frame_config__blend(this);\n}\n\ninline wuffs_base__animation_disposal //\nwuffs_base__frame_config::disposal() {\n return wuffs_base__frame_config__disposal(this);\n}\n\ninline bool //\nwuffs_base__frame_config::palette_changed() {\n return wuffs_base__frame_config__palette_changed(this);\n}\n\n#endif // __cplusplus\n\n" +
|
||||
"" +
|
||||
"// --------\n\ntypedef struct {\n // Do not access the private_impl's fields directly. There is no API/ABI\n // compatibility or safety guarantee if you do so.\n struct {\n wuffs_base__pixel_config pixcfg;\n wuffs_base__table_u8 planes[WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX];\n uint8_t palette[1024];\n // TODO: color spaces.\n } private_impl;\n\n#ifdef __cplusplus\n inline wuffs_base__status set_from_slice(wuffs_base__pixel_config* pixcfg,\n wuffs_base__slice_u8 pixbuf_memory);\n inline void set_palette(wuffs_base__slice_u8 palette);\n inline wuffs_base__pixel_config* pixel_config();\n inline wuffs_base__rect_ie_u32 bounds();\n inline uint32_t width();\n inline uint32_t height();\n inline wuffs_base__table_u8 plane(uint32_t p);\n inline wuffs_base__slice_u8 palette();\n#endif // __cplusplus\n\n} wuffs_base__pixel_buffer;\n\nstatic inline wuffs_base__status //\nwuffs_base__pixel_buffer__set_from_slice(wuffs_base__pixel_buffer* b,\n " +
|
||||
" wuffs_base__pixel_config* pixcfg,\n wuffs_base__slice_u8 pixbuf_memory) {\n if (!b) {\n return wuffs_base__error__bad_receiver;\n }\n *b = ((wuffs_base__pixel_buffer){});\n if (!pixcfg) {\n return wuffs_base__error__bad_argument;\n }\n // TODO: don't assume 1 byte per pixel. Don't assume packed.\n uint64_t wh = ((uint64_t)pixcfg->private_impl.width) *\n ((uint64_t)pixcfg->private_impl.height);\n if (wh > pixbuf_memory.len) {\n return wuffs_base__error__bad_argument_length_too_short;\n }\n b->private_impl.pixcfg = *pixcfg;\n wuffs_base__table_u8* tab = &b->private_impl.planes[0];\n tab->ptr = pixbuf_memory.ptr;\n tab->width = pixcfg->private_impl.width;\n tab->height = pixcfg->private_impl.height;\n tab->stride = pixcfg->private_impl.width;\n return NULL;\n}\n\n// The palette argument is ignored unless its length is exactly 1024.\nstatic inline void //\nwuffs_base__pixel_buffer__set_palette(wuffs_base__pixel_buffer* b,\n " +
|
||||
" wuffs_base__slice_u8 palette) {\n if (b && palette.ptr && (palette.len == 1024)) {\n memmove(b->private_impl.palette, palette.ptr, 1024);\n }\n}\n\n// wuffs_base__pixel_config returns the overall configuration for this frame.\nstatic inline wuffs_base__pixel_config* //\nwuffs_base__pixel_buffer__pixel_config(wuffs_base__pixel_buffer* b) {\n return b ? &b->private_impl.pixcfg : NULL;\n}\n\nstatic inline wuffs_base__rect_ie_u32 //\nwuffs_base__pixel_buffer__bounds(wuffs_base__pixel_buffer* b) {\n return b ? wuffs_base__pixel_config__bounds(&b->private_impl.pixcfg)\n : ((wuffs_base__rect_ie_u32){});\n}\n\nstatic inline uint32_t //\nwuffs_base__pixel_buffer__width(wuffs_base__pixel_buffer* b) {\n return b ? wuffs_base__pixel_config__width(&b->private_impl.pixcfg) : 0;\n}\n\nstatic inline uint32_t //\nwuffs_base__pixel_buffer__height(wuffs_base__pixel_buffer* b) {\n return b ? wuffs_base__pixel_config__height(&b->private_impl.pixcfg) : 0;\n}\n\nstatic inline wuffs_base__table_u8 //\nwuffs_base__pixel_buffer__plane(" +
|
||||
"wuffs_base__pixel_buffer* b, uint32_t p) {\n return (b && (p < WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX))\n ? b->private_impl.planes[p]\n : ((wuffs_base__table_u8){});\n}\n\n// wuffs_base__pixel_buffer__palette returns the palette that the pixel data\n// can index. The backing array is inside b and has length 1024.\nstatic inline wuffs_base__slice_u8 //\nwuffs_base__pixel_buffer__palette(wuffs_base__pixel_buffer* b) {\n return b ? ((wuffs_base__slice_u8){.ptr = b->private_impl.palette,\n .len = 1024})\n : ((wuffs_base__slice_u8){});\n}\n\n#ifdef __cplusplus\n\ninline wuffs_base__status //\nwuffs_base__pixel_buffer::set_from_slice(wuffs_base__pixel_config* pixcfg,\n wuffs_base__slice_u8 pixbuf_memory) {\n return wuffs_base__pixel_buffer__set_from_slice(this, pixcfg, pixbuf_memory);\n}\n\ninline void //\nwuffs_base__pixel_buffer::set_palette(wuffs_base__slice_u8 palette) {\n wuffs_base__pixel_buffer__set_palette(this, pa" +
|
||||
"lette);\n}\n\ninline wuffs_base__pixel_config* //\nwuffs_base__pixel_buffer::pixel_config() {\n return wuffs_base__pixel_buffer__pixel_config(this);\n}\n\ninline wuffs_base__rect_ie_u32 //\nwuffs_base__pixel_buffer::bounds() {\n return wuffs_base__pixel_buffer__bounds(this);\n}\n\ninline uint32_t //\nwuffs_base__pixel_buffer::width() {\n return wuffs_base__pixel_buffer__width(this);\n}\n\ninline uint32_t //\nwuffs_base__pixel_buffer::height() {\n return wuffs_base__pixel_buffer__height(this);\n}\n\ninline wuffs_base__table_u8 //\nwuffs_base__pixel_buffer::plane(uint32_t p) {\n return wuffs_base__pixel_buffer__plane(this, p);\n}\n\ninline wuffs_base__slice_u8 //\nwuffs_base__pixel_buffer::palette() {\n return wuffs_base__pixel_buffer__palette(this);\n}\n\n#endif // __cplusplus\n\n#ifdef __cplusplus\n} // extern \"C\"\n#endif\n" +
|
||||
"// --------\n\ntypedef struct {\n wuffs_base__pixel_config pixcfg;\n\n // Do not access the private_impl's fields directly. There is no API/ABI\n // compatibility or safety guarantee if you do so.\n struct {\n wuffs_base__table_u8 planes[WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX];\n uint8_t palette[1024];\n // TODO: color spaces.\n } private_impl;\n\n#ifdef __cplusplus\n inline wuffs_base__status set_from_slice(wuffs_base__pixel_config* pixcfg,\n wuffs_base__slice_u8 pixbuf_memory);\n inline void set_palette(wuffs_base__slice_u8 palette);\n inline wuffs_base__table_u8 plane(uint32_t p);\n inline wuffs_base__slice_u8 palette();\n#endif // __cplusplus\n\n} wuffs_base__pixel_buffer;\n\nstatic inline wuffs_base__status //\nwuffs_base__pixel_buffer__set_from_slice(wuffs_base__pixel_buffer* b,\n wuffs_base__pixel_config* pixcfg,\n wuffs_base__slice_u8 pixbuf_memory) {\n if (!b) {\n return wuffs_base_" +
|
||||
"_error__bad_receiver;\n }\n *b = ((wuffs_base__pixel_buffer){});\n if (!pixcfg) {\n return wuffs_base__error__bad_argument;\n }\n // TODO: don't assume 1 byte per pixel. Don't assume packed.\n uint64_t wh = ((uint64_t)pixcfg->private_impl.width) *\n ((uint64_t)pixcfg->private_impl.height);\n if (wh > pixbuf_memory.len) {\n return wuffs_base__error__bad_argument_length_too_short;\n }\n b->pixcfg = *pixcfg;\n wuffs_base__table_u8* tab = &b->private_impl.planes[0];\n tab->ptr = pixbuf_memory.ptr;\n tab->width = pixcfg->private_impl.width;\n tab->height = pixcfg->private_impl.height;\n tab->stride = pixcfg->private_impl.width;\n return NULL;\n}\n\n// The palette argument is ignored unless its length is exactly 1024.\nstatic inline void //\nwuffs_base__pixel_buffer__set_palette(wuffs_base__pixel_buffer* b,\n wuffs_base__slice_u8 palette) {\n if (b && palette.ptr && (palette.len == 1024)) {\n memmove(b->private_impl.palette, palette.ptr, 1024);\n }\n}\n\nstatic inlin" +
|
||||
"e wuffs_base__table_u8 //\nwuffs_base__pixel_buffer__plane(wuffs_base__pixel_buffer* b, uint32_t p) {\n return (b && (p < WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX))\n ? b->private_impl.planes[p]\n : ((wuffs_base__table_u8){});\n}\n\n// wuffs_base__pixel_buffer__palette returns the palette that the pixel data\n// can index. The backing array is inside b and has length 1024.\nstatic inline wuffs_base__slice_u8 //\nwuffs_base__pixel_buffer__palette(wuffs_base__pixel_buffer* b) {\n return b ? ((wuffs_base__slice_u8){.ptr = b->private_impl.palette,\n .len = 1024})\n : ((wuffs_base__slice_u8){});\n}\n\n#ifdef __cplusplus\n\ninline wuffs_base__status //\nwuffs_base__pixel_buffer::set_from_slice(wuffs_base__pixel_config* pixcfg,\n wuffs_base__slice_u8 pixbuf_memory) {\n return wuffs_base__pixel_buffer__set_from_slice(this, pixcfg, pixbuf_memory);\n}\n\ninline void //\nwuffs_base__pixel_buffer::set_palette(wuffs_base__slice_u8 " +
|
||||
"palette) {\n wuffs_base__pixel_buffer__set_palette(this, palette);\n}\n\ninline wuffs_base__table_u8 //\nwuffs_base__pixel_buffer::plane(uint32_t p) {\n return wuffs_base__pixel_buffer__plane(this, p);\n}\n\ninline wuffs_base__slice_u8 //\nwuffs_base__pixel_buffer::palette() {\n return wuffs_base__pixel_buffer__palette(this);\n}\n\n#endif // __cplusplus\n\n#ifdef __cplusplus\n} // extern \"C\"\n#endif\n" +
|
||||
""
|
||||
@@ -133,7 +133,7 @@ static inline uint32_t load_u32le(uint8_t* p) {
|
||||
|
||||
void restore_background(wuffs_base__pixel_buffer* pb,
|
||||
wuffs_base__rect_ie_u32 bounds) {
|
||||
size_t width = wuffs_base__pixel_buffer__width(pb);
|
||||
size_t width = wuffs_base__pixel_config__width(&pb->pixcfg);
|
||||
size_t y;
|
||||
for (y = bounds.min_incl_y; y < bounds.max_excl_y; y++) {
|
||||
size_t x;
|
||||
@@ -149,7 +149,7 @@ void compose(wuffs_base__pixel_buffer* pb, wuffs_base__rect_ie_u32 bounds) {
|
||||
if (palette.len != 1024) {
|
||||
return;
|
||||
}
|
||||
size_t width = wuffs_base__pixel_buffer__width(pb);
|
||||
size_t width = wuffs_base__pixel_config__width(&pb->pixcfg);
|
||||
size_t y;
|
||||
for (y = bounds.min_incl_y; y < bounds.max_excl_y; y++) {
|
||||
size_t x;
|
||||
@@ -167,8 +167,8 @@ void compose(wuffs_base__pixel_buffer* pb, wuffs_base__rect_ie_u32 bounds) {
|
||||
}
|
||||
|
||||
size_t print_ascii_art(wuffs_base__pixel_buffer* pb) {
|
||||
uint32_t width = wuffs_base__pixel_buffer__width(pb);
|
||||
uint32_t height = wuffs_base__pixel_buffer__height(pb);
|
||||
uint32_t width = wuffs_base__pixel_config__width(&pb->pixcfg);
|
||||
uint32_t height = wuffs_base__pixel_config__height(&pb->pixcfg);
|
||||
|
||||
wuffs_base__color_u32argb* d = dst_buffer;
|
||||
uint8_t* p = print_buffer;
|
||||
@@ -193,8 +193,8 @@ size_t print_ascii_art(wuffs_base__pixel_buffer* pb) {
|
||||
}
|
||||
|
||||
size_t print_color_art(wuffs_base__pixel_buffer* pb) {
|
||||
uint32_t width = wuffs_base__pixel_buffer__width(pb);
|
||||
uint32_t height = wuffs_base__pixel_buffer__height(pb);
|
||||
uint32_t width = wuffs_base__pixel_config__width(&pb->pixcfg);
|
||||
uint32_t height = wuffs_base__pixel_config__height(&pb->pixcfg);
|
||||
|
||||
wuffs_base__color_u32argb* d = dst_buffer;
|
||||
uint8_t* p = print_buffer;
|
||||
@@ -291,17 +291,17 @@ const char* play() {
|
||||
if (!wuffs_base__image_config__is_valid(&ic)) {
|
||||
return "invalid image configuration";
|
||||
}
|
||||
uint32_t width = wuffs_base__image_config__width(&ic);
|
||||
uint32_t height = wuffs_base__image_config__height(&ic);
|
||||
uint32_t width = wuffs_base__pixel_config__width(&ic.pixcfg);
|
||||
uint32_t height = wuffs_base__pixel_config__height(&ic.pixcfg);
|
||||
if ((width > MAX_DIMENSION) || (height > MAX_DIMENSION)) {
|
||||
return "image dimensions are too large";
|
||||
}
|
||||
const char* msg = allocate(wuffs_base__image_config__pixel_config(&ic));
|
||||
const char* msg = allocate(&ic.pixcfg);
|
||||
if (msg) {
|
||||
return msg;
|
||||
}
|
||||
z = wuffs_base__pixel_buffer__set_from_slice(
|
||||
&pb, wuffs_base__image_config__pixel_config(&ic),
|
||||
&pb, &ic.pixcfg,
|
||||
((wuffs_base__slice_u8){.ptr = image_buffer, .len = image_len}));
|
||||
if (z) {
|
||||
return z;
|
||||
|
||||
@@ -72,8 +72,7 @@ const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
|
||||
goto exit;
|
||||
}
|
||||
|
||||
size_t pixbuf_size = wuffs_base__pixel_config__pixbuf_size(
|
||||
wuffs_base__image_config__pixel_config(&ic));
|
||||
size_t pixbuf_size = wuffs_base__pixel_config__pixbuf_size(&ic.pixcfg);
|
||||
// Don't try to allocate more than 64 MiB.
|
||||
if (pixbuf_size > 64 * 1024 * 1024) {
|
||||
ret = "image too large";
|
||||
@@ -86,7 +85,7 @@ const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) {
|
||||
}
|
||||
wuffs_base__pixel_buffer pb = ((wuffs_base__pixel_buffer){});
|
||||
z = wuffs_base__pixel_buffer__set_from_slice(
|
||||
&pb, wuffs_base__image_config__pixel_config(&ic),
|
||||
&pb, &ic.pixcfg,
|
||||
((wuffs_base__slice_u8){.ptr = pixbuf, .len = pixbuf_size}));
|
||||
if (z) {
|
||||
ret = z;
|
||||
|
||||
@@ -1535,10 +1535,11 @@ wuffs_base__pixel_config::pixbuf_size() {
|
||||
// --------
|
||||
|
||||
typedef struct {
|
||||
wuffs_base__pixel_config pixcfg;
|
||||
|
||||
// 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__pixel_config pixcfg;
|
||||
uint32_t num_loops;
|
||||
bool first_frame_is_opaque;
|
||||
} private_impl;
|
||||
@@ -1552,12 +1553,6 @@ typedef struct {
|
||||
bool first_frame_is_opaque);
|
||||
inline void invalidate();
|
||||
inline bool is_valid();
|
||||
inline wuffs_base__pixel_config* pixel_config();
|
||||
inline wuffs_base__pixel_format pixel_format();
|
||||
inline wuffs_base__pixel_subsampling pixel_subsampling();
|
||||
inline wuffs_base__rect_ie_u32 bounds();
|
||||
inline uint32_t width();
|
||||
inline uint32_t height();
|
||||
inline uint32_t num_loops();
|
||||
inline uint32_t first_frame_is_opaque();
|
||||
#endif // __cplusplus
|
||||
@@ -1577,10 +1572,10 @@ wuffs_base__image_config__initialize(wuffs_base__image_config* c,
|
||||
return;
|
||||
}
|
||||
if (wuffs_base__pixel_format__is_valid(pixfmt)) {
|
||||
c->private_impl.pixcfg.private_impl.pixfmt = pixfmt;
|
||||
c->private_impl.pixcfg.private_impl.pixsub = pixsub;
|
||||
c->private_impl.pixcfg.private_impl.width = width;
|
||||
c->private_impl.pixcfg.private_impl.height = height;
|
||||
c->pixcfg.private_impl.pixfmt = pixfmt;
|
||||
c->pixcfg.private_impl.pixsub = pixsub;
|
||||
c->pixcfg.private_impl.width = width;
|
||||
c->pixcfg.private_impl.height = height;
|
||||
c->private_impl.num_loops = num_loops;
|
||||
c->private_impl.first_frame_is_opaque = first_frame_is_opaque;
|
||||
return;
|
||||
@@ -1597,43 +1592,7 @@ wuffs_base__image_config__invalidate(wuffs_base__image_config* c) {
|
||||
|
||||
static inline bool //
|
||||
wuffs_base__image_config__is_valid(wuffs_base__image_config* c) {
|
||||
return c && wuffs_base__pixel_config__is_valid(&(c->private_impl.pixcfg));
|
||||
}
|
||||
|
||||
static inline wuffs_base__pixel_config* //
|
||||
wuffs_base__image_config__pixel_config(wuffs_base__image_config* c) {
|
||||
return c ? &c->private_impl.pixcfg : NULL;
|
||||
}
|
||||
|
||||
static inline wuffs_base__pixel_format //
|
||||
wuffs_base__image_config__pixel_format(wuffs_base__image_config* c) {
|
||||
return c ? c->private_impl.pixcfg.private_impl.pixfmt : 0;
|
||||
}
|
||||
|
||||
static inline wuffs_base__pixel_subsampling //
|
||||
wuffs_base__image_config__pixel_subsampling(wuffs_base__image_config* c) {
|
||||
return c ? c->private_impl.pixcfg.private_impl.pixsub : 0;
|
||||
}
|
||||
|
||||
static inline wuffs_base__rect_ie_u32 //
|
||||
wuffs_base__image_config__bounds(wuffs_base__image_config* c) {
|
||||
return c ? ((wuffs_base__rect_ie_u32){
|
||||
.min_incl_x = 0,
|
||||
.min_incl_y = 0,
|
||||
.max_excl_x = c->private_impl.pixcfg.private_impl.width,
|
||||
.max_excl_y = c->private_impl.pixcfg.private_impl.height,
|
||||
})
|
||||
: ((wuffs_base__rect_ie_u32){});
|
||||
}
|
||||
|
||||
static inline uint32_t //
|
||||
wuffs_base__image_config__width(wuffs_base__image_config* c) {
|
||||
return c ? c->private_impl.pixcfg.private_impl.width : 0;
|
||||
}
|
||||
|
||||
static inline uint32_t //
|
||||
wuffs_base__image_config__height(wuffs_base__image_config* c) {
|
||||
return c ? c->private_impl.pixcfg.private_impl.height : 0;
|
||||
return c && wuffs_base__pixel_config__is_valid(&(c->pixcfg));
|
||||
}
|
||||
|
||||
static inline uint32_t //
|
||||
@@ -1669,36 +1628,6 @@ wuffs_base__image_config::is_valid() {
|
||||
return wuffs_base__image_config__is_valid(this);
|
||||
}
|
||||
|
||||
inline wuffs_base__pixel_config* //
|
||||
wuffs_base__image_config::pixel_config() {
|
||||
return wuffs_base__image_config__pixel_config(this);
|
||||
}
|
||||
|
||||
inline wuffs_base__pixel_format //
|
||||
wuffs_base__image_config::pixel_format() {
|
||||
return wuffs_base__image_config__pixel_format(this);
|
||||
}
|
||||
|
||||
inline wuffs_base__pixel_subsampling //
|
||||
wuffs_base__image_config::pixel_subsampling() {
|
||||
return wuffs_base__image_config__pixel_subsampling(this);
|
||||
}
|
||||
|
||||
inline wuffs_base__rect_ie_u32 //
|
||||
wuffs_base__image_config::bounds() {
|
||||
return wuffs_base__image_config__bounds(this);
|
||||
}
|
||||
|
||||
inline uint32_t //
|
||||
wuffs_base__image_config::width() {
|
||||
return wuffs_base__image_config__width(this);
|
||||
}
|
||||
|
||||
inline uint32_t //
|
||||
wuffs_base__image_config::height() {
|
||||
return wuffs_base__image_config__height(this);
|
||||
}
|
||||
|
||||
inline uint32_t //
|
||||
wuffs_base__image_config::num_loops() {
|
||||
return wuffs_base__image_config__num_loops(this);
|
||||
@@ -1876,10 +1805,11 @@ wuffs_base__frame_config::palette_changed() {
|
||||
// --------
|
||||
|
||||
typedef struct {
|
||||
wuffs_base__pixel_config pixcfg;
|
||||
|
||||
// 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__pixel_config pixcfg;
|
||||
wuffs_base__table_u8 planes[WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX];
|
||||
uint8_t palette[1024];
|
||||
// TODO: color spaces.
|
||||
@@ -1889,10 +1819,6 @@ typedef struct {
|
||||
inline wuffs_base__status set_from_slice(wuffs_base__pixel_config* pixcfg,
|
||||
wuffs_base__slice_u8 pixbuf_memory);
|
||||
inline void set_palette(wuffs_base__slice_u8 palette);
|
||||
inline wuffs_base__pixel_config* pixel_config();
|
||||
inline wuffs_base__rect_ie_u32 bounds();
|
||||
inline uint32_t width();
|
||||
inline uint32_t height();
|
||||
inline wuffs_base__table_u8 plane(uint32_t p);
|
||||
inline wuffs_base__slice_u8 palette();
|
||||
#endif // __cplusplus
|
||||
@@ -1916,7 +1842,7 @@ wuffs_base__pixel_buffer__set_from_slice(wuffs_base__pixel_buffer* b,
|
||||
if (wh > pixbuf_memory.len) {
|
||||
return wuffs_base__error__bad_argument_length_too_short;
|
||||
}
|
||||
b->private_impl.pixcfg = *pixcfg;
|
||||
b->pixcfg = *pixcfg;
|
||||
wuffs_base__table_u8* tab = &b->private_impl.planes[0];
|
||||
tab->ptr = pixbuf_memory.ptr;
|
||||
tab->width = pixcfg->private_impl.width;
|
||||
@@ -1934,28 +1860,6 @@ wuffs_base__pixel_buffer__set_palette(wuffs_base__pixel_buffer* b,
|
||||
}
|
||||
}
|
||||
|
||||
// wuffs_base__pixel_config returns the overall configuration for this frame.
|
||||
static inline wuffs_base__pixel_config* //
|
||||
wuffs_base__pixel_buffer__pixel_config(wuffs_base__pixel_buffer* b) {
|
||||
return b ? &b->private_impl.pixcfg : NULL;
|
||||
}
|
||||
|
||||
static inline wuffs_base__rect_ie_u32 //
|
||||
wuffs_base__pixel_buffer__bounds(wuffs_base__pixel_buffer* b) {
|
||||
return b ? wuffs_base__pixel_config__bounds(&b->private_impl.pixcfg)
|
||||
: ((wuffs_base__rect_ie_u32){});
|
||||
}
|
||||
|
||||
static inline uint32_t //
|
||||
wuffs_base__pixel_buffer__width(wuffs_base__pixel_buffer* b) {
|
||||
return b ? wuffs_base__pixel_config__width(&b->private_impl.pixcfg) : 0;
|
||||
}
|
||||
|
||||
static inline uint32_t //
|
||||
wuffs_base__pixel_buffer__height(wuffs_base__pixel_buffer* b) {
|
||||
return b ? wuffs_base__pixel_config__height(&b->private_impl.pixcfg) : 0;
|
||||
}
|
||||
|
||||
static inline wuffs_base__table_u8 //
|
||||
wuffs_base__pixel_buffer__plane(wuffs_base__pixel_buffer* b, uint32_t p) {
|
||||
return (b && (p < WUFFS_BASE__PIXEL_FORMAT__NUM_PLANES_MAX))
|
||||
@@ -1985,26 +1889,6 @@ wuffs_base__pixel_buffer::set_palette(wuffs_base__slice_u8 palette) {
|
||||
wuffs_base__pixel_buffer__set_palette(this, palette);
|
||||
}
|
||||
|
||||
inline wuffs_base__pixel_config* //
|
||||
wuffs_base__pixel_buffer::pixel_config() {
|
||||
return wuffs_base__pixel_buffer__pixel_config(this);
|
||||
}
|
||||
|
||||
inline wuffs_base__rect_ie_u32 //
|
||||
wuffs_base__pixel_buffer::bounds() {
|
||||
return wuffs_base__pixel_buffer__bounds(this);
|
||||
}
|
||||
|
||||
inline uint32_t //
|
||||
wuffs_base__pixel_buffer::width() {
|
||||
return wuffs_base__pixel_buffer__width(this);
|
||||
}
|
||||
|
||||
inline uint32_t //
|
||||
wuffs_base__pixel_buffer::height() {
|
||||
return wuffs_base__pixel_buffer__height(this);
|
||||
}
|
||||
|
||||
inline wuffs_base__table_u8 //
|
||||
wuffs_base__pixel_buffer::plane(uint32_t p) {
|
||||
return wuffs_base__pixel_buffer__plane(this, p);
|
||||
|
||||
+14
-14
@@ -211,7 +211,7 @@ const char* wuffs_gif_decode(wuffs_base__io_buffer* dst,
|
||||
return z;
|
||||
}
|
||||
z = wuffs_base__pixel_buffer__set_from_slice(
|
||||
&pb, wuffs_base__image_config__pixel_config(&ic),
|
||||
&pb, &ic.pixcfg,
|
||||
((wuffs_base__slice_u8){
|
||||
.ptr = global_pixel_buffer,
|
||||
.len = WUFFS_TESTLIB_ARRAY_SIZE(global_pixel_buffer),
|
||||
@@ -276,23 +276,23 @@ bool do_test_wuffs_gif_decode(const char* filename,
|
||||
FAIL("decode_image_config: got \"%s\"", z);
|
||||
return false;
|
||||
}
|
||||
if (wuffs_base__image_config__pixel_format(&ic) !=
|
||||
if (wuffs_base__pixel_config__pixel_format(&ic.pixcfg) !=
|
||||
WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_INDEXED) {
|
||||
FAIL("pixel_format: got 0x%08" PRIX32 ", want 0x%08" PRIX32,
|
||||
wuffs_base__image_config__pixel_format(&ic),
|
||||
wuffs_base__pixel_config__pixel_format(&ic.pixcfg),
|
||||
WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_INDEXED);
|
||||
return false;
|
||||
}
|
||||
|
||||
// bricks-dither.gif is a 160 × 120, opaque, still (not animated) GIF.
|
||||
if (wuffs_base__image_config__width(&ic) != 160) {
|
||||
if (wuffs_base__pixel_config__width(&ic.pixcfg) != 160) {
|
||||
FAIL("width: got %" PRIu32 ", want 160",
|
||||
wuffs_base__image_config__width(&ic));
|
||||
wuffs_base__pixel_config__width(&ic.pixcfg));
|
||||
return false;
|
||||
}
|
||||
if (wuffs_base__image_config__height(&ic) != 120) {
|
||||
if (wuffs_base__pixel_config__height(&ic.pixcfg) != 120) {
|
||||
FAIL("height: got %" PRIu32 ", want 120",
|
||||
wuffs_base__image_config__height(&ic));
|
||||
wuffs_base__pixel_config__height(&ic.pixcfg));
|
||||
return false;
|
||||
}
|
||||
if (wuffs_base__image_config__num_loops(&ic) != 1) {
|
||||
@@ -305,7 +305,7 @@ bool do_test_wuffs_gif_decode(const char* filename,
|
||||
return false;
|
||||
}
|
||||
z = wuffs_base__pixel_buffer__set_from_slice(
|
||||
&pb, wuffs_base__image_config__pixel_config(&ic),
|
||||
&pb, &ic.pixcfg,
|
||||
((wuffs_base__slice_u8){
|
||||
.ptr = global_pixel_buffer,
|
||||
.len = WUFFS_TESTLIB_ARRAY_SIZE(global_pixel_buffer),
|
||||
@@ -511,7 +511,7 @@ bool do_test_wuffs_gif_decode_animated(
|
||||
return false;
|
||||
}
|
||||
z = wuffs_base__pixel_buffer__set_from_slice(
|
||||
&pb, wuffs_base__image_config__pixel_config(&ic),
|
||||
&pb, &ic.pixcfg,
|
||||
((wuffs_base__slice_u8){
|
||||
.ptr = global_pixel_buffer,
|
||||
.len = WUFFS_TESTLIB_ARRAY_SIZE(global_pixel_buffer),
|
||||
@@ -628,14 +628,14 @@ void test_wuffs_gif_decode_frame_out_of_bounds() {
|
||||
// test/data/artificial/gif-frame-out-of-bounds.gif.make-artificial.txt for
|
||||
// more discussion.
|
||||
|
||||
if (wuffs_base__image_config__width(&ic) != 4) {
|
||||
if (wuffs_base__pixel_config__width(&ic.pixcfg) != 4) {
|
||||
FAIL("width: got %" PRIu32 ", want 4",
|
||||
wuffs_base__image_config__width(&ic));
|
||||
wuffs_base__pixel_config__width(&ic.pixcfg));
|
||||
return;
|
||||
}
|
||||
if (wuffs_base__image_config__height(&ic) != 2) {
|
||||
if (wuffs_base__pixel_config__height(&ic.pixcfg) != 2) {
|
||||
FAIL("height: got %" PRIu32 ", want 2",
|
||||
wuffs_base__image_config__height(&ic));
|
||||
wuffs_base__pixel_config__height(&ic.pixcfg));
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -727,7 +727,7 @@ bool do_test_wuffs_gif_num_decoded(bool frame_config) {
|
||||
}
|
||||
|
||||
z = wuffs_base__pixel_buffer__set_from_slice(
|
||||
&pb, wuffs_base__image_config__pixel_config(&ic),
|
||||
&pb, &ic.pixcfg,
|
||||
((wuffs_base__slice_u8){
|
||||
.ptr = global_pixel_buffer,
|
||||
.len = WUFFS_TESTLIB_ARRAY_SIZE(global_pixel_buffer),
|
||||
|
||||
Reference in new issue
Block a user