diff options
author | dkf <donal.k.fellows@manchester.ac.uk> | 2016-04-04 10:06:40 (GMT) |
---|---|---|
committer | dkf <donal.k.fellows@manchester.ac.uk> | 2016-04-04 10:06:40 (GMT) |
commit | 1fa8d8f8ed23d263b17cb2315eaf7de803690ee4 (patch) | |
tree | cb68882ce559d423af7a6ef11394623993dad295 /generic | |
parent | aa0288d6918b42ae6b13f1cd94180e28c4ce3750 (diff) | |
parent | 082197d5c8f618d1cf78dffd199915806079b7de (diff) | |
download | tcl-1fa8d8f8ed23d263b17cb2315eaf7de803690ee4.zip tcl-1fa8d8f8ed23d263b17cb2315eaf7de803690ee4.tar.gz tcl-1fa8d8f8ed23d263b17cb2315eaf7de803690ee4.tar.bz2 |
Corrections to compression stream flushing to make Tk generate PNGs correctly. Tk bug [9eb55debc5].
Diffstat (limited to 'generic')
-rw-r--r-- | generic/tclZlib.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/generic/tclZlib.c b/generic/tclZlib.c index 50d9a30..691d57a 100644 --- a/generic/tclZlib.c +++ b/generic/tclZlib.c @@ -1194,11 +1194,12 @@ Tcl_ZlibStreamPut( zshPtr->stream.next_out = (Bytef *) dataTmp; e = deflate(&zshPtr->stream, flush); - while (e == Z_BUF_ERROR) { + while (e == Z_BUF_ERROR || (flush == Z_FINISH && e == Z_OK)) { /* - * Output buffer too small to hold the data being generated; so - * put a new buffer into place after saving the old generated - * data to the outData list. + * Output buffer too small to hold the data being generated or we + * are doing the end-of-stream flush (which can spit out masses of + * data). This means we need to put a new buffer into place after + * saving the old generated data to the outData list. */ obj = Tcl_NewByteArrayObj((unsigned char *) dataTmp, outSize); |