diff --git a/doc/changelog.md b/doc/changelog.md index dc3be484..85c09039 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -10,7 +10,7 @@ The LICENSE has changed from a single license (Apache 2) to a dual license - Added `base.optional_u63`. - Added `base.hasher_bitvec256`. - Added `base.hasher_u64`. -- Added `compact_retaining` and `history_retain_length`. +- Added `compact_retaining` and `dst_history_retain_length`. - Added `example/toy-aux-image`. - Added `get_quirk(key: u32) u64`. - Added `hasher_u32` `update!` and `checksum_u32` methods. diff --git a/doc/std/compression-decoders.md b/doc/std/compression-decoders.md index 6d7dba66..6f906bb8 100644 --- a/doc/std/compression-decoders.md +++ b/doc/std/compression-decoders.md @@ -25,8 +25,8 @@ APIs](https://github.com/google/wuffs/issues/73), after Wuffs v0.2 is released. In Wuffs syntax, the `base.io_transformer` methods are: +- `dst_history_retain_length() u64` - `get_quirk(key: u32) u64` -- `history_retain_length() u64` - `set_quirk!(key: u32, value: u64) status` - `transform_io?(dst: io_writer, src: io_reader, workbuf: slice u8)` - `workbuf_len() range_ii_u64` diff --git a/doc/std/image-decoders.md b/doc/std/image-decoders.md index 42c47d40..6ec5de29 100644 --- a/doc/std/image-decoders.md +++ b/doc/std/image-decoders.md @@ -111,7 +111,6 @@ In Wuffs syntax, the `base.image_decoder` methods are: - `decode_image_config?(dst: nptr image_config, src: io_reader)` - `frame_dirty_rect() rect_ie_u32` - `get_quirk(key: u32) u64` -- `history_retain_length() u64` - `num_animation_loops() u32` - `num_decoded_frame_configs() u64` - `num_decoded_frames() u64` diff --git a/example/bzcat/bzcat.c b/example/bzcat/bzcat.c index 2c9e7da5..708aebcc 100644 --- a/example/bzcat/bzcat.c +++ b/example/bzcat/bzcat.c @@ -191,12 +191,20 @@ main1(int argc, char** argv) { wuffs_base__make_slice_u8(g_work_buffer_array, WORK_BUFFER_ARRAY_SIZE)); - if (dst.meta.wi) { + if (dst.meta.ri < dst.meta.wi) { // TODO: handle EINTR and other write errors; see "man 2 write". const int stdout_fd = 1; - ignore_return_value(write(stdout_fd, g_dst_buffer_array, dst.meta.wi)); + ignore_return_value(write(stdout_fd, g_dst_buffer_array + dst.meta.ri, + dst.meta.wi - dst.meta.ri)); dst.meta.ri = dst.meta.wi; - wuffs_base__io_buffer__compact(&dst); + + wuffs_base__optional_u63 hrl = + wuffs_bzip2__decoder__dst_history_retain_length(&dec); + wuffs_base__io_buffer__compact_retaining( + &dst, wuffs_base__optional_u63__value_or(&hrl, UINT64_MAX)); + if (dst.meta.wi == dst.data.len) { + return "main: unsupported history length (a.k.a. dictionary size)"; + } } if (status.repr == wuffs_base__suspension__short_read) { @@ -208,13 +216,7 @@ main1(int argc, char** argv) { return wuffs_base__status__message(&status); } - wuffs_base__optional_u63 hrl = - wuffs_bzip2__decoder__history_retain_length(&dec); - wuffs_base__io_buffer__compact_retaining( - &src, wuffs_base__optional_u63__value_or(&hrl, UINT64_MAX)); - if (src.meta.wi == src.data.len) { - return "main: internal error: no I/O progress possible"; - } + wuffs_base__io_buffer__compact(&src); } } diff --git a/example/convert-to-nia/convert-to-nia.c b/example/convert-to-nia/convert-to-nia.c index 6e2ca477..08434205 100644 --- a/example/convert-to-nia/convert-to-nia.c +++ b/example/convert-to-nia/convert-to-nia.c @@ -251,14 +251,11 @@ static void // ignore_return_value(int ignored) {} const char* // -read_more_src(wuffs_base__optional_u63 history_retain_length) { +read_more_src() { if (g_src.meta.closed) { return "main: unexpected end of file"; } - if (wuffs_base__optional_u63__has_value(&history_retain_length)) { - wuffs_base__io_buffer__compact_retaining( - &g_src, wuffs_base__optional_u63__value(&history_retain_length)); - } + wuffs_base__io_buffer__compact(&g_src); if (g_src.meta.wi == g_src.data.len) { return "main: internal error: no I/O progress possible"; } @@ -287,7 +284,7 @@ load_image_type() { (wuffs_base__io_buffer__reader_length(&g_src) == g_src.data.len)) { break; } - TRY(read_more_src(wuffs_base__make_optional_u63(true, 0))); + TRY(read_more_src()); } return NULL; } @@ -412,7 +409,7 @@ advance_for_redirect() { break; } g_src.meta.ri = g_src.meta.wi; - TRY(read_more_src(wuffs_base__make_optional_u63(true, 0))); + TRY(read_more_src()); } return NULL; } @@ -439,8 +436,7 @@ redirect: } else if (status.repr != wuffs_base__suspension__short_read) { return wuffs_base__status__message(&status); } - TRY(read_more_src( - wuffs_base__image_decoder__history_retain_length(g_image_decoder))); + TRY(read_more_src()); } // Read the dimensions. @@ -639,8 +635,7 @@ convert_frames() { } else if (dfc_status.repr != wuffs_base__suspension__short_read) { return wuffs_base__status__message(&dfc_status); } - TRY(read_more_src( - wuffs_base__image_decoder__history_retain_length(g_image_decoder))); + TRY(read_more_src()); } wuffs_base__flicks duration = @@ -682,8 +677,7 @@ convert_frames() { if (df_status.repr != wuffs_base__suspension__short_read) { break; } - decode_frame_io_error_message = read_more_src( - wuffs_base__image_decoder__history_retain_length(g_image_decoder)); + decode_frame_io_error_message = read_more_src(); if (decode_frame_io_error_message != NULL) { // Neuter the "short read" df_status so that convert_frames returns the // I/O error message instead. diff --git a/example/jsonptr/jsonptr.cc b/example/jsonptr/jsonptr.cc index 17ad8244..7f9dc09f 100644 --- a/example/jsonptr/jsonptr.cc +++ b/example/jsonptr/jsonptr.cc @@ -997,11 +997,11 @@ static void // ignore_return_value(int ignored) {} const char* // -read_src(uint64_t history_retain_length) { +read_src() { if (g_src.meta.closed) { return "main: internal error: read requested on a closed source"; } - g_src.compact_retaining(history_retain_length); + g_src.compact(); if (g_src.meta.wi >= g_src.data.len) { return "main: g_src buffer is full"; } @@ -1394,7 +1394,7 @@ main1(int argc, char** argv) { } // Check that we've exhausted the input. if ((g_src.meta.ri == g_src.meta.wi) && !g_src.meta.closed) { - TRY(read_src(g_dec.history_retain_length().value_or(UINT64_MAX))); + TRY(read_src()); } if ((g_src.meta.ri < g_src.meta.wi) || !g_src.meta.closed) { return "main: valid JSON followed by further (unexpected) data"; @@ -1405,7 +1405,7 @@ main1(int argc, char** argv) { if (g_cursor_index != g_src.meta.ri) { return "main: internal error: inconsistent g_src indexes"; } - TRY(read_src(g_dec.history_retain_length().value_or(UINT64_MAX))); + TRY(read_src()); g_cursor_index = g_src.meta.ri; } else if (status.repr == wuffs_base__suspension__short_write) { g_tok.compact(); diff --git a/example/sdl-imageviewer/sdl-imageviewer.cc b/example/sdl-imageviewer/sdl-imageviewer.cc index 3d186f0a..95669317 100644 --- a/example/sdl-imageviewer/sdl-imageviewer.cc +++ b/example/sdl-imageviewer/sdl-imageviewer.cc @@ -189,7 +189,7 @@ class Wuffs_Load_RW_Input : public wuffs_aux::sync_io::Input { private: std::string // - CopyIn(wuffs_aux::IOBuffer* dst, uint64_t history_retain_length) override { + CopyIn(wuffs_aux::IOBuffer* dst) override { if (!m_rw) { return "Wuffs_Load_RW_Input: NULL SDL_RWops"; } else if (!dst) { @@ -197,7 +197,7 @@ class Wuffs_Load_RW_Input : public wuffs_aux::sync_io::Input { } else if (dst->meta.closed) { return "Wuffs_Load_RW_Input: end of file"; } - dst->compact_retaining(history_retain_length); + dst->compact(); if (dst->writer_length() == 0) { return "Wuffs_Load_RW_Input: full IOBuffer"; } diff --git a/example/zcat/zcat.c b/example/zcat/zcat.c index 8d4073ec..4fb9a00d 100644 --- a/example/zcat/zcat.c +++ b/example/zcat/zcat.c @@ -193,12 +193,20 @@ main1(int argc, char** argv) { wuffs_base__make_slice_u8(g_work_buffer_array, WORK_BUFFER_ARRAY_SIZE)); - if (dst.meta.wi) { + if (dst.meta.ri < dst.meta.wi) { // TODO: handle EINTR and other write errors; see "man 2 write". const int stdout_fd = 1; - ignore_return_value(write(stdout_fd, g_dst_buffer_array, dst.meta.wi)); + ignore_return_value(write(stdout_fd, g_dst_buffer_array + dst.meta.ri, + dst.meta.wi - dst.meta.ri)); dst.meta.ri = dst.meta.wi; - wuffs_base__io_buffer__compact(&dst); + + wuffs_base__optional_u63 hrl = + wuffs_gzip__decoder__dst_history_retain_length(&dec); + wuffs_base__io_buffer__compact_retaining( + &dst, wuffs_base__optional_u63__value_or(&hrl, UINT64_MAX)); + if (dst.meta.wi == dst.data.len) { + return "main: unsupported history length (a.k.a. dictionary size)"; + } } if (status.repr == wuffs_base__suspension__short_read) { @@ -210,13 +218,7 @@ main1(int argc, char** argv) { return wuffs_base__status__message(&status); } - wuffs_base__optional_u63 hrl = - wuffs_gzip__decoder__history_retain_length(&dec); - wuffs_base__io_buffer__compact_retaining( - &src, wuffs_base__optional_u63__value_or(&hrl, UINT64_MAX)); - if (src.meta.wi == src.data.len) { - return "main: internal error: no I/O progress possible"; - } + wuffs_base__io_buffer__compact(&src); } } diff --git a/internal/cgen/auxiliary/base.cc b/internal/cgen/auxiliary/base.cc index 5b21738d..3622285b 100644 --- a/internal/cgen/auxiliary/base.cc +++ b/internal/cgen/auxiliary/base.cc @@ -108,7 +108,7 @@ Input::BringsItsOwnIOBuffer() { FileInput::FileInput(FILE* f) : m_f(f) {} std::string // -FileInput::CopyIn(IOBuffer* dst, uint64_t history_retain_length) { +FileInput::CopyIn(IOBuffer* dst) { if (!m_f) { return "wuffs_aux::sync_io::FileInput: nullptr file"; } else if (!dst) { @@ -116,7 +116,7 @@ FileInput::CopyIn(IOBuffer* dst, uint64_t history_retain_length) { } else if (dst->meta.closed) { return "wuffs_aux::sync_io::FileInput: end of file"; } else { - dst->compact_retaining(history_retain_length); + dst->compact(); size_t n = fread(dst->writer_pointer(), 1, dst->writer_length(), m_f); dst->meta.wi += n; dst->meta.closed = feof(m_f); @@ -144,7 +144,7 @@ MemoryInput::BringsItsOwnIOBuffer() { } std::string // -MemoryInput::CopyIn(IOBuffer* dst, uint64_t history_retain_length) { +MemoryInput::CopyIn(IOBuffer* dst) { if (!dst) { return "wuffs_aux::sync_io::MemoryInput: nullptr IOBuffer"; } else if (dst->meta.closed) { @@ -154,7 +154,7 @@ MemoryInput::CopyIn(IOBuffer* dst, uint64_t history_retain_length) { // to it. return "wuffs_aux::sync_io::MemoryInput: overlapping buffers"; } else { - dst->compact_retaining(history_retain_length); + dst->compact(); size_t nd = dst->writer_length(); size_t ns = m_io.reader_length(); size_t n = (nd < ns) ? nd : ns; @@ -209,7 +209,7 @@ AdvanceIOBufferTo(const ErrorMessages& error_messages, if (!input.BringsItsOwnIOBuffer()) { io_buf.compact(); } - std::string error_message = input.CopyIn(&io_buf, 0); + std::string error_message = input.CopyIn(&io_buf); if (!error_message.empty()) { return error_message; } @@ -292,7 +292,7 @@ HandleMetadata( } else if (!input.BringsItsOwnIOBuffer()) { io_buf.compact(); } - std::string error_message = input.CopyIn(&io_buf, 0); + std::string error_message = input.CopyIn(&io_buf); if (!error_message.empty()) { return error_message; } diff --git a/internal/cgen/auxiliary/base.hh b/internal/cgen/auxiliary/base.hh index bb8f238b..28f9ccde 100644 --- a/internal/cgen/auxiliary/base.hh +++ b/internal/cgen/auxiliary/base.hh @@ -96,7 +96,7 @@ class Input { virtual ~Input(); virtual IOBuffer* BringsItsOwnIOBuffer(); - virtual std::string CopyIn(IOBuffer* dst, uint64_t history_retain_length) = 0; + virtual std::string CopyIn(IOBuffer* dst) = 0; }; // -------- @@ -108,7 +108,7 @@ class FileInput : public Input { public: FileInput(FILE* f); - virtual std::string CopyIn(IOBuffer* dst, uint64_t history_retain_length); + virtual std::string CopyIn(IOBuffer* dst); private: FILE* m_f; @@ -129,7 +129,7 @@ class MemoryInput : public Input { MemoryInput(const uint8_t* ptr, size_t len); virtual IOBuffer* BringsItsOwnIOBuffer(); - virtual std::string CopyIn(IOBuffer* dst, uint64_t history_retain_length); + virtual std::string CopyIn(IOBuffer* dst); private: IOBuffer m_io; diff --git a/internal/cgen/auxiliary/cbor.cc b/internal/cgen/auxiliary/cbor.cc index 0f8db1e6..75bf0660 100644 --- a/internal/cgen/auxiliary/cbor.cc +++ b/internal/cgen/auxiliary/cbor.cc @@ -111,16 +111,14 @@ DecodeCbor(DecodeCborCallbacks& callbacks, "wuffs_aux::DecodeCbor: internal error: io_buf is closed"; goto done; } - io_buf->compact_retaining( - dec->history_retain_length().value_or(UINT64_MAX)); + io_buf->compact(); if (io_buf->meta.wi >= io_buf->data.len) { ret_error_message = "wuffs_aux::DecodeCbor: internal error: io_buf is full"; goto done; } cursor_index = io_buf->meta.ri; - io_error_message = input.CopyIn( - io_buf, dec->history_retain_length().value_or(UINT64_MAX)); + io_error_message = input.CopyIn(io_buf); } else { ret_error_message = tok_status.message(); goto done; diff --git a/internal/cgen/auxiliary/image.cc b/internal/cgen/auxiliary/image.cc index 9a617bf7..dd5e8e27 100644 --- a/internal/cgen/auxiliary/image.cc +++ b/internal/cgen/auxiliary/image.cc @@ -340,7 +340,7 @@ redirect: fourcc = 0; break; } - std::string error_message = input.CopyIn(&io_buf, 0); + std::string error_message = input.CopyIn(&io_buf); if (!error_message.empty()) { return DecodeImageResult(std::move(error_message)); } @@ -436,9 +436,7 @@ redirect: } else if (io_buf.meta.closed) { return DecodeImageResult(DecodeImage_UnexpectedEndOfFile); } else { - std::string error_message = input.CopyIn( - &io_buf, - image_decoder->history_retain_length().value_or(UINT64_MAX)); + std::string error_message = input.CopyIn(&io_buf); if (!error_message.empty()) { return DecodeImageResult(std::move(error_message)); } @@ -520,8 +518,7 @@ redirect: } else if (io_buf.meta.closed) { return DecodeImageResult(DecodeImage_UnexpectedEndOfFile); } else { - std::string error_message = input.CopyIn( - &io_buf, image_decoder->history_retain_length().value_or(UINT64_MAX)); + std::string error_message = input.CopyIn(&io_buf); if (!error_message.empty()) { return DecodeImageResult(std::move(error_message)); } @@ -550,8 +547,7 @@ redirect: message = DecodeImage_UnexpectedEndOfFile; break; } else { - std::string error_message = input.CopyIn( - &io_buf, image_decoder->history_retain_length().value_or(UINT64_MAX)); + std::string error_message = input.CopyIn(&io_buf); if (!error_message.empty()) { message = std::move(error_message); break; @@ -579,9 +575,7 @@ redirect: } else if (io_buf.meta.closed) { return DecodeImageResult(DecodeImage_UnexpectedEndOfFile); } else { - std::string error_message = input.CopyIn( - &io_buf, - image_decoder->history_retain_length().value_or(UINT64_MAX)); + std::string error_message = input.CopyIn(&io_buf); if (!error_message.empty()) { return DecodeImageResult(std::move(error_message)); } diff --git a/internal/cgen/auxiliary/json.cc b/internal/cgen/auxiliary/json.cc index 5f84732f..6ab4b423 100644 --- a/internal/cgen/auxiliary/json.cc +++ b/internal/cgen/auxiliary/json.cc @@ -73,16 +73,14 @@ DecodeJsonArgJsonPointer::DefaultValue() { "wuffs_aux::DecodeJson: internal error: io_buf is closed"; \ goto done; \ } \ - io_buf->compact_retaining( \ - dec->history_retain_length().value_or(UINT64_MAX)); \ + io_buf->compact(); \ if (io_buf->meta.wi >= io_buf->data.len) { \ ret_error_message = \ "wuffs_aux::DecodeJson: internal error: io_buf is full"; \ goto done; \ } \ cursor_index = io_buf->meta.ri; \ - io_error_message = input.CopyIn( \ - io_buf, dec->history_retain_length().value_or(UINT64_MAX)); \ + io_error_message = input.CopyIn(io_buf); \ } else { \ ret_error_message = tok_status.message(); \ goto done; \ diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index 652ad3a5..704d8f06 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -1006,7 +1006,6 @@ var InterfaceFuncs = []string{ "image_decoder.decode_image_config?(dst: nptr image_config, src: io_reader)", "image_decoder.frame_dirty_rect() rect_ie_u32", "image_decoder.get_quirk(key: u32) u64", - "image_decoder.history_retain_length() optional_u63", "image_decoder.num_animation_loops() u32", "image_decoder.num_decoded_frame_configs() u64", "image_decoder.num_decoded_frames() u64", @@ -1018,8 +1017,8 @@ var InterfaceFuncs = []string{ // ---- io_transformer + "io_transformer.dst_history_retain_length() optional_u63", "io_transformer.get_quirk(key: u32) u64", - "io_transformer.history_retain_length() optional_u63", "io_transformer.set_quirk!(key: u32, value: u64) status", "io_transformer.transform_io?(dst: io_writer, src: io_reader, workbuf: slice u8)", "io_transformer.workbuf_len() range_ii_u64", @@ -1028,7 +1027,6 @@ var InterfaceFuncs = []string{ "token_decoder.decode_tokens?(dst: token_writer, src: io_reader, workbuf: slice u8)", "token_decoder.get_quirk(key: u32) u64", - "token_decoder.history_retain_length() optional_u63", "token_decoder.set_quirk!(key: u32, value: u64) status", "token_decoder.workbuf_len() range_ii_u64", } diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index b8f36bbd..f023304f 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -6506,8 +6506,6 @@ typedef struct wuffs_base__image_decoder__func_ptrs__struct { uint64_t (*get_quirk)( const void* self, uint32_t a_key); - wuffs_base__optional_u63 (*history_retain_length)( - const void* self); uint32_t (*num_animation_loops)( const void* self); uint64_t (*num_decoded_frame_configs)( @@ -6572,11 +6570,6 @@ wuffs_base__image_decoder__get_quirk( const wuffs_base__image_decoder* self, uint32_t a_key); -WUFFS_BASE__GENERATED_C_CODE -WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_base__image_decoder__history_retain_length( - const wuffs_base__image_decoder* self); - WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC uint32_t wuffs_base__image_decoder__num_animation_loops( @@ -6679,11 +6672,6 @@ struct wuffs_base__image_decoder__struct { this, a_key); } - inline wuffs_base__optional_u63 - history_retain_length() const { - return wuffs_base__image_decoder__history_retain_length(this); - } - inline uint32_t num_animation_loops() const { return wuffs_base__image_decoder__num_animation_loops(this); @@ -6747,11 +6735,11 @@ struct wuffs_base__image_decoder__struct { extern const char wuffs_base__io_transformer__vtable_name[]; typedef struct wuffs_base__io_transformer__func_ptrs__struct { + wuffs_base__optional_u63 (*dst_history_retain_length)( + const void* self); uint64_t (*get_quirk)( const void* self, uint32_t a_key); - wuffs_base__optional_u63 (*history_retain_length)( - const void* self); wuffs_base__status (*set_quirk)( void* self, uint32_t a_key, @@ -6767,17 +6755,17 @@ typedef struct wuffs_base__io_transformer__func_ptrs__struct { typedef struct wuffs_base__io_transformer__struct wuffs_base__io_transformer; +WUFFS_BASE__GENERATED_C_CODE +WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 +wuffs_base__io_transformer__dst_history_retain_length( + const wuffs_base__io_transformer* self); + WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC uint64_t wuffs_base__io_transformer__get_quirk( const wuffs_base__io_transformer* self, uint32_t a_key); -WUFFS_BASE__GENERATED_C_CODE -WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_base__io_transformer__history_retain_length( - const wuffs_base__io_transformer* self); - WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__status wuffs_base__io_transformer__set_quirk( @@ -6812,6 +6800,11 @@ struct wuffs_base__io_transformer__struct { using unique_ptr = std::unique_ptr; #endif + inline wuffs_base__optional_u63 + dst_history_retain_length() const { + return wuffs_base__io_transformer__dst_history_retain_length(this); + } + inline uint64_t get_quirk( uint32_t a_key) const { @@ -6819,11 +6812,6 @@ struct wuffs_base__io_transformer__struct { this, a_key); } - inline wuffs_base__optional_u63 - history_retain_length() const { - return wuffs_base__io_transformer__history_retain_length(this); - } - inline wuffs_base__status set_quirk( uint32_t a_key, @@ -6864,8 +6852,6 @@ typedef struct wuffs_base__token_decoder__func_ptrs__struct { uint64_t (*get_quirk)( const void* self, uint32_t a_key); - wuffs_base__optional_u63 (*history_retain_length)( - const void* self); wuffs_base__status (*set_quirk)( void* self, uint32_t a_key, @@ -6890,11 +6876,6 @@ wuffs_base__token_decoder__get_quirk( const wuffs_base__token_decoder* self, uint32_t a_key); -WUFFS_BASE__GENERATED_C_CODE -WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_base__token_decoder__history_retain_length( - const wuffs_base__token_decoder* self); - WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__status wuffs_base__token_decoder__set_quirk( @@ -6937,11 +6918,6 @@ struct wuffs_base__token_decoder__struct { this, a_key); } - inline wuffs_base__optional_u63 - history_retain_length() const { - return wuffs_base__token_decoder__history_retain_length(this); - } - inline wuffs_base__status set_quirk( uint32_t a_key, @@ -7199,8 +7175,6 @@ extern const char wuffs_bmp__error__unsupported_bmp_file[]; // ---------------- Public Consts -#define WUFFS_BMP__DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0u - #define WUFFS_BMP__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0u // ---------------- Struct Declarations @@ -7334,11 +7308,6 @@ wuffs_bmp__decoder__tell_me_more( wuffs_base__more_information* a_minfo, wuffs_base__io_buffer* a_src); -WUFFS_BASE__GENERATED_C_CODE -WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_bmp__decoder__history_retain_length( - const wuffs_bmp__decoder* self); - WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64 wuffs_bmp__decoder__workbuf_len( @@ -7564,11 +7533,6 @@ struct wuffs_bmp__decoder__struct { return wuffs_bmp__decoder__tell_me_more(this, a_dst, a_minfo, a_src); } - inline wuffs_base__optional_u63 - history_retain_length() const { - return wuffs_bmp__decoder__history_retain_length(this); - } - inline wuffs_base__range_ii_u64 workbuf_len() const { return wuffs_bmp__decoder__workbuf_len(this); @@ -7597,7 +7561,7 @@ extern const char wuffs_bzip2__error__unsupported_block_randomization[]; // ---------------- Public Consts -#define WUFFS_BZIP2__DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0u +#define WUFFS_BZIP2__DECODER_DST_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0u #define WUFFS_BZIP2__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0u @@ -7668,7 +7632,7 @@ wuffs_bzip2__decoder__set_quirk( WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_bzip2__decoder__history_retain_length( +wuffs_bzip2__decoder__dst_history_retain_length( const wuffs_bzip2__decoder* self); WUFFS_BASE__GENERATED_C_CODE @@ -7854,8 +7818,8 @@ struct wuffs_bzip2__decoder__struct { } inline wuffs_base__optional_u63 - history_retain_length() const { - return wuffs_bzip2__decoder__history_retain_length(this); + dst_history_retain_length() const { + return wuffs_bzip2__decoder__dst_history_retain_length(this); } inline wuffs_base__range_ii_u64 @@ -7887,8 +7851,6 @@ extern const char wuffs_cbor__error__unsupported_recursion_depth[]; // ---------------- Public Consts -#define WUFFS_CBOR__DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0u - #define WUFFS_CBOR__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0u #define WUFFS_CBOR__DECODER_DEPTH_MAX_INCL 1024u @@ -7972,11 +7934,6 @@ wuffs_cbor__decoder__set_quirk( uint32_t a_key, uint64_t a_value); -WUFFS_BASE__GENERATED_C_CODE -WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_cbor__decoder__history_retain_length( - const wuffs_cbor__decoder* self); - WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64 wuffs_cbor__decoder__workbuf_len( @@ -8109,11 +8066,6 @@ struct wuffs_cbor__decoder__struct { return wuffs_cbor__decoder__set_quirk(this, a_key, a_value); } - inline wuffs_base__optional_u63 - history_retain_length() const { - return wuffs_cbor__decoder__history_retain_length(this); - } - inline wuffs_base__range_ii_u64 workbuf_len() const { return wuffs_cbor__decoder__workbuf_len(this); @@ -8593,7 +8545,7 @@ extern const char wuffs_deflate__error__truncated_input[]; // ---------------- Public Consts -#define WUFFS_DEFLATE__DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0u +#define WUFFS_DEFLATE__DECODER_DST_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0u #define WUFFS_DEFLATE__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 1u @@ -8670,7 +8622,7 @@ wuffs_deflate__decoder__set_quirk( WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_deflate__decoder__history_retain_length( +wuffs_deflate__decoder__dst_history_retain_length( const wuffs_deflate__decoder* self); WUFFS_BASE__GENERATED_C_CODE @@ -8852,8 +8804,8 @@ struct wuffs_deflate__decoder__struct { } inline wuffs_base__optional_u63 - history_retain_length() const { - return wuffs_deflate__decoder__history_retain_length(this); + dst_history_retain_length() const { + return wuffs_deflate__decoder__dst_history_retain_length(this); } inline wuffs_base__range_ii_u64 @@ -8891,8 +8843,6 @@ extern const char wuffs_gif__error__truncated_input[]; // ---------------- Public Consts -#define WUFFS_GIF__DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0u - #define WUFFS_GIF__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0u #define WUFFS_GIF__QUIRK_DELAY_NUM_DECODED_FRAMES 1041635328u @@ -9016,11 +8966,6 @@ WUFFS_BASE__MAYBE_STATIC wuffs_base__rect_ie_u32 wuffs_gif__decoder__frame_dirty_rect( const wuffs_gif__decoder* self); -WUFFS_BASE__GENERATED_C_CODE -WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_gif__decoder__history_retain_length( - const wuffs_gif__decoder* self); - WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64 wuffs_gif__decoder__workbuf_len( @@ -9318,11 +9263,6 @@ struct wuffs_gif__decoder__struct { return wuffs_gif__decoder__frame_dirty_rect(this); } - inline wuffs_base__optional_u63 - history_retain_length() const { - return wuffs_gif__decoder__history_retain_length(this); - } - inline wuffs_base__range_ii_u64 workbuf_len() const { return wuffs_gif__decoder__workbuf_len(this); @@ -9371,7 +9311,7 @@ extern const char wuffs_gzip__error__truncated_input[]; // ---------------- Public Consts -#define WUFFS_GZIP__DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0u +#define WUFFS_GZIP__DECODER_DST_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0u #define WUFFS_GZIP__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 1u @@ -9442,7 +9382,7 @@ wuffs_gzip__decoder__set_quirk( WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_gzip__decoder__history_retain_length( +wuffs_gzip__decoder__dst_history_retain_length( const wuffs_gzip__decoder* self); WUFFS_BASE__GENERATED_C_CODE @@ -9580,8 +9520,8 @@ struct wuffs_gzip__decoder__struct { } inline wuffs_base__optional_u63 - history_retain_length() const { - return wuffs_gzip__decoder__history_retain_length(this); + dst_history_retain_length() const { + return wuffs_gzip__decoder__dst_history_retain_length(this); } inline wuffs_base__range_ii_u64 @@ -9632,8 +9572,6 @@ extern const char wuffs_jpeg__error__unsupported_scan_count[]; // ---------------- Public Consts -#define WUFFS_JPEG__DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0u - #define WUFFS_JPEG__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 51552191232u // ---------------- Struct Declarations @@ -9767,11 +9705,6 @@ wuffs_jpeg__decoder__tell_me_more( wuffs_base__more_information* a_minfo, wuffs_base__io_buffer* a_src); -WUFFS_BASE__GENERATED_C_CODE -WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_jpeg__decoder__history_retain_length( - const wuffs_jpeg__decoder* self); - WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64 wuffs_jpeg__decoder__workbuf_len( @@ -10093,11 +10026,6 @@ struct wuffs_jpeg__decoder__struct { return wuffs_jpeg__decoder__tell_me_more(this, a_dst, a_minfo, a_src); } - inline wuffs_base__optional_u63 - history_retain_length() const { - return wuffs_jpeg__decoder__history_retain_length(this); - } - inline wuffs_base__range_ii_u64 workbuf_len() const { return wuffs_jpeg__decoder__workbuf_len(this); @@ -10125,8 +10053,6 @@ extern const char wuffs_json__error__unsupported_recursion_depth[]; // ---------------- Public Consts -#define WUFFS_JSON__DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0u - #define WUFFS_JSON__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0u #define WUFFS_JSON__DECODER_DEPTH_MAX_INCL 1024u @@ -10240,11 +10166,6 @@ wuffs_json__decoder__set_quirk( uint32_t a_key, uint64_t a_value); -WUFFS_BASE__GENERATED_C_CODE -WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_json__decoder__history_retain_length( - const wuffs_json__decoder* self); - WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64 wuffs_json__decoder__workbuf_len( @@ -10384,11 +10305,6 @@ struct wuffs_json__decoder__struct { return wuffs_json__decoder__set_quirk(this, a_key, a_value); } - inline wuffs_base__optional_u63 - history_retain_length() const { - return wuffs_json__decoder__history_retain_length(this); - } - inline wuffs_base__range_ii_u64 workbuf_len() const { return wuffs_json__decoder__workbuf_len(this); @@ -10424,7 +10340,7 @@ extern const char wuffs_lzma__error__unsupported_properties[]; // ---------------- Public Consts -#define WUFFS_LZMA__DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 4294967295u +#define WUFFS_LZMA__DECODER_DST_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 4294967295u #define WUFFS_LZMA__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0u @@ -10495,7 +10411,7 @@ wuffs_lzma__decoder__set_quirk( WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_lzma__decoder__history_retain_length( +wuffs_lzma__decoder__dst_history_retain_length( const wuffs_lzma__decoder* self); WUFFS_BASE__GENERATED_C_CODE @@ -10678,8 +10594,8 @@ struct wuffs_lzma__decoder__struct { } inline wuffs_base__optional_u63 - history_retain_length() const { - return wuffs_lzma__decoder__history_retain_length(this); + dst_history_retain_length() const { + return wuffs_lzma__decoder__dst_history_retain_length(this); } inline wuffs_base__range_ii_u64 @@ -10711,7 +10627,7 @@ extern const char wuffs_lzw__error__truncated_input[]; // ---------------- Public Consts -#define WUFFS_LZW__DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0u +#define WUFFS_LZW__DECODER_DST_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0u #define WUFFS_LZW__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0u @@ -10784,7 +10700,7 @@ wuffs_lzw__decoder__set_quirk( WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_lzw__decoder__history_retain_length( +wuffs_lzw__decoder__dst_history_retain_length( const wuffs_lzw__decoder* self); WUFFS_BASE__GENERATED_C_CODE @@ -10932,8 +10848,8 @@ struct wuffs_lzw__decoder__struct { } inline wuffs_base__optional_u63 - history_retain_length() const { - return wuffs_lzw__decoder__history_retain_length(this); + dst_history_retain_length() const { + return wuffs_lzw__decoder__dst_history_retain_length(this); } inline wuffs_base__range_ii_u64 @@ -10971,8 +10887,6 @@ extern const char wuffs_netpbm__error__unsupported_netpbm_file[]; // ---------------- Public Consts -#define WUFFS_NETPBM__DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0u - #define WUFFS_NETPBM__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0u // ---------------- Struct Declarations @@ -11106,11 +11020,6 @@ wuffs_netpbm__decoder__tell_me_more( wuffs_base__more_information* a_minfo, wuffs_base__io_buffer* a_src); -WUFFS_BASE__GENERATED_C_CODE -WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_netpbm__decoder__history_retain_length( - const wuffs_netpbm__decoder* self); - WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64 wuffs_netpbm__decoder__workbuf_len( @@ -11302,11 +11211,6 @@ struct wuffs_netpbm__decoder__struct { return wuffs_netpbm__decoder__tell_me_more(this, a_dst, a_minfo, a_src); } - inline wuffs_base__optional_u63 - history_retain_length() const { - return wuffs_netpbm__decoder__history_retain_length(this); - } - inline wuffs_base__range_ii_u64 workbuf_len() const { return wuffs_netpbm__decoder__workbuf_len(this); @@ -11329,8 +11233,6 @@ extern const char wuffs_nie__error__unsupported_nie_file[]; // ---------------- Public Consts -#define WUFFS_NIE__DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0u - #define WUFFS_NIE__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0u // ---------------- Struct Declarations @@ -11464,11 +11366,6 @@ wuffs_nie__decoder__tell_me_more( wuffs_base__more_information* a_minfo, wuffs_base__io_buffer* a_src); -WUFFS_BASE__GENERATED_C_CODE -WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_nie__decoder__history_retain_length( - const wuffs_nie__decoder* self); - WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64 wuffs_nie__decoder__workbuf_len( @@ -11664,11 +11561,6 @@ struct wuffs_nie__decoder__struct { return wuffs_nie__decoder__tell_me_more(this, a_dst, a_minfo, a_src); } - inline wuffs_base__optional_u63 - history_retain_length() const { - return wuffs_nie__decoder__history_retain_length(this); - } - inline wuffs_base__range_ii_u64 workbuf_len() const { return wuffs_nie__decoder__workbuf_len(this); @@ -11697,7 +11589,7 @@ extern const char wuffs_zlib__error__truncated_input[]; #define WUFFS_ZLIB__QUIRK_JUST_RAW_DEFLATE 2113790976u -#define WUFFS_ZLIB__DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0u +#define WUFFS_ZLIB__DECODER_DST_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0u #define WUFFS_ZLIB__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 1u @@ -11779,7 +11671,7 @@ wuffs_zlib__decoder__set_quirk( WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_zlib__decoder__history_retain_length( +wuffs_zlib__decoder__dst_history_retain_length( const wuffs_zlib__decoder* self); WUFFS_BASE__GENERATED_C_CODE @@ -11933,8 +11825,8 @@ struct wuffs_zlib__decoder__struct { } inline wuffs_base__optional_u63 - history_retain_length() const { - return wuffs_zlib__decoder__history_retain_length(this); + dst_history_retain_length() const { + return wuffs_zlib__decoder__dst_history_retain_length(this); } inline wuffs_base__range_ii_u64 @@ -11975,8 +11867,6 @@ extern const char wuffs_png__error__unsupported_png_file[]; // ---------------- Public Consts -#define WUFFS_PNG__DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0u - #define WUFFS_PNG__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 2251799562027015u #define WUFFS_PNG__DECODER_SRC_IO_BUFFER_LENGTH_MIN_INCL 8u @@ -12112,11 +12002,6 @@ wuffs_png__decoder__tell_me_more( wuffs_base__more_information* a_minfo, wuffs_base__io_buffer* a_src); -WUFFS_BASE__GENERATED_C_CODE -WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_png__decoder__history_retain_length( - const wuffs_png__decoder* self); - WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64 wuffs_png__decoder__workbuf_len( @@ -12455,11 +12340,6 @@ struct wuffs_png__decoder__struct { return wuffs_png__decoder__tell_me_more(this, a_dst, a_minfo, a_src); } - inline wuffs_base__optional_u63 - history_retain_length() const { - return wuffs_png__decoder__history_retain_length(this); - } - inline wuffs_base__range_ii_u64 workbuf_len() const { return wuffs_png__decoder__workbuf_len(this); @@ -12714,8 +12594,6 @@ extern const char wuffs_tga__error__unsupported_tga_file[]; // ---------------- Public Consts -#define WUFFS_TGA__DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0u - #define WUFFS_TGA__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0u // ---------------- Struct Declarations @@ -12849,11 +12727,6 @@ wuffs_tga__decoder__tell_me_more( wuffs_base__more_information* a_minfo, wuffs_base__io_buffer* a_src); -WUFFS_BASE__GENERATED_C_CODE -WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_tga__decoder__history_retain_length( - const wuffs_tga__decoder* self); - WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64 wuffs_tga__decoder__workbuf_len( @@ -13075,11 +12948,6 @@ struct wuffs_tga__decoder__struct { return wuffs_tga__decoder__tell_me_more(this, a_dst, a_minfo, a_src); } - inline wuffs_base__optional_u63 - history_retain_length() const { - return wuffs_tga__decoder__history_retain_length(this); - } - inline wuffs_base__range_ii_u64 workbuf_len() const { return wuffs_tga__decoder__workbuf_len(this); @@ -13101,8 +12969,6 @@ extern const char wuffs_wbmp__error__truncated_input[]; // ---------------- Public Consts -#define WUFFS_WBMP__DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0u - #define WUFFS_WBMP__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0u // ---------------- Struct Declarations @@ -13236,11 +13102,6 @@ wuffs_wbmp__decoder__tell_me_more( wuffs_base__more_information* a_minfo, wuffs_base__io_buffer* a_src); -WUFFS_BASE__GENERATED_C_CODE -WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_wbmp__decoder__history_retain_length( - const wuffs_wbmp__decoder* self); - WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64 wuffs_wbmp__decoder__workbuf_len( @@ -13442,11 +13303,6 @@ struct wuffs_wbmp__decoder__struct { return wuffs_wbmp__decoder__tell_me_more(this, a_dst, a_minfo, a_src); } - inline wuffs_base__optional_u63 - history_retain_length() const { - return wuffs_wbmp__decoder__history_retain_length(this); - } - inline wuffs_base__range_ii_u64 workbuf_len() const { return wuffs_wbmp__decoder__workbuf_len(this); @@ -14002,7 +13858,7 @@ class Input { virtual ~Input(); virtual IOBuffer* BringsItsOwnIOBuffer(); - virtual std::string CopyIn(IOBuffer* dst, uint64_t history_retain_length) = 0; + virtual std::string CopyIn(IOBuffer* dst) = 0; }; // -------- @@ -14014,7 +13870,7 @@ class FileInput : public Input { public: FileInput(FILE* f); - virtual std::string CopyIn(IOBuffer* dst, uint64_t history_retain_length); + virtual std::string CopyIn(IOBuffer* dst); private: FILE* m_f; @@ -14035,7 +13891,7 @@ class MemoryInput : public Input { MemoryInput(const uint8_t* ptr, size_t len); virtual IOBuffer* BringsItsOwnIOBuffer(); - virtual std::string CopyIn(IOBuffer* dst, uint64_t history_retain_length); + virtual std::string CopyIn(IOBuffer* dst); private: IOBuffer m_io; @@ -16127,34 +15983,6 @@ wuffs_base__image_decoder__get_quirk( return 0; } -WUFFS_BASE__GENERATED_C_CODE -WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_base__image_decoder__history_retain_length( - const wuffs_base__image_decoder* self) { - if (!self) { - return wuffs_base__utility__make_optional_u63(false, 0u); - } - if ((self->private_impl.magic != WUFFS_BASE__MAGIC) && - (self->private_impl.magic != WUFFS_BASE__DISABLED)) { - return wuffs_base__utility__make_optional_u63(false, 0u); - } - - const wuffs_base__vtable* v = &self->private_impl.first_vtable; - int i; - for (i = 0; i < 63; i++) { - if (v->vtable_name == wuffs_base__image_decoder__vtable_name) { - const wuffs_base__image_decoder__func_ptrs* func_ptrs = - (const wuffs_base__image_decoder__func_ptrs*)(v->function_pointers); - return (*func_ptrs->history_retain_length)(self); - } else if (v->vtable_name == NULL) { - break; - } - v++; - } - - return wuffs_base__utility__make_optional_u63(false, 0u); -} - WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC uint32_t wuffs_base__image_decoder__num_animation_loops( @@ -16395,6 +16223,34 @@ wuffs_base__image_decoder__workbuf_len( // -------- +WUFFS_BASE__GENERATED_C_CODE +WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 +wuffs_base__io_transformer__dst_history_retain_length( + const wuffs_base__io_transformer* self) { + if (!self) { + return wuffs_base__utility__make_optional_u63(false, 0u); + } + if ((self->private_impl.magic != WUFFS_BASE__MAGIC) && + (self->private_impl.magic != WUFFS_BASE__DISABLED)) { + return wuffs_base__utility__make_optional_u63(false, 0u); + } + + const wuffs_base__vtable* v = &self->private_impl.first_vtable; + int i; + for (i = 0; i < 63; i++) { + if (v->vtable_name == wuffs_base__io_transformer__vtable_name) { + const wuffs_base__io_transformer__func_ptrs* func_ptrs = + (const wuffs_base__io_transformer__func_ptrs*)(v->function_pointers); + return (*func_ptrs->dst_history_retain_length)(self); + } else if (v->vtable_name == NULL) { + break; + } + v++; + } + + return wuffs_base__utility__make_optional_u63(false, 0u); +} + WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC uint64_t wuffs_base__io_transformer__get_quirk( @@ -16424,34 +16280,6 @@ wuffs_base__io_transformer__get_quirk( return 0; } -WUFFS_BASE__GENERATED_C_CODE -WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_base__io_transformer__history_retain_length( - const wuffs_base__io_transformer* self) { - if (!self) { - return wuffs_base__utility__make_optional_u63(false, 0u); - } - if ((self->private_impl.magic != WUFFS_BASE__MAGIC) && - (self->private_impl.magic != WUFFS_BASE__DISABLED)) { - return wuffs_base__utility__make_optional_u63(false, 0u); - } - - const wuffs_base__vtable* v = &self->private_impl.first_vtable; - int i; - for (i = 0; i < 63; i++) { - if (v->vtable_name == wuffs_base__io_transformer__vtable_name) { - const wuffs_base__io_transformer__func_ptrs* func_ptrs = - (const wuffs_base__io_transformer__func_ptrs*)(v->function_pointers); - return (*func_ptrs->history_retain_length)(self); - } else if (v->vtable_name == NULL) { - break; - } - v++; - } - - return wuffs_base__utility__make_optional_u63(false, 0u); -} - WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__status wuffs_base__io_transformer__set_quirk( @@ -16609,34 +16437,6 @@ wuffs_base__token_decoder__get_quirk( return 0; } -WUFFS_BASE__GENERATED_C_CODE -WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_base__token_decoder__history_retain_length( - const wuffs_base__token_decoder* self) { - if (!self) { - return wuffs_base__utility__make_optional_u63(false, 0u); - } - if ((self->private_impl.magic != WUFFS_BASE__MAGIC) && - (self->private_impl.magic != WUFFS_BASE__DISABLED)) { - return wuffs_base__utility__make_optional_u63(false, 0u); - } - - const wuffs_base__vtable* v = &self->private_impl.first_vtable; - int i; - for (i = 0; i < 63; i++) { - if (v->vtable_name == wuffs_base__token_decoder__vtable_name) { - const wuffs_base__token_decoder__func_ptrs* func_ptrs = - (const wuffs_base__token_decoder__func_ptrs*)(v->function_pointers); - return (*func_ptrs->history_retain_length)(self); - } else if (v->vtable_name == NULL) { - break; - } - v++; - } - - return wuffs_base__utility__make_optional_u63(false, 0u); -} - WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__status wuffs_base__token_decoder__set_quirk( @@ -28943,7 +28743,6 @@ wuffs_bmp__decoder__func_ptrs_for__wuffs_base__image_decoder = { (wuffs_base__rect_ie_u32(*)(const void*))(&wuffs_bmp__decoder__frame_dirty_rect), (uint64_t(*)(const void*, uint32_t))(&wuffs_bmp__decoder__get_quirk), - (wuffs_base__optional_u63(*)(const void*))(&wuffs_bmp__decoder__history_retain_length), (uint32_t(*)(const void*))(&wuffs_bmp__decoder__num_animation_loops), (uint64_t(*)(const void*))(&wuffs_bmp__decoder__num_decoded_frame_configs), (uint64_t(*)(const void*))(&wuffs_bmp__decoder__num_decoded_frames), @@ -31387,23 +31186,6 @@ wuffs_bmp__decoder__do_tell_me_more( return status; } -// -------- func bmp.decoder.history_retain_length - -WUFFS_BASE__GENERATED_C_CODE -WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_bmp__decoder__history_retain_length( - const wuffs_bmp__decoder* self) { - if (!self) { - return wuffs_base__utility__make_optional_u63(false, 0u); - } - if ((self->private_impl.magic != WUFFS_BASE__MAGIC) && - (self->private_impl.magic != WUFFS_BASE__DISABLED)) { - return wuffs_base__utility__make_optional_u63(false, 0u); - } - - return wuffs_base__utility__make_optional_u63(true, 0u); -} - // -------- func bmp.decoder.workbuf_len WUFFS_BASE__GENERATED_C_CODE @@ -31732,9 +31514,9 @@ wuffs_bzip2__decoder__decode_huffman_slow( const wuffs_base__io_transformer__func_ptrs wuffs_bzip2__decoder__func_ptrs_for__wuffs_base__io_transformer = { + (wuffs_base__optional_u63(*)(const void*))(&wuffs_bzip2__decoder__dst_history_retain_length), (uint64_t(*)(const void*, uint32_t))(&wuffs_bzip2__decoder__get_quirk), - (wuffs_base__optional_u63(*)(const void*))(&wuffs_bzip2__decoder__history_retain_length), (wuffs_base__status(*)(void*, uint32_t, uint64_t))(&wuffs_bzip2__decoder__set_quirk), @@ -31862,11 +31644,11 @@ wuffs_bzip2__decoder__set_quirk( return wuffs_base__make_status(wuffs_base__error__unsupported_option); } -// -------- func bzip2.decoder.history_retain_length +// -------- func bzip2.decoder.dst_history_retain_length WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_bzip2__decoder__history_retain_length( +wuffs_bzip2__decoder__dst_history_retain_length( const wuffs_bzip2__decoder* self) { if (!self) { return wuffs_base__utility__make_optional_u63(false, 0u); @@ -33297,7 +33079,6 @@ wuffs_cbor__decoder__func_ptrs_for__wuffs_base__token_decoder = { wuffs_base__slice_u8))(&wuffs_cbor__decoder__decode_tokens), (uint64_t(*)(const void*, uint32_t))(&wuffs_cbor__decoder__get_quirk), - (wuffs_base__optional_u63(*)(const void*))(&wuffs_cbor__decoder__history_retain_length), (wuffs_base__status(*)(void*, uint32_t, uint64_t))(&wuffs_cbor__decoder__set_quirk), @@ -33414,23 +33195,6 @@ wuffs_cbor__decoder__set_quirk( return wuffs_base__make_status(wuffs_base__error__unsupported_option); } -// -------- func cbor.decoder.history_retain_length - -WUFFS_BASE__GENERATED_C_CODE -WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_cbor__decoder__history_retain_length( - const wuffs_cbor__decoder* self) { - if (!self) { - return wuffs_base__utility__make_optional_u63(false, 0u); - } - if ((self->private_impl.magic != WUFFS_BASE__MAGIC) && - (self->private_impl.magic != WUFFS_BASE__DISABLED)) { - return wuffs_base__utility__make_optional_u63(false, 0u); - } - - return wuffs_base__utility__make_optional_u63(true, 0u); -} - // -------- func cbor.decoder.workbuf_len WUFFS_BASE__GENERATED_C_CODE @@ -35935,9 +35699,9 @@ wuffs_deflate__decoder__decode_huffman_slow( const wuffs_base__io_transformer__func_ptrs wuffs_deflate__decoder__func_ptrs_for__wuffs_base__io_transformer = { + (wuffs_base__optional_u63(*)(const void*))(&wuffs_deflate__decoder__dst_history_retain_length), (uint64_t(*)(const void*, uint32_t))(&wuffs_deflate__decoder__get_quirk), - (wuffs_base__optional_u63(*)(const void*))(&wuffs_deflate__decoder__history_retain_length), (wuffs_base__status(*)(void*, uint32_t, uint64_t))(&wuffs_deflate__decoder__set_quirk), @@ -36101,11 +35865,11 @@ wuffs_deflate__decoder__set_quirk( return wuffs_base__make_status(wuffs_base__error__unsupported_option); } -// -------- func deflate.decoder.history_retain_length +// -------- func deflate.decoder.dst_history_retain_length WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_deflate__decoder__history_retain_length( +wuffs_deflate__decoder__dst_history_retain_length( const wuffs_deflate__decoder* self) { if (!self) { return wuffs_base__utility__make_optional_u63(false, 0u); @@ -38346,7 +38110,6 @@ wuffs_gif__decoder__func_ptrs_for__wuffs_base__image_decoder = { (wuffs_base__rect_ie_u32(*)(const void*))(&wuffs_gif__decoder__frame_dirty_rect), (uint64_t(*)(const void*, uint32_t))(&wuffs_gif__decoder__get_quirk), - (wuffs_base__optional_u63(*)(const void*))(&wuffs_gif__decoder__history_retain_length), (uint32_t(*)(const void*))(&wuffs_gif__decoder__num_animation_loops), (uint64_t(*)(const void*))(&wuffs_gif__decoder__num_decoded_frame_configs), (uint64_t(*)(const void*))(&wuffs_gif__decoder__num_decoded_frames), @@ -38926,23 +38689,6 @@ wuffs_gif__decoder__frame_dirty_rect( wuffs_base__u32__min(self->private_impl.f_dirty_max_excl_y, self->private_impl.f_height)); } -// -------- func gif.decoder.history_retain_length - -WUFFS_BASE__GENERATED_C_CODE -WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_gif__decoder__history_retain_length( - const wuffs_gif__decoder* self) { - if (!self) { - return wuffs_base__utility__make_optional_u63(false, 0u); - } - if ((self->private_impl.magic != WUFFS_BASE__MAGIC) && - (self->private_impl.magic != WUFFS_BASE__DISABLED)) { - return wuffs_base__utility__make_optional_u63(false, 0u); - } - - return wuffs_base__utility__make_optional_u63(true, 0u); -} - // -------- func gif.decoder.workbuf_len WUFFS_BASE__GENERATED_C_CODE @@ -41262,9 +41008,9 @@ wuffs_gzip__decoder__do_transform_io( const wuffs_base__io_transformer__func_ptrs wuffs_gzip__decoder__func_ptrs_for__wuffs_base__io_transformer = { + (wuffs_base__optional_u63(*)(const void*))(&wuffs_gzip__decoder__dst_history_retain_length), (uint64_t(*)(const void*, uint32_t))(&wuffs_gzip__decoder__get_quirk), - (wuffs_base__optional_u63(*)(const void*))(&wuffs_gzip__decoder__history_retain_length), (wuffs_base__status(*)(void*, uint32_t, uint64_t))(&wuffs_gzip__decoder__set_quirk), @@ -41406,11 +41152,11 @@ wuffs_gzip__decoder__set_quirk( return wuffs_base__make_status(wuffs_base__error__unsupported_option); } -// -------- func gzip.decoder.history_retain_length +// -------- func gzip.decoder.dst_history_retain_length WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_gzip__decoder__history_retain_length( +wuffs_gzip__decoder__dst_history_retain_length( const wuffs_gzip__decoder* self) { if (!self) { return wuffs_base__utility__make_optional_u63(false, 0u); @@ -42352,7 +42098,6 @@ wuffs_jpeg__decoder__func_ptrs_for__wuffs_base__image_decoder = { (wuffs_base__rect_ie_u32(*)(const void*))(&wuffs_jpeg__decoder__frame_dirty_rect), (uint64_t(*)(const void*, uint32_t))(&wuffs_jpeg__decoder__get_quirk), - (wuffs_base__optional_u63(*)(const void*))(&wuffs_jpeg__decoder__history_retain_length), (uint32_t(*)(const void*))(&wuffs_jpeg__decoder__num_animation_loops), (uint64_t(*)(const void*))(&wuffs_jpeg__decoder__num_decoded_frame_configs), (uint64_t(*)(const void*))(&wuffs_jpeg__decoder__num_decoded_frames), @@ -47043,23 +46788,6 @@ wuffs_jpeg__decoder__tell_me_more( return status; } -// -------- func jpeg.decoder.history_retain_length - -WUFFS_BASE__GENERATED_C_CODE -WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_jpeg__decoder__history_retain_length( - const wuffs_jpeg__decoder* self) { - if (!self) { - return wuffs_base__utility__make_optional_u63(false, 0u); - } - if ((self->private_impl.magic != WUFFS_BASE__MAGIC) && - (self->private_impl.magic != WUFFS_BASE__DISABLED)) { - return wuffs_base__utility__make_optional_u63(false, 0u); - } - - return wuffs_base__utility__make_optional_u63(true, 0u); -} - // -------- func jpeg.decoder.workbuf_len WUFFS_BASE__GENERATED_C_CODE @@ -48910,7 +48638,6 @@ wuffs_json__decoder__func_ptrs_for__wuffs_base__token_decoder = { wuffs_base__slice_u8))(&wuffs_json__decoder__decode_tokens), (uint64_t(*)(const void*, uint32_t))(&wuffs_json__decoder__get_quirk), - (wuffs_base__optional_u63(*)(const void*))(&wuffs_json__decoder__history_retain_length), (wuffs_base__status(*)(void*, uint32_t, uint64_t))(&wuffs_json__decoder__set_quirk), @@ -49044,23 +48771,6 @@ wuffs_json__decoder__set_quirk( return wuffs_base__make_status(wuffs_base__error__unsupported_option); } -// -------- func json.decoder.history_retain_length - -WUFFS_BASE__GENERATED_C_CODE -WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_json__decoder__history_retain_length( - const wuffs_json__decoder* self) { - if (!self) { - return wuffs_base__utility__make_optional_u63(false, 0u); - } - if ((self->private_impl.magic != WUFFS_BASE__MAGIC) && - (self->private_impl.magic != WUFFS_BASE__DISABLED)) { - return wuffs_base__utility__make_optional_u63(false, 0u); - } - - return wuffs_base__utility__make_optional_u63(true, 0u); -} - // -------- func json.decoder.workbuf_len WUFFS_BASE__GENERATED_C_CODE @@ -50937,9 +50647,9 @@ wuffs_lzma__decoder__initialize_probs( const wuffs_base__io_transformer__func_ptrs wuffs_lzma__decoder__func_ptrs_for__wuffs_base__io_transformer = { + (wuffs_base__optional_u63(*)(const void*))(&wuffs_lzma__decoder__dst_history_retain_length), (uint64_t(*)(const void*, uint32_t))(&wuffs_lzma__decoder__get_quirk), - (wuffs_base__optional_u63(*)(const void*))(&wuffs_lzma__decoder__history_retain_length), (wuffs_base__status(*)(void*, uint32_t, uint64_t))(&wuffs_lzma__decoder__set_quirk), @@ -52134,11 +51844,11 @@ wuffs_lzma__decoder__set_quirk( return wuffs_base__make_status(wuffs_base__error__unsupported_option); } -// -------- func lzma.decoder.history_retain_length +// -------- func lzma.decoder.dst_history_retain_length WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_lzma__decoder__history_retain_length( +wuffs_lzma__decoder__dst_history_retain_length( const wuffs_lzma__decoder* self) { if (!self) { return wuffs_base__utility__make_optional_u63(false, 0u); @@ -52574,9 +52284,9 @@ wuffs_lzw__decoder__write_to( const wuffs_base__io_transformer__func_ptrs wuffs_lzw__decoder__func_ptrs_for__wuffs_base__io_transformer = { + (wuffs_base__optional_u63(*)(const void*))(&wuffs_lzw__decoder__dst_history_retain_length), (uint64_t(*)(const void*, uint32_t))(&wuffs_lzw__decoder__get_quirk), - (wuffs_base__optional_u63(*)(const void*))(&wuffs_lzw__decoder__history_retain_length), (wuffs_base__status(*)(void*, uint32_t, uint64_t))(&wuffs_lzw__decoder__set_quirk), @@ -52707,11 +52417,11 @@ wuffs_lzw__decoder__set_quirk( return wuffs_base__make_status(wuffs_base__error__unsupported_option); } -// -------- func lzw.decoder.history_retain_length +// -------- func lzw.decoder.dst_history_retain_length WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_lzw__decoder__history_retain_length( +wuffs_lzw__decoder__dst_history_retain_length( const wuffs_lzw__decoder* self) { if (!self) { return wuffs_base__utility__make_optional_u63(false, 0u); @@ -53184,7 +52894,6 @@ wuffs_netpbm__decoder__func_ptrs_for__wuffs_base__image_decoder = { (wuffs_base__rect_ie_u32(*)(const void*))(&wuffs_netpbm__decoder__frame_dirty_rect), (uint64_t(*)(const void*, uint32_t))(&wuffs_netpbm__decoder__get_quirk), - (wuffs_base__optional_u63(*)(const void*))(&wuffs_netpbm__decoder__history_retain_length), (uint32_t(*)(const void*))(&wuffs_netpbm__decoder__num_animation_loops), (uint64_t(*)(const void*))(&wuffs_netpbm__decoder__num_decoded_frame_configs), (uint64_t(*)(const void*))(&wuffs_netpbm__decoder__num_decoded_frames), @@ -54241,23 +53950,6 @@ wuffs_netpbm__decoder__tell_me_more( return status; } -// -------- func netpbm.decoder.history_retain_length - -WUFFS_BASE__GENERATED_C_CODE -WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_netpbm__decoder__history_retain_length( - const wuffs_netpbm__decoder* self) { - if (!self) { - return wuffs_base__utility__make_optional_u63(false, 0u); - } - if ((self->private_impl.magic != WUFFS_BASE__MAGIC) && - (self->private_impl.magic != WUFFS_BASE__DISABLED)) { - return wuffs_base__utility__make_optional_u63(false, 0u); - } - - return wuffs_base__utility__make_optional_u63(true, 0u); -} - // -------- func netpbm.decoder.workbuf_len WUFFS_BASE__GENERATED_C_CODE @@ -54342,7 +54034,6 @@ wuffs_nie__decoder__func_ptrs_for__wuffs_base__image_decoder = { (wuffs_base__rect_ie_u32(*)(const void*))(&wuffs_nie__decoder__frame_dirty_rect), (uint64_t(*)(const void*, uint32_t))(&wuffs_nie__decoder__get_quirk), - (wuffs_base__optional_u63(*)(const void*))(&wuffs_nie__decoder__history_retain_length), (uint32_t(*)(const void*))(&wuffs_nie__decoder__num_animation_loops), (uint64_t(*)(const void*))(&wuffs_nie__decoder__num_decoded_frame_configs), (uint64_t(*)(const void*))(&wuffs_nie__decoder__num_decoded_frames), @@ -55319,23 +55010,6 @@ wuffs_nie__decoder__tell_me_more( return status; } -// -------- func nie.decoder.history_retain_length - -WUFFS_BASE__GENERATED_C_CODE -WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_nie__decoder__history_retain_length( - const wuffs_nie__decoder* self) { - if (!self) { - return wuffs_base__utility__make_optional_u63(false, 0u); - } - if ((self->private_impl.magic != WUFFS_BASE__MAGIC) && - (self->private_impl.magic != WUFFS_BASE__DISABLED)) { - return wuffs_base__utility__make_optional_u63(false, 0u); - } - - return wuffs_base__utility__make_optional_u63(true, 0u); -} - // -------- func nie.decoder.workbuf_len WUFFS_BASE__GENERATED_C_CODE @@ -55389,9 +55063,9 @@ wuffs_zlib__decoder__do_transform_io( const wuffs_base__io_transformer__func_ptrs wuffs_zlib__decoder__func_ptrs_for__wuffs_base__io_transformer = { + (wuffs_base__optional_u63(*)(const void*))(&wuffs_zlib__decoder__dst_history_retain_length), (uint64_t(*)(const void*, uint32_t))(&wuffs_zlib__decoder__get_quirk), - (wuffs_base__optional_u63(*)(const void*))(&wuffs_zlib__decoder__history_retain_length), (wuffs_base__status(*)(void*, uint32_t, uint64_t))(&wuffs_zlib__decoder__set_quirk), @@ -55599,11 +55273,11 @@ wuffs_zlib__decoder__set_quirk( return wuffs_base__make_status(wuffs_base__error__unsupported_option); } -// -------- func zlib.decoder.history_retain_length +// -------- func zlib.decoder.dst_history_retain_length WUFFS_BASE__GENERATED_C_CODE WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_zlib__decoder__history_retain_length( +wuffs_zlib__decoder__dst_history_retain_length( const wuffs_zlib__decoder* self) { if (!self) { return wuffs_base__utility__make_optional_u63(false, 0u); @@ -56353,7 +56027,6 @@ wuffs_png__decoder__func_ptrs_for__wuffs_base__image_decoder = { (wuffs_base__rect_ie_u32(*)(const void*))(&wuffs_png__decoder__frame_dirty_rect), (uint64_t(*)(const void*, uint32_t))(&wuffs_png__decoder__get_quirk), - (wuffs_base__optional_u63(*)(const void*))(&wuffs_png__decoder__history_retain_length), (uint32_t(*)(const void*))(&wuffs_png__decoder__num_animation_loops), (uint64_t(*)(const void*))(&wuffs_png__decoder__num_decoded_frame_configs), (uint64_t(*)(const void*))(&wuffs_png__decoder__num_decoded_frames), @@ -62078,23 +61751,6 @@ wuffs_png__decoder__do_tell_me_more( return status; } -// -------- func png.decoder.history_retain_length - -WUFFS_BASE__GENERATED_C_CODE -WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_png__decoder__history_retain_length( - const wuffs_png__decoder* self) { - if (!self) { - return wuffs_base__utility__make_optional_u63(false, 0u); - } - if ((self->private_impl.magic != WUFFS_BASE__MAGIC) && - (self->private_impl.magic != WUFFS_BASE__DISABLED)) { - return wuffs_base__utility__make_optional_u63(false, 0u); - } - - return wuffs_base__utility__make_optional_u63(true, 0u); -} - // -------- func png.decoder.workbuf_len WUFFS_BASE__GENERATED_C_CODE @@ -63143,7 +62799,6 @@ wuffs_tga__decoder__func_ptrs_for__wuffs_base__image_decoder = { (wuffs_base__rect_ie_u32(*)(const void*))(&wuffs_tga__decoder__frame_dirty_rect), (uint64_t(*)(const void*, uint32_t))(&wuffs_tga__decoder__get_quirk), - (wuffs_base__optional_u63(*)(const void*))(&wuffs_tga__decoder__history_retain_length), (uint32_t(*)(const void*))(&wuffs_tga__decoder__num_animation_loops), (uint64_t(*)(const void*))(&wuffs_tga__decoder__num_decoded_frame_configs), (uint64_t(*)(const void*))(&wuffs_tga__decoder__num_decoded_frames), @@ -64505,23 +64160,6 @@ wuffs_tga__decoder__tell_me_more( return status; } -// -------- func tga.decoder.history_retain_length - -WUFFS_BASE__GENERATED_C_CODE -WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_tga__decoder__history_retain_length( - const wuffs_tga__decoder* self) { - if (!self) { - return wuffs_base__utility__make_optional_u63(false, 0u); - } - if ((self->private_impl.magic != WUFFS_BASE__MAGIC) && - (self->private_impl.magic != WUFFS_BASE__DISABLED)) { - return wuffs_base__utility__make_optional_u63(false, 0u); - } - - return wuffs_base__utility__make_optional_u63(true, 0u); -} - // -------- func tga.decoder.workbuf_len WUFFS_BASE__GENERATED_C_CODE @@ -64597,7 +64235,6 @@ wuffs_wbmp__decoder__func_ptrs_for__wuffs_base__image_decoder = { (wuffs_base__rect_ie_u32(*)(const void*))(&wuffs_wbmp__decoder__frame_dirty_rect), (uint64_t(*)(const void*, uint32_t))(&wuffs_wbmp__decoder__get_quirk), - (wuffs_base__optional_u63(*)(const void*))(&wuffs_wbmp__decoder__history_retain_length), (uint32_t(*)(const void*))(&wuffs_wbmp__decoder__num_animation_loops), (uint64_t(*)(const void*))(&wuffs_wbmp__decoder__num_decoded_frame_configs), (uint64_t(*)(const void*))(&wuffs_wbmp__decoder__num_decoded_frames), @@ -65445,23 +65082,6 @@ wuffs_wbmp__decoder__tell_me_more( return status; } -// -------- func wbmp.decoder.history_retain_length - -WUFFS_BASE__GENERATED_C_CODE -WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63 -wuffs_wbmp__decoder__history_retain_length( - const wuffs_wbmp__decoder* self) { - if (!self) { - return wuffs_base__utility__make_optional_u63(false, 0u); - } - if ((self->private_impl.magic != WUFFS_BASE__MAGIC) && - (self->private_impl.magic != WUFFS_BASE__DISABLED)) { - return wuffs_base__utility__make_optional_u63(false, 0u); - } - - return wuffs_base__utility__make_optional_u63(true, 0u); -} - // -------- func wbmp.decoder.workbuf_len WUFFS_BASE__GENERATED_C_CODE @@ -66482,7 +66102,7 @@ Input::BringsItsOwnIOBuffer() { FileInput::FileInput(FILE* f) : m_f(f) {} std::string // -FileInput::CopyIn(IOBuffer* dst, uint64_t history_retain_length) { +FileInput::CopyIn(IOBuffer* dst) { if (!m_f) { return "wuffs_aux::sync_io::FileInput: nullptr file"; } else if (!dst) { @@ -66490,7 +66110,7 @@ FileInput::CopyIn(IOBuffer* dst, uint64_t history_retain_length) { } else if (dst->meta.closed) { return "wuffs_aux::sync_io::FileInput: end of file"; } else { - dst->compact_retaining(history_retain_length); + dst->compact(); size_t n = fread(dst->writer_pointer(), 1, dst->writer_length(), m_f); dst->meta.wi += n; dst->meta.closed = feof(m_f); @@ -66518,7 +66138,7 @@ MemoryInput::BringsItsOwnIOBuffer() { } std::string // -MemoryInput::CopyIn(IOBuffer* dst, uint64_t history_retain_length) { +MemoryInput::CopyIn(IOBuffer* dst) { if (!dst) { return "wuffs_aux::sync_io::MemoryInput: nullptr IOBuffer"; } else if (dst->meta.closed) { @@ -66528,7 +66148,7 @@ MemoryInput::CopyIn(IOBuffer* dst, uint64_t history_retain_length) { // to it. return "wuffs_aux::sync_io::MemoryInput: overlapping buffers"; } else { - dst->compact_retaining(history_retain_length); + dst->compact(); size_t nd = dst->writer_length(); size_t ns = m_io.reader_length(); size_t n = (nd < ns) ? nd : ns; @@ -66583,7 +66203,7 @@ AdvanceIOBufferTo(const ErrorMessages& error_messages, if (!input.BringsItsOwnIOBuffer()) { io_buf.compact(); } - std::string error_message = input.CopyIn(&io_buf, 0); + std::string error_message = input.CopyIn(&io_buf); if (!error_message.empty()) { return error_message; } @@ -66666,7 +66286,7 @@ HandleMetadata( } else if (!input.BringsItsOwnIOBuffer()) { io_buf.compact(); } - std::string error_message = input.CopyIn(&io_buf, 0); + std::string error_message = input.CopyIn(&io_buf); if (!error_message.empty()) { return error_message; } @@ -66810,16 +66430,14 @@ DecodeCbor(DecodeCborCallbacks& callbacks, "wuffs_aux::DecodeCbor: internal error: io_buf is closed"; goto done; } - io_buf->compact_retaining( - dec->history_retain_length().value_or(UINT64_MAX)); + io_buf->compact(); if (io_buf->meta.wi >= io_buf->data.len) { ret_error_message = "wuffs_aux::DecodeCbor: internal error: io_buf is full"; goto done; } cursor_index = io_buf->meta.ri; - io_error_message = input.CopyIn( - io_buf, dec->history_retain_length().value_or(UINT64_MAX)); + io_error_message = input.CopyIn(io_buf); } else { ret_error_message = tok_status.message(); goto done; @@ -67403,7 +67021,7 @@ redirect: fourcc = 0; break; } - std::string error_message = input.CopyIn(&io_buf, 0); + std::string error_message = input.CopyIn(&io_buf); if (!error_message.empty()) { return DecodeImageResult(std::move(error_message)); } @@ -67499,9 +67117,7 @@ redirect: } else if (io_buf.meta.closed) { return DecodeImageResult(DecodeImage_UnexpectedEndOfFile); } else { - std::string error_message = input.CopyIn( - &io_buf, - image_decoder->history_retain_length().value_or(UINT64_MAX)); + std::string error_message = input.CopyIn(&io_buf); if (!error_message.empty()) { return DecodeImageResult(std::move(error_message)); } @@ -67583,8 +67199,7 @@ redirect: } else if (io_buf.meta.closed) { return DecodeImageResult(DecodeImage_UnexpectedEndOfFile); } else { - std::string error_message = input.CopyIn( - &io_buf, image_decoder->history_retain_length().value_or(UINT64_MAX)); + std::string error_message = input.CopyIn(&io_buf); if (!error_message.empty()) { return DecodeImageResult(std::move(error_message)); } @@ -67613,8 +67228,7 @@ redirect: message = DecodeImage_UnexpectedEndOfFile; break; } else { - std::string error_message = input.CopyIn( - &io_buf, image_decoder->history_retain_length().value_or(UINT64_MAX)); + std::string error_message = input.CopyIn(&io_buf); if (!error_message.empty()) { message = std::move(error_message); break; @@ -67642,9 +67256,7 @@ redirect: } else if (io_buf.meta.closed) { return DecodeImageResult(DecodeImage_UnexpectedEndOfFile); } else { - std::string error_message = input.CopyIn( - &io_buf, - image_decoder->history_retain_length().value_or(UINT64_MAX)); + std::string error_message = input.CopyIn(&io_buf); if (!error_message.empty()) { return DecodeImageResult(std::move(error_message)); } @@ -67756,16 +67368,14 @@ DecodeJsonArgJsonPointer::DefaultValue() { "wuffs_aux::DecodeJson: internal error: io_buf is closed"; \ goto done; \ } \ - io_buf->compact_retaining( \ - dec->history_retain_length().value_or(UINT64_MAX)); \ + io_buf->compact(); \ if (io_buf->meta.wi >= io_buf->data.len) { \ ret_error_message = \ "wuffs_aux::DecodeJson: internal error: io_buf is full"; \ goto done; \ } \ cursor_index = io_buf->meta.ri; \ - io_error_message = input.CopyIn( \ - io_buf, dec->history_retain_length().value_or(UINT64_MAX)); \ + io_error_message = input.CopyIn(io_buf); \ } else { \ ret_error_message = tok_status.message(); \ goto done; \ diff --git a/std/bmp/decode_bmp.wuffs b/std/bmp/decode_bmp.wuffs index a6cdc624..938b9d8e 100644 --- a/std/bmp/decode_bmp.wuffs +++ b/std/bmp/decode_bmp.wuffs @@ -15,8 +15,7 @@ pub status "#unsupported BMP file" pri status "@internal note: short read" -pub const DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE : base.u64 = 0 -pub const DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE : base.u64 = 0 +pub const DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE : base.u64 = 0 pri const COMPRESSION_NONE : base.u32 = 0 pri const COMPRESSION_RLE8 : base.u32 = 1 @@ -1257,10 +1256,6 @@ pri func decoder.do_tell_me_more?(dst: base.io_writer, minfo: nptr base.more_inf this.io_redirect_fourcc = 1 } -pub func decoder.history_retain_length() base.optional_u63 { - return this.util.make_optional_u63(has_value: true, value: 0) -} - pub func decoder.workbuf_len() base.range_ii_u64 { return this.util.make_range_ii_u64(min_incl: 0, max_incl: 0) } diff --git a/std/bzip2/decode_bzip2.wuffs b/std/bzip2/decode_bzip2.wuffs index 471dbc82..f04e4f3e 100644 --- a/std/bzip2/decode_bzip2.wuffs +++ b/std/bzip2/decode_bzip2.wuffs @@ -20,8 +20,8 @@ pub status "#unsupported block randomization" pri status "#internal error: inconsistent Huffman decoder state" -pub const DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE : base.u64 = 0 -pub const DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE : base.u64 = 0 +pub const DECODER_DST_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE : base.u64 = 0 +pub const DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE : base.u64 = 0 pri const CLAMP_TO_5 : roarray[8] base.u8[..= 5] = [0, 1, 2, 3, 4, 5, 5, 5] @@ -121,7 +121,7 @@ pub func decoder.set_quirk!(key: base.u32, value: base.u64) base.status { return base."#unsupported option" } -pub func decoder.history_retain_length() base.optional_u63 { +pub func decoder.dst_history_retain_length() base.optional_u63 { return this.util.make_optional_u63(has_value: true, value: 0) } diff --git a/std/cbor/decode_cbor.wuffs b/std/cbor/decode_cbor.wuffs index 3152dd04..5a77cacb 100644 --- a/std/cbor/decode_cbor.wuffs +++ b/std/cbor/decode_cbor.wuffs @@ -16,10 +16,6 @@ pri status "#internal error: inconsistent token length" // -------- -// DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE is the largest -// history_retain_length (for compact_retaining) that a decoder will request. -pub const DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE : base.u64 = 0 - // DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE is the largest workbuf length that a // decoder will request. pub const DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE : base.u64 = 0 @@ -121,10 +117,6 @@ pub func decoder.set_quirk!(key: base.u32, value: base.u64) base.status { return base."#unsupported option" } -pub func decoder.history_retain_length() base.optional_u63 { - return this.util.make_optional_u63(has_value: true, value: 0) -} - pub func decoder.workbuf_len() base.range_ii_u64 { return this.util.empty_range_ii_u64() } diff --git a/std/deflate/decode_deflate.wuffs b/std/deflate/decode_deflate.wuffs index 07977107..71bb891f 100644 --- a/std/deflate/decode_deflate.wuffs +++ b/std/deflate/decode_deflate.wuffs @@ -28,7 +28,7 @@ pri status "#internal error: inconsistent I/O" pri status "#internal error: inconsistent distance" pri status "#internal error: inconsistent n_bits" -pub const DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE : base.u64 = 0 +pub const DECODER_DST_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE : base.u64 = 0 // TODO: replace the placeholder 1 value with either 0 or (32768 + 512), // depending on whether we'll move decoder.history into the workbuf. @@ -205,7 +205,7 @@ pub func decoder.set_quirk!(key: base.u32, value: base.u64) base.status { return base."#unsupported option" } -pub func decoder.history_retain_length() base.optional_u63 { +pub func decoder.dst_history_retain_length() base.optional_u63 { return this.util.make_optional_u63(has_value: true, value: 0) } diff --git a/std/gif/common_consts.wuffs b/std/gif/common_consts.wuffs index a80015a6..100fe9d2 100644 --- a/std/gif/common_consts.wuffs +++ b/std/gif/common_consts.wuffs @@ -19,8 +19,7 @@ pub status "#truncated input" pri status "#internal error: inconsistent I/O" -pub const DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE : base.u64 = 0 -pub const DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE : base.u64 = 0 +pub const DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE : base.u64 = 0 // See the spec appendix E "Interlaced Images" on page 29. The first element // represents either that the frame was non-interlaced, or that all interlace diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index 1d9f5f5f..8790d59c 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -333,10 +333,6 @@ pub func decoder.frame_dirty_rect() base.rect_ie_u32 { max_excl_y: this.dirty_max_excl_y.min(no_more_than: this.height)) } -pub func decoder.history_retain_length() base.optional_u63 { - return this.util.make_optional_u63(has_value: true, value: 0) -} - pub func decoder.workbuf_len() base.range_ii_u64 { return this.util.make_range_ii_u64( min_incl: DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE, diff --git a/std/gzip/decode_gzip.wuffs b/std/gzip/decode_gzip.wuffs index ec0a9805..ce0778eb 100644 --- a/std/gzip/decode_gzip.wuffs +++ b/std/gzip/decode_gzip.wuffs @@ -17,7 +17,7 @@ pub status "#bad encoding flags" pub status "#bad header" pub status "#truncated input" -pub const DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE : base.u64 = 0 +pub const DECODER_DST_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE : base.u64 = 0 // TODO: reference deflate.DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE. pub const DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE : base.u64 = 1 @@ -46,7 +46,7 @@ pub func decoder.set_quirk!(key: base.u32, value: base.u64) base.status { return base."#unsupported option" } -pub func decoder.history_retain_length() base.optional_u63 { +pub func decoder.dst_history_retain_length() base.optional_u63 { return this.util.make_optional_u63(has_value: true, value: 0) } diff --git a/std/jpeg/decode_jpeg.wuffs b/std/jpeg/decode_jpeg.wuffs index b108b9d8..7cbd954d 100644 --- a/std/jpeg/decode_jpeg.wuffs +++ b/std/jpeg/decode_jpeg.wuffs @@ -32,8 +32,7 @@ pub status "#unsupported scan count" pri status "#internal error: inconsistent decoder state" -pub const DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE : base.u64 = 0 -pub const DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE : base.u64 = 0xC_00C0_0300 +pub const DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE : base.u64 = 0xC_00C0_0300 pub struct decoder? implements base.image_decoder( width : base.u32[..= 0xFFFF], @@ -2107,10 +2106,6 @@ pub func decoder.tell_me_more?(dst: base.io_writer, minfo: nptr base.more_inform return base."#no more information" } -pub func decoder.history_retain_length() base.optional_u63 { - return this.util.make_optional_u63(has_value: true, value: 0) -} - pub func decoder.workbuf_len() base.range_ii_u64 { return this.util.make_range_ii_u64( min_incl: this.components_workbuf_offsets[8], diff --git a/std/json/common_consts.wuffs b/std/json/common_consts.wuffs index 36947c00..420de35d 100644 --- a/std/json/common_consts.wuffs +++ b/std/json/common_consts.wuffs @@ -21,10 +21,6 @@ pri status "#internal error: inconsistent I/O" // -------- -// DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE is the largest -// history_retain_length (for compact_retaining) that a decoder will request. -pub const DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE : base.u64 = 0 - // DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE is the largest workbuf length that a // decoder will request. pub const DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE : base.u64 = 0 diff --git a/std/json/decode_json.wuffs b/std/json/decode_json.wuffs index 195f6ff0..2ce565b6 100644 --- a/std/json/decode_json.wuffs +++ b/std/json/decode_json.wuffs @@ -82,10 +82,6 @@ pub func decoder.set_quirk!(key: base.u32, value: base.u64) base.status { return base."#unsupported option" } -pub func decoder.history_retain_length() base.optional_u63 { - return this.util.make_optional_u63(has_value: true, value: 0) -} - pub func decoder.workbuf_len() base.range_ii_u64 { return this.util.empty_range_ii_u64() } diff --git a/std/lzma/decode_lzma.wuffs b/std/lzma/decode_lzma.wuffs index 06f96d5f..663be059 100644 --- a/std/lzma/decode_lzma.wuffs +++ b/std/lzma/decode_lzma.wuffs @@ -17,7 +17,7 @@ pub status "#truncated input" pub status "#unsupported decoded length" pub status "#unsupported properties" -pub const DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE : base.u64 = 0xFFFF_FFFF +pub const DECODER_DST_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE : base.u64 = 0xFFFF_FFFF pub const DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE : base.u64 = 0 @@ -103,7 +103,7 @@ pub func decoder.set_quirk!(key: base.u32, value: base.u64) base.status { return base."#unsupported option" } -pub func decoder.history_retain_length() base.optional_u63 { +pub func decoder.dst_history_retain_length() base.optional_u63 { if this.dict_size == 0 { return this.util.make_optional_u63(has_value: false, value: 0) } diff --git a/std/lzw/decode_lzw.wuffs b/std/lzw/decode_lzw.wuffs index 7585414a..6459192c 100644 --- a/std/lzw/decode_lzw.wuffs +++ b/std/lzw/decode_lzw.wuffs @@ -13,7 +13,7 @@ pub status "#truncated input" pri status "#internal error: inconsistent I/O" -pub const DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE : base.u64 = 0 +pub const DECODER_DST_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE : base.u64 = 0 // TODO: move bulk data buffers like decoder.suffixes or decoder.output into // the workbuf? The first attempt at this was a performance regression for @@ -86,7 +86,7 @@ pub func decoder.set_quirk!(key: base.u32, value: base.u64) base.status { return base."#unsupported option" } -pub func decoder.history_retain_length() base.optional_u63 { +pub func decoder.dst_history_retain_length() base.optional_u63 { return this.util.make_optional_u63(has_value: true, value: 0) } diff --git a/std/netpbm/decode_netpbm.wuffs b/std/netpbm/decode_netpbm.wuffs index 172c66cf..0120a2da 100644 --- a/std/netpbm/decode_netpbm.wuffs +++ b/std/netpbm/decode_netpbm.wuffs @@ -14,8 +14,7 @@ pub status "#unsupported Netpbm file" pri status "@internal note: short read" -pub const DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE : base.u64 = 0 -pub const DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE : base.u64 = 0 +pub const DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE : base.u64 = 0 pub struct decoder? implements base.image_decoder( pixfmt : base.u32, @@ -429,10 +428,6 @@ pub func decoder.tell_me_more?(dst: base.io_writer, minfo: nptr base.more_inform return base."#no more information" } -pub func decoder.history_retain_length() base.optional_u63 { - return this.util.make_optional_u63(has_value: true, value: 0) -} - pub func decoder.workbuf_len() base.range_ii_u64 { return this.util.make_range_ii_u64(min_incl: 0, max_incl: 0) } diff --git a/std/nie/decode_nie.wuffs b/std/nie/decode_nie.wuffs index 5559ff93..19cfd4e1 100644 --- a/std/nie/decode_nie.wuffs +++ b/std/nie/decode_nie.wuffs @@ -14,8 +14,7 @@ pub status "#unsupported NIE file" pri status "@internal note: short read" -pub const DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE : base.u64 = 0 -pub const DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE : base.u64 = 0 +pub const DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE : base.u64 = 0 pub struct decoder? implements base.image_decoder( pixfmt : base.u32, @@ -325,10 +324,6 @@ pub func decoder.tell_me_more?(dst: base.io_writer, minfo: nptr base.more_inform return base."#no more information" } -pub func decoder.history_retain_length() base.optional_u63 { - return this.util.make_optional_u63(has_value: true, value: 0) -} - pub func decoder.workbuf_len() base.range_ii_u64 { return this.util.make_range_ii_u64(min_incl: 0, max_incl: 0) } diff --git a/std/png/common_consts.wuffs b/std/png/common_consts.wuffs index 6b3fc109..6dac0a21 100644 --- a/std/png/common_consts.wuffs +++ b/std/png/common_consts.wuffs @@ -25,8 +25,7 @@ pri status "#internal error: inconsistent chunk type" pri status "#internal error: inconsistent workbuf length" pri status "#internal error: zlib decoder did not exhaust its input" -pub const DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE : base.u64 = 0 -pub const DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE : base.u64 = 0x0007_FFFF_F100_0007 +pub const DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE : base.u64 = 0x0007_FFFF_F100_0007 // DECODER_SRC_IO_BUFFER_LENGTH_MIN_INCL is the minimum length of the src // wuffs_base__io_buffer passed to the decoder. diff --git a/std/png/decode_png.wuffs b/std/png/decode_png.wuffs index 8307afa6..5c9b846b 100644 --- a/std/png/decode_png.wuffs +++ b/std/png/decode_png.wuffs @@ -1719,10 +1719,6 @@ pri func decoder.do_tell_me_more?(dst: base.io_writer, minfo: nptr base.more_inf return ok } -pub func decoder.history_retain_length() base.optional_u63 { - return this.util.make_optional_u63(has_value: true, value: 0) -} - pub func decoder.workbuf_len() base.range_ii_u64 { return this.util.make_range_ii_u64( min_incl: this.overall_workbuf_length, diff --git a/std/tga/decode_tga.wuffs b/std/tga/decode_tga.wuffs index 1955a390..28e2f930 100644 --- a/std/tga/decode_tga.wuffs +++ b/std/tga/decode_tga.wuffs @@ -13,8 +13,7 @@ pub status "#bad run length encoding" pub status "#truncated input" pub status "#unsupported TGA file" -pub const DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE : base.u64 = 0 -pub const DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE : base.u64 = 0 +pub const DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE : base.u64 = 0 pub struct decoder? implements base.image_decoder( width : base.u32[..= 0xFFFF], @@ -612,10 +611,6 @@ pub func decoder.tell_me_more?(dst: base.io_writer, minfo: nptr base.more_inform return base."#no more information" } -pub func decoder.history_retain_length() base.optional_u63 { - return this.util.make_optional_u63(has_value: true, value: 0) -} - pub func decoder.workbuf_len() base.range_ii_u64 { return this.util.make_range_ii_u64(min_incl: 0, max_incl: 0) } diff --git a/std/wbmp/decode_wbmp.wuffs b/std/wbmp/decode_wbmp.wuffs index 9cdc4c00..75ab8a75 100644 --- a/std/wbmp/decode_wbmp.wuffs +++ b/std/wbmp/decode_wbmp.wuffs @@ -11,8 +11,7 @@ pub status "#bad header" pub status "#truncated input" -pub const DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE : base.u64 = 0 -pub const DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE : base.u64 = 0 +pub const DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE : base.u64 = 0 pub struct decoder? implements base.image_decoder( width : base.u32[..= 0xFF_FFFF], @@ -310,10 +309,6 @@ pub func decoder.tell_me_more?(dst: base.io_writer, minfo: nptr base.more_inform return base."#no more information" } -pub func decoder.history_retain_length() base.optional_u63 { - return this.util.make_optional_u63(has_value: true, value: 0) -} - pub func decoder.workbuf_len() base.range_ii_u64 { return this.util.make_range_ii_u64(min_incl: 0, max_incl: 0) } diff --git a/std/zlib/decode_zlib.wuffs b/std/zlib/decode_zlib.wuffs index 1d0f98fd..450d0c18 100644 --- a/std/zlib/decode_zlib.wuffs +++ b/std/zlib/decode_zlib.wuffs @@ -20,7 +20,7 @@ pub status "#bad parity check" pub status "#incorrect dictionary" pub status "#truncated input" -pub const DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE : base.u64 = 0 +pub const DECODER_DST_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE : base.u64 = 0 // TODO: reference deflate.DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE. pub const DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE : base.u64 = 1 @@ -93,7 +93,7 @@ pub func decoder.set_quirk!(key: base.u32, value: base.u64) base.status { return base."#unsupported option" } -pub func decoder.history_retain_length() base.optional_u63 { +pub func decoder.dst_history_retain_length() base.optional_u63 { return this.util.make_optional_u63(has_value: true, value: 0) }