Remove io_{reader,writer} C types

This commit is contained in:
Nigel Tao committed 2019-07-06 17:23:34 +10:00
1 parent f34d189236
commit aa846d2dd7
17 files changed
+194 -302

No files matched your search

+4 -14
View File
@@ -149,14 +149,10 @@ const char* wuffs_deflate_decode(wuffs_base__io_buffer* dst,
while (true) {
wuffs_base__io_buffer limited_dst = make_limited_writer(*dst, wlimit);
wuffs_base__io_writer dst_writer =
wuffs_base__io_buffer__writer(&limited_dst);
wuffs_base__io_buffer limited_src = make_limited_reader(*src, rlimit);
wuffs_base__io_reader src_reader =
wuffs_base__io_buffer__reader(&limited_src);
status = wuffs_deflate__decoder__decode_io_writer(
&dec, dst_writer, src_reader, global_work_slice);
&dec, &limited_dst, &limited_src, global_work_slice);
dst->meta.wi += limited_dst.meta.wi;
src->meta.ri += limited_src.meta.ri;
@@ -268,9 +264,6 @@ const char* test_wuffs_deflate_decode_split_src() {
return status;
}
wuffs_base__io_writer dst_writer = wuffs_base__io_buffer__writer(&got);
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
int i;
for (i = 1; i < 32; i++) {
size_t split = gt->src_offset0 + i;
@@ -291,13 +284,13 @@ const char* test_wuffs_deflate_decode_split_src() {
src.meta.ri = gt->src_offset0;
src.meta.wi = split;
const char* z0 = wuffs_deflate__decoder__decode_io_writer(
&dec, dst_writer, src_reader, global_work_slice);
&dec, &got, &src, global_work_slice);
src.meta.closed = true;
src.meta.ri = split;
src.meta.wi = gt->src_offset1;
const char* z1 = wuffs_deflate__decoder__decode_io_writer(
&dec, dst_writer, src_reader, global_work_slice);
&dec, &got, &src, global_work_slice);
if (z0 != wuffs_base__suspension__short_read) {
RETURN_FAIL("i=%d: z0: got \"%s\", want \"%s\"", i, z0,
@@ -332,14 +325,11 @@ const char* do_test_wuffs_deflate_history(int i,
got->meta.wi = 0;
wuffs_base__io_buffer limited_got = make_limited_writer(*got, wlimit);
wuffs_base__io_writer dst_writer =
wuffs_base__io_buffer__writer(&limited_got);
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(src);
dec->private_impl.f_history_index = starting_history_index;
const char* got_z = wuffs_deflate__decoder__decode_io_writer(
dec, dst_writer, src_reader, global_work_slice);
dec, &limited_got, src, global_work_slice);
got->meta.wi += limited_got.meta.wi;
if (got_z != want_z) {
RETURN_FAIL("i=%d: starting_history_index=0x%04" PRIX32
+49 -85
View File
@@ -203,8 +203,7 @@ const char* wuffs_gif_decode(wuffs_base__io_buffer* dst,
wuffs_base__image_config ic = ((wuffs_base__image_config){});
wuffs_base__frame_config fc = ((wuffs_base__frame_config){});
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(src);
status = wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
status = wuffs_gif__decoder__decode_image_config(&dec, &ic, src);
if (status) {
return status;
}
@@ -222,15 +221,15 @@ const char* wuffs_gif_decode(wuffs_base__io_buffer* dst,
}
while (true) {
status = wuffs_gif__decoder__decode_frame_config(&dec, &fc, src_reader);
status = wuffs_gif__decoder__decode_frame_config(&dec, &fc, src);
if (status == wuffs_base__warning__end_of_data) {
break;
} else if (status) {
return status;
}
status = wuffs_gif__decoder__decode_frame(&dec, &pb, src_reader,
global_work_slice, NULL);
status = wuffs_gif__decoder__decode_frame(&dec, &pb, src, global_work_slice,
NULL);
if (status) {
return status;
}
@@ -274,8 +273,7 @@ const char* do_test_wuffs_gif_decode(const char* filename,
{
wuffs_base__image_config ic = ((wuffs_base__image_config){});
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
status = wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
status = wuffs_gif__decoder__decode_image_config(&dec, &ic, &src);
if (status) {
RETURN_FAIL("decode_image_config: got \"%s\"", status);
}
@@ -323,11 +321,9 @@ const char* do_test_wuffs_gif_decode(const char* filename,
while (true) {
num_iters++;
wuffs_base__io_buffer limited_src = make_limited_reader(src, rlimit);
wuffs_base__io_reader src_reader =
wuffs_base__io_buffer__reader(&limited_src);
size_t old_ri = src.meta.ri;
status = wuffs_gif__decoder__decode_frame_config(&dec, &fc, src_reader);
status = wuffs_gif__decoder__decode_frame_config(&dec, &fc, &limited_src);
src.meta.ri += limited_src.meta.ri;
if (!status) {
@@ -349,12 +345,10 @@ const char* do_test_wuffs_gif_decode(const char* filename,
while (true) {
num_iters++;
wuffs_base__io_buffer limited_src = make_limited_reader(src, rlimit);
wuffs_base__io_reader src_reader =
wuffs_base__io_buffer__reader(&limited_src);
size_t old_ri = src.meta.ri;
const char* status = wuffs_gif__decoder__decode_frame(
&dec, &pb, src_reader, global_work_slice, NULL);
&dec, &pb, &limited_src, global_work_slice, NULL);
src.meta.ri += limited_src.meta.ri;
if (!status) {
@@ -483,8 +477,7 @@ const char* do_test_wuffs_gif_decode(const char* filename,
if (src.meta.ri == src.meta.wi) {
RETURN_FAIL("decode_frame returned \"ok\" but src was exhausted");
}
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
status = wuffs_gif__decoder__decode_frame(&dec, &pb, src_reader,
status = wuffs_gif__decoder__decode_frame(&dec, &pb, &src,
global_work_slice, NULL);
if (status != wuffs_base__warning__end_of_data) {
RETURN_FAIL("decode_frame: got \"%s\", want \"%s\"", status,
@@ -515,9 +508,8 @@ const char* do_test_wuffs_gif_decode_expecting(wuffs_base__io_buffer src,
}
wuffs_base__image_config ic = ((wuffs_base__image_config){});
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
status = wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
status = wuffs_gif__decoder__decode_image_config(&dec, &ic, &src);
if (status) {
RETURN_FAIL("decode_image_config: got \"%s\"", status);
}
@@ -529,8 +521,8 @@ const char* do_test_wuffs_gif_decode_expecting(wuffs_base__io_buffer src,
RETURN_FAIL("set_from_slice: \"%s\"", status);
}
status = wuffs_gif__decoder__decode_frame(&dec, &pb, src_reader,
global_work_slice, NULL);
status = wuffs_gif__decoder__decode_frame(&dec, &pb, &src, global_work_slice,
NULL);
if (status != want_status) {
RETURN_FAIL("decode_frame: got \"%s\", want \"%s\"", status, want_status);
}
@@ -567,10 +559,7 @@ const char* test_wuffs_gif_call_interleaved() {
{
wuffs_base__io_buffer limited_src = make_limited_reader(src, 700);
wuffs_base__io_reader src_reader =
wuffs_base__io_buffer__reader(&limited_src);
status = wuffs_gif__decoder__decode_frame_config(&dec, NULL, src_reader);
status = wuffs_gif__decoder__decode_frame_config(&dec, NULL, &limited_src);
src.meta.ri += limited_src.meta.ri;
if (status != wuffs_base__suspension__short_read) {
RETURN_FAIL("decode_frame_config: got \"%s\", want \"%s\"", status,
@@ -583,9 +572,7 @@ const char* test_wuffs_gif_call_interleaved() {
// wuffs_base__error__interleaved_coroutine_calls.
{
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
status = wuffs_gif__decoder__decode_image_config(&dec, NULL, src_reader);
status = wuffs_gif__decoder__decode_image_config(&dec, NULL, &src);
if (status != wuffs_base__error__interleaved_coroutine_calls) {
RETURN_FAIL("decode_image_config: got \"%s\", want \"%s\"", status,
wuffs_base__error__interleaved_coroutine_calls);
@@ -615,14 +602,12 @@ const char* test_wuffs_gif_call_sequence() {
RETURN_FAIL("initialize: \"%s\"", status);
}
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
status = wuffs_gif__decoder__decode_image_config(&dec, NULL, src_reader);
status = wuffs_gif__decoder__decode_image_config(&dec, NULL, &src);
if (status) {
RETURN_FAIL("decode_image_config: got \"%s\"", status);
}
status = wuffs_gif__decoder__decode_image_config(&dec, NULL, src_reader);
status = wuffs_gif__decoder__decode_image_config(&dec, NULL, &src);
if (status != wuffs_base__error__bad_call_sequence) {
RETURN_FAIL("decode_image_config: got \"%s\", want \"%s\"", status,
wuffs_base__error__bad_call_sequence);
@@ -653,9 +638,8 @@ const char* do_test_wuffs_gif_decode_animated(
}
wuffs_base__image_config ic = ((wuffs_base__image_config){});
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
status = wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
status = wuffs_gif__decoder__decode_image_config(&dec, &ic, &src);
if (status) {
RETURN_FAIL("decode_image_config: got \"%s\"", status);
}
@@ -676,7 +660,7 @@ const char* do_test_wuffs_gif_decode_animated(
uint32_t i;
for (i = 0; i < want_num_frames; i++) {
wuffs_base__frame_config fc = ((wuffs_base__frame_config){});
status = wuffs_gif__decoder__decode_frame_config(&dec, &fc, src_reader);
status = wuffs_gif__decoder__decode_frame_config(&dec, &fc, &src);
if (status) {
RETURN_FAIL("decode_frame_config #%" PRIu32 ": got \"%s\"", i, status);
}
@@ -694,7 +678,7 @@ const char* do_test_wuffs_gif_decode_animated(
}
}
status = wuffs_gif__decoder__decode_frame(&dec, &pb, src_reader,
status = wuffs_gif__decoder__decode_frame(&dec, &pb, &src,
global_work_slice, NULL);
if (status) {
RETURN_FAIL("decode_frame #%" PRIu32 ": got \"%s\"", i, status);
@@ -711,7 +695,7 @@ const char* do_test_wuffs_gif_decode_animated(
// There should be no more frames, no matter how many times we call
// decode_frame.
for (i = 0; i < 3; i++) {
status = wuffs_gif__decoder__decode_frame(&dec, &pb, src_reader,
status = wuffs_gif__decoder__decode_frame(&dec, &pb, &src,
global_work_slice, NULL);
if (status != wuffs_base__warning__end_of_data) {
RETURN_FAIL("decode_frame: got \"%s\", want \"%s\"", status,
@@ -795,8 +779,7 @@ const char* test_wuffs_gif_decode_delay_num_frames_decoded() {
&dec, wuffs_gif__quirk_delay_num_decoded_frames, q);
while (true) {
status = wuffs_gif__decoder__decode_frame_config(
&dec, NULL, wuffs_base__io_buffer__reader(&src));
status = wuffs_gif__decoder__decode_frame_config(&dec, NULL, &src);
if (status) {
break;
}
@@ -837,8 +820,7 @@ const char* test_wuffs_gif_decode_empty_palette() {
&dec, wuffs_gif__quirk_reject_empty_palette, q);
wuffs_base__image_config ic = ((wuffs_base__image_config){});
status = wuffs_gif__decoder__decode_image_config(
&dec, &ic, wuffs_base__io_buffer__reader(&src));
status = wuffs_gif__decoder__decode_image_config(&dec, &ic, &src);
if (status) {
RETURN_FAIL("q=%d: decode_image_config: \"%s\"", q, status);
}
@@ -852,9 +834,8 @@ const char* test_wuffs_gif_decode_empty_palette() {
int i;
for (i = 0; i < 2; i++) {
status = wuffs_gif__decoder__decode_frame(
&dec, &pb, wuffs_base__io_buffer__reader(&src), global_work_slice,
NULL);
status = wuffs_gif__decoder__decode_frame(&dec, &pb, &src,
global_work_slice, NULL);
if ((q == 1) && (i == 1)) {
if (status != wuffs_gif__error__bad_palette) {
RETURN_FAIL("q=%d: i=%d: decode_frame: got \"%s\", want \"%s\"", q, i,
@@ -910,8 +891,7 @@ const char* test_wuffs_gif_decode_background_color() {
&dec, wuffs_gif__quirk_honor_background_color, q);
wuffs_base__frame_config fc = ((wuffs_base__frame_config){});
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
status = wuffs_gif__decoder__decode_frame_config(&dec, &fc, src_reader);
status = wuffs_gif__decoder__decode_frame_config(&dec, &fc, &src);
if (status) {
RETURN_FAIL("q=%d: decode_frame_config: \"%s\"", q, status);
}
@@ -952,8 +932,7 @@ const char* test_wuffs_gif_decode_first_frame_is_opaque() {
&dec, wuffs_gif__quirk_honor_background_color, q);
wuffs_base__image_config ic = ((wuffs_base__image_config){});
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
status = wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
status = wuffs_gif__decoder__decode_image_config(&dec, &ic, &src);
if (status) {
RETURN_FAIL("q=%d: decode_image_config: \"%s\"", q, status);
}
@@ -995,8 +974,7 @@ const char* test_wuffs_gif_decode_frame_out_of_bounds() {
&dec, wuffs_gif__quirk_image_bounds_are_strict, q);
wuffs_base__image_config ic = ((wuffs_base__image_config){});
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
status = wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
status = wuffs_gif__decoder__decode_image_config(&dec, &ic, &src);
if (status) {
RETURN_FAIL("q=%d: decode_image_config: \"%s\"", q, status);
}
@@ -1046,7 +1024,7 @@ const char* test_wuffs_gif_decode_frame_out_of_bounds() {
for (i = 0; true; i++) {
wuffs_base__frame_config fc = ((wuffs_base__frame_config){});
{
status = wuffs_gif__decoder__decode_frame_config(&dec, &fc, src_reader);
status = wuffs_gif__decoder__decode_frame_config(&dec, &fc, &src);
if (i == WUFFS_TESTLIB_ARRAY_SIZE(want_frame_config_bounds)) {
if (status != wuffs_base__warning__end_of_data) {
RETURN_FAIL("q=%d: decode_frame_config #%" PRIu32 ": got \"%s\"", q,
@@ -1081,7 +1059,7 @@ const char* test_wuffs_gif_decode_frame_out_of_bounds() {
}
}
status = wuffs_gif__decoder__decode_frame(&dec, &pb, src_reader,
status = wuffs_gif__decoder__decode_frame(&dec, &pb, &src,
global_work_slice, NULL);
if (status) {
RETURN_FAIL("q=%d: decode_frame #%" PRIu32 ": got \"%s\"", q, i,
@@ -1159,8 +1137,7 @@ const char* test_wuffs_gif_decode_zero_width_frame() {
}
wuffs_base__image_config ic = ((wuffs_base__image_config){});
status = wuffs_gif__decoder__decode_image_config(
&dec, &ic, wuffs_base__io_buffer__reader(&src));
status = wuffs_gif__decoder__decode_image_config(&dec, &ic, &src);
if (status) {
RETURN_FAIL("q=%d: decode_image_config: \"%s\"", q, status);
}
@@ -1172,9 +1149,8 @@ const char* test_wuffs_gif_decode_zero_width_frame() {
RETURN_FAIL("q=%d: set_from_slice: \"%s\"", q, status);
}
const char* got = wuffs_gif__decoder__decode_frame(
&dec, &pb, wuffs_base__io_buffer__reader(&src), global_work_slice,
NULL);
const char* got = wuffs_gif__decoder__decode_frame(&dec, &pb, &src,
global_work_slice, NULL);
if (got != want) {
RETURN_FAIL("q=%d: decode_frame: got \"%s\", want \"%s\"", q, got, want);
}
@@ -1270,9 +1246,8 @@ const char* test_wuffs_gif_decode_input_is_a_png() {
RETURN_FAIL("initialize: \"%s\"", status);
}
wuffs_base__image_config ic = ((wuffs_base__image_config){});
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
status = wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
status = wuffs_gif__decoder__decode_image_config(&dec, &ic, &src);
if (status != wuffs_gif__error__bad_header) {
RETURN_FAIL("decode_image_config: got \"%s\", want \"%s\"", status,
wuffs_gif__error__bad_header);
@@ -1320,8 +1295,7 @@ const char* test_wuffs_gif_decode_metadata() {
src.meta.ri = 0;
while (true) {
status = wuffs_gif__decoder__decode_image_config(
&dec, &ic, wuffs_base__io_buffer__reader(&src));
status = wuffs_gif__decoder__decode_image_config(&dec, &ic, &src);
if (!status) {
break;
} else if (status != wuffs_base__warning__metadata_reported) {
@@ -1369,8 +1343,7 @@ const char* test_wuffs_gif_decode_metadata() {
got_length += n;
src.meta.ri += n;
status = wuffs_gif__decoder__ack_metadata_chunk(
&dec, wuffs_base__io_buffer__reader(&src));
status = wuffs_gif__decoder__ack_metadata_chunk(&dec, &src);
if (!status) {
break;
} else if (status != wuffs_base__warning__metadata_reported) {
@@ -1419,8 +1392,7 @@ const char* test_wuffs_gif_decode_metadata() {
{
wuffs_base__frame_config fc = ((wuffs_base__frame_config){});
status = wuffs_gif__decoder__decode_frame_config(
&dec, &fc, wuffs_base__io_buffer__reader(&src));
status = wuffs_gif__decoder__decode_frame_config(&dec, &fc, &src);
if (status) {
RETURN_FAIL("decode_frame_config (iccp=%d, xmp=%d): %s", iccp, xmp,
status);
@@ -1481,8 +1453,7 @@ const char* test_wuffs_gif_decode_multiple_graphic_controls() {
RETURN_FAIL("initialize: \"%s\"", status);
}
wuffs_base__frame_config fc = ((wuffs_base__frame_config){});
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
status = wuffs_gif__decoder__decode_frame_config(&dec, &fc, src_reader);
status = wuffs_gif__decoder__decode_frame_config(&dec, &fc, &src);
if (status) {
RETURN_FAIL("decode_frame_config: \"%s\"", status);
}
@@ -1515,8 +1486,7 @@ const char* test_wuffs_gif_decode_multiple_loop_counts() {
RETURN_FAIL("initialize: \"%s\"", status);
}
wuffs_base__image_config ic = ((wuffs_base__image_config){});
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
status = wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
status = wuffs_gif__decoder__decode_image_config(&dec, &ic, &src);
if (status) {
RETURN_FAIL("decode_image_config: \"%s\"", status);
}
@@ -1531,7 +1501,7 @@ const char* test_wuffs_gif_decode_multiple_loop_counts() {
uint32_t i;
for (i = 0; true; i++) {
{
status = wuffs_gif__decoder__decode_frame_config(&dec, NULL, src_reader);
status = wuffs_gif__decoder__decode_frame_config(&dec, NULL, &src);
if (i == WUFFS_TESTLIB_ARRAY_SIZE(want_num_animation_loops)) {
if (status != wuffs_base__warning__end_of_data) {
RETURN_FAIL("decode_frame_config #%" PRIu32 ": got \"%s\"", i,
@@ -1652,8 +1622,7 @@ const char* test_wuffs_gif_frame_dirty_rect() {
}
wuffs_base__image_config ic = ((wuffs_base__image_config){});
status = wuffs_gif__decoder__decode_image_config(
&dec, &ic, wuffs_base__io_buffer__reader(&src));
status = wuffs_gif__decoder__decode_image_config(&dec, &ic, &src);
if (status) {
RETURN_FAIL("decode_image_config: \"%s\"", status);
}
@@ -1675,10 +1644,8 @@ const char* test_wuffs_gif_frame_dirty_rect() {
while (true) {
wuffs_base__io_buffer limited_src = make_limited_reader(src, 1);
wuffs_base__io_reader src_reader =
wuffs_base__io_buffer__reader(&limited_src);
status = wuffs_gif__decoder__decode_frame(&dec, &pb, src_reader,
status = wuffs_gif__decoder__decode_frame(&dec, &pb, &limited_src,
global_work_slice, NULL);
src.meta.ri += limited_src.meta.ri;
@@ -1718,12 +1685,11 @@ const char* do_test_wuffs_gif_num_decoded(bool frame_config) {
if (status) {
RETURN_FAIL("initialize: \"%s\"", status);
}
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
wuffs_base__pixel_buffer pb = ((wuffs_base__pixel_buffer){});
if (!frame_config) {
wuffs_base__image_config ic = ((wuffs_base__image_config){});
status = wuffs_gif__decoder__decode_image_config(&dec, &ic, src_reader);
status = wuffs_gif__decoder__decode_image_config(&dec, &ic, &src);
if (status) {
RETURN_FAIL("decode_image_config: \"%s\"", status);
}
@@ -1753,9 +1719,9 @@ const char* do_test_wuffs_gif_num_decoded(bool frame_config) {
const char* status = NULL;
if (frame_config) {
status = wuffs_gif__decoder__decode_frame_config(&dec, NULL, src_reader);
status = wuffs_gif__decoder__decode_frame_config(&dec, NULL, &src);
} else {
status = wuffs_gif__decoder__decode_frame(&dec, &pb, src_reader,
status = wuffs_gif__decoder__decode_frame(&dec, &pb, &src,
global_work_slice, NULL);
}
@@ -1801,8 +1767,6 @@ const char* do_test_wuffs_gif_io_position(bool chunked) {
RETURN_FAIL("initialize: \"%s\"", status);
}
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
if (chunked) {
if (src.meta.wi < 50) {
RETURN_FAIL("src is too short");
@@ -1812,7 +1776,7 @@ const char* do_test_wuffs_gif_io_position(bool chunked) {
src.meta.wi = 30;
src.meta.closed = false;
status = wuffs_gif__decoder__decode_image_config(&dec, NULL, src_reader);
status = wuffs_gif__decoder__decode_image_config(&dec, NULL, &src);
if (status != wuffs_base__suspension__short_read) {
RETURN_FAIL("decode_image_config (chunked): \"%s\"", status);
}
@@ -1829,7 +1793,7 @@ const char* do_test_wuffs_gif_io_position(bool chunked) {
}
}
status = wuffs_gif__decoder__decode_image_config(&dec, NULL, src_reader);
status = wuffs_gif__decoder__decode_image_config(&dec, NULL, &src);
if (status) {
RETURN_FAIL("decode_image_config: \"%s\"", status);
}
@@ -1840,7 +1804,7 @@ const char* do_test_wuffs_gif_io_position(bool chunked) {
int i;
for (i = 0; i < 4; i++) {
fcs[i] = ((wuffs_base__frame_config){});
status = wuffs_gif__decoder__decode_frame_config(&dec, &fcs[i], src_reader);
status = wuffs_gif__decoder__decode_frame_config(&dec, &fcs[i], &src);
if (status) {
RETURN_FAIL("decode_frame_config #%d: \"%s\"", i, status);
}
@@ -1885,7 +1849,7 @@ const char* do_test_wuffs_gif_io_position(bool chunked) {
}
}
status = wuffs_gif__decoder__decode_frame_config(&dec, NULL, src_reader);
status = wuffs_gif__decoder__decode_frame_config(&dec, NULL, &src);
if (status != wuffs_base__warning__end_of_data) {
RETURN_FAIL("decode_frame_config EOD: \"%s\"", status);
}
@@ -1909,7 +1873,7 @@ const char* do_test_wuffs_gif_io_position(bool chunked) {
int j;
for (j = i; j < 4; j++) {
wuffs_base__frame_config fc = ((wuffs_base__frame_config){});
status = wuffs_gif__decoder__decode_frame_config(&dec, &fc, src_reader);
status = wuffs_gif__decoder__decode_frame_config(&dec, &fc, &src);
if (status) {
RETURN_FAIL("decode_frame_config #%d, #%d: \"%s\"", i, j, status);
}
@@ -1929,7 +1893,7 @@ const char* do_test_wuffs_gif_io_position(bool chunked) {
}
}
status = wuffs_gif__decoder__decode_frame_config(&dec, NULL, src_reader);
status = wuffs_gif__decoder__decode_frame_config(&dec, NULL, &src);
if (status != wuffs_base__warning__end_of_data) {
RETURN_FAIL("decode_frame_config EOD #%d: \"%s\"", i, status);
}
+3 -11
View File
@@ -97,14 +97,10 @@ const char* wuffs_gzip_decode(wuffs_base__io_buffer* dst,
while (true) {
wuffs_base__io_buffer limited_dst = make_limited_writer(*dst, wlimit);
wuffs_base__io_writer dst_writer =
wuffs_base__io_buffer__writer(&limited_dst);
wuffs_base__io_buffer limited_src = make_limited_reader(*src, rlimit);
wuffs_base__io_reader src_reader =
wuffs_base__io_buffer__reader(&limited_src);
status = wuffs_gzip__decoder__decode_io_writer(&dec, dst_writer, src_reader,
global_work_slice);
status = wuffs_gzip__decoder__decode_io_writer(
&dec, &limited_dst, &limited_src, global_work_slice);
dst->meta.wi += limited_dst.meta.wi;
src->meta.ri += limited_src.meta.ri;
@@ -152,7 +148,6 @@ const char* do_test_wuffs_gzip_checksum(bool ignore_checksum,
}
wuffs_gzip__decoder__set_ignore_checksum(&dec, ignore_checksum);
got.meta.wi = 0;
wuffs_base__io_writer got_writer = wuffs_base__io_buffer__writer(&got);
src.meta.ri = 0;
// Decode the src data in 1 or 2 chunks, depending on whether end_limit is
@@ -177,11 +172,8 @@ const char* do_test_wuffs_gzip_checksum(bool ignore_checksum,
}
wuffs_base__io_buffer limited_src = make_limited_reader(src, rlimit);
wuffs_base__io_reader src_reader =
wuffs_base__io_buffer__reader(&limited_src);
const char* got_z = wuffs_gzip__decoder__decode_io_writer(
&dec, got_writer, src_reader, global_work_slice);
&dec, &got, &limited_src, global_work_slice);
src.meta.ri += limited_src.meta.ri;
if (got_z != want_z) {
RETURN_FAIL("end_limit=%d: got \"%s\", want \"%s\"", end_limit, got_z,
+9 -18
View File
@@ -119,16 +119,12 @@ const char* do_test_wuffs_lzw_decode(const char* src_filename,
while (true) {
num_iters++;
wuffs_base__io_buffer limited_got = make_limited_writer(got, wlimit);
wuffs_base__io_writer got_writer =
wuffs_base__io_buffer__writer(&limited_got);
wuffs_base__io_buffer limited_src = make_limited_reader(src, rlimit);
wuffs_base__io_reader src_reader =
wuffs_base__io_buffer__reader(&limited_src);
size_t old_wi = got.meta.wi;
size_t old_ri = src.meta.ri;
status = wuffs_lzw__decoder__decode_io_writer(&dec, got_writer, src_reader,
global_work_slice);
status = wuffs_lzw__decoder__decode_io_writer(
&dec, &limited_got, &limited_src, global_work_slice);
got.meta.wi += limited_got.meta.wi;
src.meta.ri += limited_src.meta.ri;
if (!status) {
@@ -235,9 +231,8 @@ const char* test_wuffs_lzw_decode_output_bad() {
}
wuffs_lzw__decoder__set_literal_width(&dec, 7);
status = wuffs_lzw__decoder__decode_io_writer(
&dec, wuffs_base__io_buffer__writer(&got),
wuffs_base__io_buffer__reader(&src), global_work_slice);
status =
wuffs_lzw__decoder__decode_io_writer(&dec, &got, &src, global_work_slice);
if (status != wuffs_lzw__error__bad_code) {
RETURN_FAIL("decode: \"%s\"", status);
}
@@ -280,9 +275,8 @@ const char* test_wuffs_lzw_decode_output_empty() {
}
wuffs_lzw__decoder__set_literal_width(&dec, 8);
status = wuffs_lzw__decoder__decode_io_writer(
&dec, wuffs_base__io_buffer__writer(&got),
wuffs_base__io_buffer__reader(&src), global_work_slice);
status =
wuffs_lzw__decoder__decode_io_writer(&dec, &got, &src, global_work_slice);
if (status) {
RETURN_FAIL("decode: \"%s\"", status);
}
@@ -311,9 +305,8 @@ const char* do_test_wuffs_lzw_decode_width(uint32_t width,
wuffs_base__io_buffer got = ((wuffs_base__io_buffer){
.data = global_got_slice,
});
status = wuffs_lzw__decoder__decode_io_writer(
&dec, wuffs_base__io_buffer__writer(&got),
wuffs_base__io_buffer__reader(&src), global_work_slice);
status =
wuffs_lzw__decoder__decode_io_writer(&dec, &got, &src, global_work_slice);
if (status) {
RETURN_FAIL("decode: \"%s\"", status);
}
@@ -394,8 +387,6 @@ const char* do_bench_wuffs_lzw_decode(const char* filename,
wuffs_base__io_buffer src = ((wuffs_base__io_buffer){
.data = global_src_slice,
});
wuffs_base__io_writer got_writer = wuffs_base__io_buffer__writer(&got);
wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src);
const char* status = read_file(&src, filename);
if (status) {
@@ -424,7 +415,7 @@ const char* do_bench_wuffs_lzw_decode(const char* filename,
if (status) {
RETURN_FAIL("initialize: \"%s\"", status);
}
status = wuffs_lzw__decoder__decode_io_writer(&dec, got_writer, src_reader,
status = wuffs_lzw__decoder__decode_io_writer(&dec, &got, &src,
global_work_slice);
if (status) {
RETURN_FAIL("decode: \"%s\"", status);
+3 -10
View File
@@ -97,14 +97,10 @@ const char* wuffs_zlib_decode(wuffs_base__io_buffer* dst,
while (true) {
wuffs_base__io_buffer limited_dst = make_limited_writer(*dst, wlimit);
wuffs_base__io_writer dst_writer =
wuffs_base__io_buffer__writer(&limited_dst);
wuffs_base__io_buffer limited_src = make_limited_reader(*src, rlimit);
wuffs_base__io_reader src_reader =
wuffs_base__io_buffer__reader(&limited_src);
status = wuffs_zlib__decoder__decode_io_writer(&dec, dst_writer, src_reader,
global_work_slice);
status = wuffs_zlib__decoder__decode_io_writer(
&dec, &limited_dst, &limited_src, global_work_slice);
dst->meta.wi += limited_dst.meta.wi;
src->meta.ri += limited_src.meta.ri;
@@ -151,7 +147,6 @@ const char* do_test_wuffs_zlib_checksum(bool ignore_checksum,
}
wuffs_zlib__decoder__set_ignore_checksum(&dec, ignore_checksum);
got.meta.wi = 0;
wuffs_base__io_writer got_writer = wuffs_base__io_buffer__writer(&got);
src.meta.ri = 0;
// Decode the src data in 1 or 2 chunks, depending on whether end_limit is
@@ -176,11 +171,9 @@ const char* do_test_wuffs_zlib_checksum(bool ignore_checksum,
}
wuffs_base__io_buffer limited_src = make_limited_reader(src, rlimit);
wuffs_base__io_reader src_reader =
wuffs_base__io_buffer__reader(&limited_src);
const char* got_z = wuffs_zlib__decoder__decode_io_writer(
&dec, got_writer, src_reader, global_work_slice);
&dec, &got, &limited_src, global_work_slice);
src.meta.ri += limited_src.meta.ri;
if (got_z != want_z) {
RETURN_FAIL("end_limit=%d: got \"%s\", want \"%s\"", end_limit, got_z,