diff --git a/example/gifplayer/gifplayer.c b/example/gifplayer/gifplayer.c index a1c13323..8abe7473 100644 --- a/example/gifplayer/gifplayer.c +++ b/example/gifplayer/gifplayer.c @@ -326,8 +326,8 @@ const char* play() { } } - s = wuffs_gif__decoder__decode_frame(&dec, &pb, src_reader, - ((wuffs_base__slice_u8){}), 0, 0); + s = wuffs_gif__decoder__decode_frame(&dec, &pb, 0, 0, src_reader, + ((wuffs_base__slice_u8){})); if (s) { if (s == WUFFS_BASE__SUSPENSION_END_OF_DATA) { break; diff --git a/fuzz/c/std/gif_fuzzer.c b/fuzz/c/std/gif_fuzzer.c index 06a5a78c..7452a3be 100644 --- a/fuzz/c/std/gif_fuzzer.c +++ b/fuzz/c/std/gif_fuzzer.c @@ -91,8 +91,8 @@ const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) { bool seen_ok = false; while (true) { - s = wuffs_gif__decoder__decode_frame(&dec, &pb, src_reader, - ((wuffs_base__slice_u8){}), 0, 0); + s = wuffs_gif__decoder__decode_frame(&dec, &pb, 0, 0, src_reader, + ((wuffs_base__slice_u8){})); if (s) { if ((s == WUFFS_BASE__SUSPENSION_END_OF_DATA) && seen_ok) { s = WUFFS_BASE__STATUS_OK; diff --git a/release/c/wuffs-unsupported-snapshot.h b/release/c/wuffs-unsupported-snapshot.h index 51c67c03..b3839976 100644 --- a/release/c/wuffs-unsupported-snapshot.h +++ b/release/c/wuffs-unsupported-snapshot.h @@ -2633,10 +2633,10 @@ typedef struct { inline wuffs_base__status decode_frame_config(wuffs_base__frame_config* a_dst, wuffs_base__io_reader a_src); 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, uint32_t a_pixbuf_origin_x, - uint32_t a_pixbuf_origin_y); + uint32_t a_pixbuf_origin_y, + wuffs_base__io_reader a_src, + wuffs_base__slice_u8 a_work_buffer); #endif // __cplusplus } wuffs_gif__decoder; @@ -2676,10 +2676,10 @@ wuffs_gif__decoder__decode_frame_config(wuffs_gif__decoder* self, 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, uint32_t a_pixbuf_origin_x, - uint32_t a_pixbuf_origin_y); + uint32_t a_pixbuf_origin_y, + wuffs_base__io_reader a_src, + wuffs_base__slice_u8 a_work_buffer); // ---------------- C++ Convenience Methods @@ -2721,12 +2721,12 @@ 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, uint32_t a_pixbuf_origin_x, - uint32_t a_pixbuf_origin_y) { - return wuffs_gif__decoder__decode_frame(this, a_dst, a_src, a_work_buffer, - a_pixbuf_origin_x, a_pixbuf_origin_y); + uint32_t a_pixbuf_origin_y, + wuffs_base__io_reader a_src, + wuffs_base__slice_u8 a_work_buffer) { + return wuffs_gif__decoder__decode_frame( + this, a_dst, a_pixbuf_origin_x, a_pixbuf_origin_y, a_src, a_work_buffer); } #endif // __cplusplus @@ -7070,10 +7070,10 @@ short_read_src: 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, uint32_t a_pixbuf_origin_x, - uint32_t a_pixbuf_origin_y) { + uint32_t a_pixbuf_origin_y, + wuffs_base__io_reader a_src, + wuffs_base__slice_u8 a_work_buffer) { if (!self) { return WUFFS_BASE__ERROR_BAD_RECEIVER; } diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index a8229011..896c4d25 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -232,7 +232,7 @@ pri func decoder.skip_frame?(src base.io_reader)() { } // TODO: honor pixbuf_origin_x and pixbuf_origin_y args. -pub func decoder.decode_frame?(dst ptr base.pixel_buffer, src base.io_reader, work_buffer slice base.u8, pixbuf_origin_x base.u32, pixbuf_origin_y base.u32)() { +pub func decoder.decode_frame?(dst ptr base.pixel_buffer, pixbuf_origin_x base.u32, pixbuf_origin_y base.u32, src base.io_reader, work_buffer slice base.u8)() { if this.call_sequence != 2 { this.decode_frame_config?(dst:nullptr, src:in.src) } diff --git a/test/c/std/gif.c b/test/c/std/gif.c index 3b98f759..a1a56df6 100644 --- a/test/c/std/gif.c +++ b/test/c/std/gif.c @@ -245,8 +245,8 @@ const char* wuffs_gif_decode(wuffs_base__io_buffer* dst, return wuffs_gif__status__string(s); } - s = wuffs_gif__decoder__decode_frame(&dec, &pb, src_reader, - ((wuffs_base__slice_u8){}), 0, 0); + s = wuffs_gif__decoder__decode_frame(&dec, &pb, 0, 0, src_reader, + ((wuffs_base__slice_u8){})); if (s) { return wuffs_gif__status__string(s); } @@ -371,7 +371,7 @@ bool do_test_wuffs_gif_decode(const char* filename, size_t old_ri = src.ri; wuffs_base__status status = wuffs_gif__decoder__decode_frame( - &dec, &pb, src_reader, ((wuffs_base__slice_u8){}), 0, 0); + &dec, &pb, 0, 0, src_reader, ((wuffs_base__slice_u8){})); if (status == WUFFS_BASE__STATUS_OK) { break; @@ -443,7 +443,7 @@ bool do_test_wuffs_gif_decode(const char* filename, } wuffs_base__io_reader src_reader = wuffs_base__io_buffer__reader(&src); wuffs_base__status status = wuffs_gif__decoder__decode_frame( - &dec, &pb, src_reader, ((wuffs_base__slice_u8){}), 0, 0); + &dec, &pb, 0, 0, src_reader, ((wuffs_base__slice_u8){})); if (status != WUFFS_BASE__SUSPENSION_END_OF_DATA) { FAIL("decode_frame: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status, wuffs_gif__status__string(status), @@ -546,8 +546,8 @@ bool do_test_wuffs_gif_decode_animated( return false; } - status = wuffs_gif__decoder__decode_frame(&dec, &pb, src_reader, - ((wuffs_base__slice_u8){}), 0, 0); + status = wuffs_gif__decoder__decode_frame(&dec, &pb, 0, 0, src_reader, + ((wuffs_base__slice_u8){})); if (status != WUFFS_BASE__STATUS_OK) { FAIL("decode_frame #%" PRIu32 ": got %" PRIi32 " (%s)", i, status, wuffs_gif__status__string(status)); @@ -570,8 +570,8 @@ bool do_test_wuffs_gif_decode_animated( } // There should be no more frames. - status = wuffs_gif__decoder__decode_frame(&dec, &pb, src_reader, - ((wuffs_base__slice_u8){}), 0, 0); + status = wuffs_gif__decoder__decode_frame(&dec, &pb, 0, 0, src_reader, + ((wuffs_base__slice_u8){})); if (status != WUFFS_BASE__SUSPENSION_END_OF_DATA) { FAIL("decode_frame: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status, wuffs_gif__status__string(status), WUFFS_BASE__SUSPENSION_END_OF_DATA, @@ -766,8 +766,8 @@ bool do_test_wuffs_gif_num_decoded(bool frame_config) { if (frame_config) { z = wuffs_gif__decoder__decode_frame_config(&dec, NULL, src_reader); } else { - z = wuffs_gif__decoder__decode_frame(&dec, &pb, src_reader, - ((wuffs_base__slice_u8){}), 0, 0); + z = wuffs_gif__decoder__decode_frame(&dec, &pb, 0, 0, src_reader, + ((wuffs_base__slice_u8){})); } if (z == WUFFS_BASE__STATUS_OK) {