Rename work_buffer_size to workbuf_len

This commit is contained in:
Nigel Tao committed 2018-09-08 09:06:56 +10:00
1 parent ca940b0c56
commit fbbdc412d1
8 files changed
+95 -104

No files matched your search

+30 -31
View File
@@ -141,7 +141,7 @@ extern const char* wuffs_base__error__bad_call_sequence;
extern const char* wuffs_base__error__bad_receiver;
extern const char* wuffs_base__error__bad_restart;
extern const char* wuffs_base__error__bad_sizeof_receiver;
extern const char* wuffs_base__error__bad_work_buffer_length;
extern const char* wuffs_base__error__bad_workbuf_length;
extern const char* wuffs_base__error__bad_wuffs_version;
extern const char* wuffs_base__error__cannot_return_a_suspension;
extern const char* wuffs_base__error__check_wuffs_version_not_applicable;
@@ -1573,7 +1573,7 @@ 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 work_buffer_size;
wuffs_base__range_ii_u64 workbuf_len;
uint64_t first_frame_io_position;
uint32_t num_loops;
bool first_frame_is_opaque;
@@ -1584,14 +1584,14 @@ typedef struct {
wuffs_base__pixel_subsampling pixsub,
uint32_t width,
uint32_t height,
uint64_t work_buffer_size0,
uint64_t work_buffer_size1,
uint64_t workbuf_len0,
uint64_t workbuf_len1,
uint32_t num_loops,
uint64_t first_frame_io_position,
bool first_frame_is_opaque);
inline void invalidate();
inline bool is_valid();
inline wuffs_base__range_ii_u64 work_buffer_size();
inline wuffs_base__range_ii_u64 workbuf_len();
inline uint32_t num_loops();
inline uint64_t first_frame_io_position();
inline bool first_frame_is_opaque();
@@ -1606,8 +1606,8 @@ wuffs_base__image_config__initialize(wuffs_base__image_config* c,
wuffs_base__pixel_subsampling pixsub,
uint32_t width,
uint32_t height,
uint64_t work_buffer_size0,
uint64_t work_buffer_size1,
uint64_t workbuf_len0,
uint64_t workbuf_len1,
uint32_t num_loops,
uint64_t first_frame_io_position,
bool first_frame_is_opaque) {
@@ -1619,8 +1619,8 @@ 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.work_buffer_size.min_incl = work_buffer_size0;
c->private_impl.work_buffer_size.max_incl = work_buffer_size1;
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.num_loops = num_loops;
c->private_impl.first_frame_is_opaque = first_frame_is_opaque;
@@ -1642,8 +1642,8 @@ wuffs_base__image_config__is_valid(wuffs_base__image_config* c) {
}
static inline wuffs_base__range_ii_u64 //
wuffs_base__image_config__work_buffer_size(wuffs_base__image_config* c) {
return c ? c->private_impl.work_buffer_size : ((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 uint32_t //
@@ -1668,13 +1668,13 @@ wuffs_base__image_config::initialize(wuffs_base__pixel_format pixfmt,
wuffs_base__pixel_subsampling pixsub,
uint32_t width,
uint32_t height,
uint64_t work_buffer_size0,
uint64_t work_buffer_size1,
uint64_t workbuf_len0,
uint64_t workbuf_len1,
uint32_t num_loops,
uint64_t first_frame_io_position,
bool first_frame_is_opaque) {
wuffs_base__image_config__initialize(
this, pixfmt, pixsub, width, height, work_buffer_size0, work_buffer_size1,
this, pixfmt, pixsub, width, height, workbuf_len0, workbuf_len1,
num_loops, first_frame_io_position, first_frame_is_opaque);
}
@@ -1689,8 +1689,8 @@ wuffs_base__image_config::is_valid() {
}
inline wuffs_base__range_ii_u64 //
wuffs_base__image_config::work_buffer_size() {
return wuffs_base__image_config__work_buffer_size(this);
wuffs_base__image_config::workbuf_len() {
return wuffs_base__image_config__workbuf_len(this);
}
inline uint32_t //
@@ -2595,7 +2595,7 @@ typedef struct {
wuffs_base__io_reader a_src);
inline uint64_t num_decoded_frame_configs();
inline uint64_t num_decoded_frames();
inline wuffs_base__range_ii_u64 work_buffer_size();
inline wuffs_base__range_ii_u64 workbuf_len();
inline wuffs_base__status restart_frame(uint64_t a_index,
uint64_t a_io_position);
inline wuffs_base__status decode_frame_config(wuffs_base__frame_config* a_dst,
@@ -2603,7 +2603,7 @@ typedef struct {
inline wuffs_base__status decode_frame(
wuffs_base__pixel_buffer* a_dst,
wuffs_base__io_reader a_src,
wuffs_base__slice_u8 a_work_buffer,
wuffs_base__slice_u8 a_workbuf,
wuffs_base__decode_frame_options* a_opts);
#endif // __cplusplus
@@ -2635,7 +2635,7 @@ WUFFS_BASE__MAYBE_STATIC uint64_t //
wuffs_gif__decoder__num_decoded_frames(wuffs_gif__decoder* self);
WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64 //
wuffs_gif__decoder__work_buffer_size(wuffs_gif__decoder* self);
wuffs_gif__decoder__workbuf_len(wuffs_gif__decoder* self);
WUFFS_BASE__MAYBE_STATIC wuffs_base__status //
wuffs_gif__decoder__restart_frame(wuffs_gif__decoder* self,
@@ -2651,7 +2651,7 @@ WUFFS_BASE__MAYBE_STATIC wuffs_base__status //
wuffs_gif__decoder__decode_frame(wuffs_gif__decoder* self,
wuffs_base__pixel_buffer* a_dst,
wuffs_base__io_reader a_src,
wuffs_base__slice_u8 a_work_buffer,
wuffs_base__slice_u8 a_workbuf,
wuffs_base__decode_frame_options* a_opts);
// ---------------- C++ Convenience Methods
@@ -2682,8 +2682,8 @@ wuffs_gif__decoder::num_decoded_frames() {
}
inline wuffs_base__range_ii_u64 //
wuffs_gif__decoder::work_buffer_size() {
return wuffs_gif__decoder__work_buffer_size(this);
wuffs_gif__decoder::workbuf_len() {
return wuffs_gif__decoder__workbuf_len(this);
}
inline wuffs_base__status //
@@ -2700,9 +2700,9 @@ wuffs_gif__decoder::decode_frame_config(wuffs_base__frame_config* a_dst,
inline wuffs_base__status //
wuffs_gif__decoder::decode_frame(wuffs_base__pixel_buffer* a_dst,
wuffs_base__io_reader a_src,
wuffs_base__slice_u8 a_work_buffer,
wuffs_base__slice_u8 a_workbuf,
wuffs_base__decode_frame_options* a_opts) {
return wuffs_gif__decoder__decode_frame(this, a_dst, a_src, a_work_buffer,
return wuffs_gif__decoder__decode_frame(this, a_dst, a_src, a_workbuf,
a_opts);
}
@@ -3692,8 +3692,7 @@ const char* wuffs_base__error__bad_receiver = "?base: bad receiver";
const char* wuffs_base__error__bad_restart = "?base: bad restart";
const char* wuffs_base__error__bad_sizeof_receiver =
"?base: bad sizeof receiver";
const char* wuffs_base__error__bad_work_buffer_length =
"?base: bad work buffer length";
const char* wuffs_base__error__bad_workbuf_length = "?base: bad workbuf length";
const char* wuffs_base__error__bad_wuffs_version = "?base: bad wuffs version";
const char* wuffs_base__error__cannot_return_a_suspension =
"?base: cannot return a suspension";
@@ -6533,10 +6532,10 @@ wuffs_gif__decoder__num_decoded_frames(wuffs_gif__decoder* self) {
return self->private_impl.f_num_decoded_frames_value;
}
// -------- func gif.decoder.work_buffer_size
// -------- func gif.decoder.workbuf_len
WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64 //
wuffs_gif__decoder__work_buffer_size(wuffs_gif__decoder* self) {
wuffs_gif__decoder__workbuf_len(wuffs_gif__decoder* self) {
if (!self) {
return ((wuffs_base__range_ii_u64){});
}
@@ -6789,7 +6788,7 @@ WUFFS_BASE__MAYBE_STATIC wuffs_base__status //
wuffs_gif__decoder__decode_frame(wuffs_gif__decoder* self,
wuffs_base__pixel_buffer* a_dst,
wuffs_base__io_reader a_src,
wuffs_base__slice_u8 a_work_buffer,
wuffs_base__slice_u8 a_workbuf,
wuffs_base__decode_frame_options* a_opts) {
if (!self) {
return wuffs_base__error__bad_receiver;
@@ -6813,9 +6812,9 @@ wuffs_gif__decoder__decode_frame(wuffs_gif__decoder* self,
switch (coro_susp_point) {
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
if (((uint64_t)(a_work_buffer.len)) !=
if (((uint64_t)(a_workbuf.len)) !=
((uint64_t)(self->private_impl.f_width))) {
status = wuffs_base__error__bad_work_buffer_length;
status = wuffs_base__error__bad_workbuf_length;
goto exit;
}
if (self->private_impl.f_call_sequence != 2) {