Add a workbuf argument to decode_io_writer

This commit is contained in:
Nigel Tao committed 2019-02-02 15:35:05 +11:00
1 parent 91f7f4b70a
commit c9830ceb9a
16 files changed
+111 -52

No files matched your search

+1 -1
View File
@@ -121,7 +121,7 @@ pub struct decoder?(
end_of_block base.bool,
)
pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader) {
pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader, workbuf slice base.u8) {
var status base.status
var written slice base.u8
var n_copied base.u64
+2 -1
View File
@@ -715,7 +715,8 @@ pri func decoder.decode_id_part2?(dst ptr base.pixel_buffer, src base.io_reader,
return "?internal error: inconsistent ri/wi"
}
io_bind (io:r, data:this.compressed[this.compressed_ri:this.compressed_wi]) {
lzw_status =? this.lzw.decode_io_writer?(dst:this.util.null_io_writer(), src:r)
lzw_status =? this.lzw.decode_io_writer?(
dst:this.util.null_io_writer(), src:r, workbuf:this.util.null_slice_u8())
this.compressed_ri ~sat+= r.since_mark().length()
}
+2 -2
View File
@@ -30,7 +30,7 @@ pub func decoder.set_ignore_checksum!(ic base.bool) {
this.ignore_checksum = args.ic
}
pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader) {
pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader, workbuf slice base.u8) {
var c base.u8
var flags base.u8
var xlen base.u16
@@ -100,7 +100,7 @@ pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader) {
// Decode and checksum the DEFLATE-encoded payload.
while true {
args.dst.set_mark!()
status =? this.flate.decode_io_writer?(dst:args.dst, src:args.src)
status =? this.flate.decode_io_writer?(dst:args.dst, src:args.src, workbuf:args.workbuf)
if not this.ignore_checksum {
checksum_got = this.checksum.update!(x:args.dst.since_mark())
decoded_length_got ~mod+= ((args.dst.since_mark().length() & 0xFFFFFFFF) as base.u32)
+1 -1
View File
@@ -58,7 +58,7 @@ pub func decoder.set_literal_width!(lw base.u32[2..8]) {
this.lw = args.lw
}
pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader) {
pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader, workbuf slice base.u8) {
var i base.u32[..8191]
// Initialize read_from state.
+2 -2
View File
@@ -32,7 +32,7 @@ pub func decoder.set_ignore_checksum!(ic base.bool) {
this.ignore_checksum = args.ic
}
pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader) {
pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader, workbuf slice base.u8) {
var x base.u16
var checksum_got base.u32
var status base.status
@@ -55,7 +55,7 @@ pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader) {
// Decode and checksum the DEFLATE-encoded payload.
while true {
args.dst.set_mark!()
status =? this.flate.decode_io_writer?(dst:args.dst, src:args.src)
status =? this.flate.decode_io_writer?(dst:args.dst, src:args.src, workbuf:args.workbuf)
if not this.ignore_checksum {
checksum_got = this.checksum.update!(x:args.dst.since_mark())
}