Remove image_config.workbuf_len

This commit is contained in:
Nigel Tao committed 2019-01-19 14:49:27 +11:00
1 parent 989c611711
commit dec519d9b4
5 files changed
+11 -57

No files matched your search

+3 -23
View File
@@ -511,7 +511,6 @@ typedef 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__range_ii_u64 workbuf_len;
uint64_t first_frame_io_position;
bool first_frame_is_opaque;
} private_impl;
@@ -521,13 +520,10 @@ typedef struct {
wuffs_base__pixel_subsampling pixsub,
uint32_t width,
uint32_t height,
uint64_t workbuf_len0,
uint64_t workbuf_len1,
uint64_t first_frame_io_position,
bool first_frame_is_opaque);
inline void invalidate();
inline bool is_valid();
inline wuffs_base__range_ii_u64 workbuf_len();
inline uint64_t first_frame_io_position();
inline bool first_frame_is_opaque();
#endif // __cplusplus
@@ -541,8 +537,6 @@ wuffs_base__image_config__initialize(wuffs_base__image_config* c,
wuffs_base__pixel_subsampling pixsub,
uint32_t width,
uint32_t height,
uint64_t workbuf_len0,
uint64_t workbuf_len1,
uint64_t first_frame_io_position,
bool first_frame_is_opaque) {
if (!c) {
@@ -553,8 +547,6 @@ wuffs_base__image_config__initialize(wuffs_base__image_config* c,
c->pixcfg.private_impl.pixsub = pixsub;
c->pixcfg.private_impl.width = width;
c->pixcfg.private_impl.height = height;
c->private_impl.workbuf_len.min_incl = workbuf_len0;
c->private_impl.workbuf_len.max_incl = workbuf_len1;
c->private_impl.first_frame_io_position = first_frame_io_position;
c->private_impl.first_frame_is_opaque = first_frame_is_opaque;
return;
@@ -574,11 +566,6 @@ wuffs_base__image_config__is_valid(wuffs_base__image_config* c) {
return c && wuffs_base__pixel_config__is_valid(&(c->pixcfg));
}
static inline wuffs_base__range_ii_u64 //
wuffs_base__image_config__workbuf_len(wuffs_base__image_config* c) {
return c ? c->private_impl.workbuf_len : ((wuffs_base__range_ii_u64){});
}
static inline uint64_t //
wuffs_base__image_config__first_frame_io_position(wuffs_base__image_config* c) {
return c ? c->private_impl.first_frame_io_position : 0;
@@ -596,13 +583,11 @@ wuffs_base__image_config::initialize(wuffs_base__pixel_format pixfmt,
wuffs_base__pixel_subsampling pixsub,
uint32_t width,
uint32_t height,
uint64_t workbuf_len0,
uint64_t workbuf_len1,
uint64_t first_frame_io_position,
bool first_frame_is_opaque) {
wuffs_base__image_config__initialize(
this, pixfmt, pixsub, width, height, workbuf_len0, workbuf_len1,
first_frame_io_position, first_frame_is_opaque);
wuffs_base__image_config__initialize(this, pixfmt, pixsub, width, height,
first_frame_io_position,
first_frame_is_opaque);
}
inline void //
@@ -615,11 +600,6 @@ wuffs_base__image_config::is_valid() {
return wuffs_base__image_config__is_valid(this);
}
inline wuffs_base__range_ii_u64 //
wuffs_base__image_config::workbuf_len() {
return wuffs_base__image_config__workbuf_len(this);
}
inline uint64_t //
wuffs_base__image_config::first_frame_io_position() {
return wuffs_base__image_config__first_frame_io_position(this);
+4 -5
View File
@@ -117,11 +117,10 @@ const baseImagePublicH = "" +
" return n;\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_format //\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 uint" +
"32_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 uint64_t //\nwuffs_base__pixel_config::pixbuf_len() {\n return wuffs_base__pixel_config__pixbuf_len(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 wuffs_base__range_ii_u64 workbuf_len;\n uint64_t first_frame_io_position;\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 uint64_t workbuf_len0,\n uint64_t workbuf_len1,\n uint64_t first_frame_io_position,\n bool first_frame_is_opaque);\n inline void invalidate();\n inline bool is_valid();\n inline wuffs_base__range_ii_u64 workbuf_len();\n inline uint64_t first_frame_io_position();\n inline bool 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 uint64_t workbuf_len0,\n uint64_t workbuf_len1,\n uint64_t first_frame_io_position,\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.workbuf_len.min_incl = workbuf_len0;\n c->private_impl.workbuf_len.max_incl = workbuf_len1;\n c->private_" +
"impl.first_frame_io_position = first_frame_io_position;\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 wuffs_base__range_ii_u64 //\nwuffs_base__image_config__workbuf_len(wuffs_base__image_config* c) {\n return c ? c->private_impl.workbuf_len : ((wuffs_base__range_ii_u64){});\n}\n\nstatic inline uint64_t //\nwuffs_base__image_config__first_frame_io_position(wuffs_base__image_config* c) {\n return c ? c->private_impl.first_frame_io_position : 0;\n}\n\nstatic inline bool //\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 __cplu" +
"splus\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 uint64_t workbuf_len0,\n uint64_t workbuf_len1,\n uint64_t first_frame_io_position,\n bool first_frame_is_opaque) {\n wuffs_base__image_config__initialize(\n this, pixfmt, pixsub, width, height, workbuf_len0, workbuf_len1,\n first_frame_io_position, 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__range_ii_u64 //\nwuffs_base__image_config::workbuf_len() {\n return wuffs_base__image_co" +
"nfig__workbuf_len(this);\n}\n\ninline uint64_t //\nwuffs_base__image_config::first_frame_io_position() {\n return wuffs_base__image_config__first_frame_io_position(this);\n}\n\ninline bool //\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 uint64_t first_frame_io_position;\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 uint64_t first_frame_io_position,\n bool first_frame_is_opaque);\n inline void invalidate();\n inline bool is_valid();\n inline uint64_t first_frame_io_position();\n inline bool 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_f" +
"ormat pixfmt,\n wuffs_base__pixel_subsampling pixsub,\n uint32_t width,\n uint32_t height,\n uint64_t first_frame_io_position,\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.first_frame_io_position = first_frame_io_position;\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 uint64_t //\nwuffs_base__image_config__first_frame_io_position(wuffs_base__image_config* c) {\n return c ? c->private_impl.first_frame_io_position : 0;\n}\n\nstatic inline bool //\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 uint64_t first_frame_io_position,\n bool first_frame_is_opaque) {\n wuffs_base__image_config__initialize(this, pixfmt, pixsub, width, height,\n first_frame_io_position,\n first_frame_is_opaq" +
"ue);\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 uint64_t //\nwuffs_base__image_config::first_frame_io_position() {\n return wuffs_base__image_config__first_frame_io_position(this);\n}\n\ninline bool //\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_blend encodes, for an animated image, how to blend the\n// transparent pixels of this frame with the existing canvas. In Porter-Duff\n// compositing operator terminology:\n// - 0 means the frame may be transparent, and should be blended \"src over\n// dst\", also known as just \"over\".\n// - 1 means the frame may be transparent, and should be blended \"src\".\n// - 2 means the frame is completely opaque, so that \"src over dst\" and \"src\"\n// are equivalent.\n//\n// These semantics are conservative. It is valid for a completely opaque frame\n// to have a blend value other than 2.\ntypedef uint8_t wuffs_base__animation_blend;\n\n#define WUFFS_BASE__ANIMATION_BLEND__SRC_OVER_DST \\\n ((wuffs_base__animation_blend)0)\n#define WUFFS_BASE__ANIMATION_BLEND__SRC ((wuffs_base__animation_blend)1)\n#define WUFFS_BASE__ANIMATION_BLEND__OPAQUE ((wuffs_base__animation_blend)2)\n\n" +
"" +
-1
View File
@@ -301,7 +301,6 @@ var Funcs = []string{
// ---- image_config
"image_config.initialize!(pixfmt u32, pixsub u32, width u32, height u32, " +
"workbuf_len0 u64, workbuf_len1 u64, " +
"first_frame_io_position u64, first_frame_is_opaque bool)",
// ---- pixel_buffer
+4 -25
View File
@@ -1714,7 +1714,6 @@ typedef 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__range_ii_u64 workbuf_len;
uint64_t first_frame_io_position;
bool first_frame_is_opaque;
} private_impl;
@@ -1724,13 +1723,10 @@ typedef struct {
wuffs_base__pixel_subsampling pixsub,
uint32_t width,
uint32_t height,
uint64_t workbuf_len0,
uint64_t workbuf_len1,
uint64_t first_frame_io_position,
bool first_frame_is_opaque);
inline void invalidate();
inline bool is_valid();
inline wuffs_base__range_ii_u64 workbuf_len();
inline uint64_t first_frame_io_position();
inline bool first_frame_is_opaque();
#endif // __cplusplus
@@ -1744,8 +1740,6 @@ wuffs_base__image_config__initialize(wuffs_base__image_config* c,
wuffs_base__pixel_subsampling pixsub,
uint32_t width,
uint32_t height,
uint64_t workbuf_len0,
uint64_t workbuf_len1,
uint64_t first_frame_io_position,
bool first_frame_is_opaque) {
if (!c) {
@@ -1756,8 +1750,6 @@ wuffs_base__image_config__initialize(wuffs_base__image_config* c,
c->pixcfg.private_impl.pixsub = pixsub;
c->pixcfg.private_impl.width = width;
c->pixcfg.private_impl.height = height;
c->private_impl.workbuf_len.min_incl = workbuf_len0;
c->private_impl.workbuf_len.max_incl = workbuf_len1;
c->private_impl.first_frame_io_position = first_frame_io_position;
c->private_impl.first_frame_is_opaque = first_frame_is_opaque;
return;
@@ -1777,11 +1769,6 @@ wuffs_base__image_config__is_valid(wuffs_base__image_config* c) {
return c && wuffs_base__pixel_config__is_valid(&(c->pixcfg));
}
static inline wuffs_base__range_ii_u64 //
wuffs_base__image_config__workbuf_len(wuffs_base__image_config* c) {
return c ? c->private_impl.workbuf_len : ((wuffs_base__range_ii_u64){});
}
static inline uint64_t //
wuffs_base__image_config__first_frame_io_position(wuffs_base__image_config* c) {
return c ? c->private_impl.first_frame_io_position : 0;
@@ -1799,13 +1786,11 @@ wuffs_base__image_config::initialize(wuffs_base__pixel_format pixfmt,
wuffs_base__pixel_subsampling pixsub,
uint32_t width,
uint32_t height,
uint64_t workbuf_len0,
uint64_t workbuf_len1,
uint64_t first_frame_io_position,
bool first_frame_is_opaque) {
wuffs_base__image_config__initialize(
this, pixfmt, pixsub, width, height, workbuf_len0, workbuf_len1,
first_frame_io_position, first_frame_is_opaque);
wuffs_base__image_config__initialize(this, pixfmt, pixsub, width, height,
first_frame_io_position,
first_frame_is_opaque);
}
inline void //
@@ -1818,11 +1803,6 @@ wuffs_base__image_config::is_valid() {
return wuffs_base__image_config__is_valid(this);
}
inline wuffs_base__range_ii_u64 //
wuffs_base__image_config::workbuf_len() {
return wuffs_base__image_config__workbuf_len(this);
}
inline uint64_t //
wuffs_base__image_config::first_frame_io_position() {
return wuffs_base__image_config__first_frame_io_position(this);
@@ -7862,8 +7842,7 @@ wuffs_gif__decoder__decode_image_config(wuffs_gif__decoder* self,
if (a_dst != NULL) {
wuffs_base__image_config__initialize(
a_dst, 1191444488, 0, self->private_impl.f_width,
self->private_impl.f_height, ((uint64_t)(self->private_impl.f_width)),
((uint64_t)(self->private_impl.f_width)),
self->private_impl.f_height,
self->private_impl.f_frame_config_io_position, v_ffio);
}
self->private_impl.f_call_sequence = 1;
-3
View File
@@ -149,9 +149,6 @@ pub func decoder.decode_image_config?(dst nptr base.image_config, src base.io_re
pixsub:0,
width:this.width,
height:this.height,
// TODO: workbuf_len should be an aspect of the decoder, not the image_config.
workbuf_len0:this.width as base.u64,
workbuf_len1:this.width as base.u64,
first_frame_io_position:this.frame_config_io_position,
first_frame_is_opaque:ffio)
}