Rename buf1, reader1, etc to io_buffer, io_reader

Also remove the unused Buf1, Buf2 and Usize tokens.
This commit is contained in:
Nigel Tao committed 2018-04-05 20:49:48 +10:00
1 parent 82a48796c8
commit 97aab37462
46 files changed
+823 -847

No files matched your search

+5 -5
View File
@@ -70,9 +70,9 @@ const char* play() {
wuffs_gif__decoder dec;
wuffs_gif__decoder__initialize(&dec, WUFFS_VERSION, 0);
wuffs_base__buf1 src = {
wuffs_base__io_buffer src = {
.ptr = src_buffer, .len = src_len, .wi = src_len, .closed = true};
wuffs_base__reader1 src_reader = {.buf = &src};
wuffs_base__io_reader src_reader = {.buf = &src};
wuffs_base__image_config ic = {{0}};
wuffs_gif__status s =
@@ -80,7 +80,7 @@ const char* play() {
if (s) {
return wuffs_gif__status__string(s);
}
if (!wuffs_base__image_config__valid(&ic)) {
if (!wuffs_base__image_config__is_valid(&ic)) {
return "invalid image configuration";
}
uint32_t width = wuffs_base__image_config__width(&ic);
@@ -111,8 +111,8 @@ const char* play() {
}
while (true) {
wuffs_base__buf1 dst = {.ptr = dst_buffer, .len = dst_len};
wuffs_base__writer1 dst_writer = {.buf = &dst};
wuffs_base__io_buffer dst = {.ptr = dst_buffer, .len = dst_len};
wuffs_base__io_writer dst_writer = {.buf = &dst};
// TODO: provide API and support for when the frame rect is different from
// the image rect.
s = wuffs_gif__decoder__decode_frame(&dec, dst_writer, src_reader);
+4 -4
View File
@@ -48,11 +48,11 @@ static void ignore_return_value(int ignored) {}
static const char* decode() {
uint8_t dst_buffer[DST_BUFFER_SIZE];
wuffs_base__buf1 dst = {.ptr = dst_buffer, .len = DST_BUFFER_SIZE};
wuffs_base__buf1 src = {
wuffs_base__io_buffer dst = {.ptr = dst_buffer, .len = DST_BUFFER_SIZE};
wuffs_base__io_buffer src = {
.ptr = lgtm_ptr, .len = lgtm_len, .wi = lgtm_len, .closed = true};
wuffs_base__writer1 dst_writer = {.buf = &dst};
wuffs_base__reader1 src_reader = {.buf = &src};
wuffs_base__io_writer dst_writer = {.buf = &dst};
wuffs_base__io_reader src_reader = {.buf = &src};
wuffs_deflate__decoder dec;
wuffs_deflate__decoder__initialize(&dec, WUFFS_VERSION, 0);
+7 -7
View File
@@ -65,15 +65,15 @@ static const char* decode() {
continue;
}
wuffs_base__buf1 src = {.ptr = src_buffer,
.len = SRC_BUFFER_SIZE,
.wi = n_src,
.closed = n_src == 0};
wuffs_base__reader1 src_reader = {.buf = &src};
wuffs_base__io_buffer src = {.ptr = src_buffer,
.len = SRC_BUFFER_SIZE,
.wi = n_src,
.closed = n_src == 0};
wuffs_base__io_reader src_reader = {.buf = &src};
while (true) {
wuffs_base__buf1 dst = {.ptr = dst_buffer, .len = DST_BUFFER_SIZE};
wuffs_base__writer1 dst_writer = {.buf = &dst};
wuffs_base__io_buffer dst = {.ptr = dst_buffer, .len = DST_BUFFER_SIZE};
wuffs_base__io_writer dst_writer = {.buf = &dst};
wuffs_gzip__status s =
wuffs_gzip__decoder__decode(&dec, dst_writer, src_reader);