8288769: Revert unintentional change to deflate.c
Reviewed-by: iris, bpb, alanb
This commit is contained in:
parent
5fce02e39a
commit
4c6d22a6ce
@ -555,7 +555,7 @@ int ZEXPORT deflateResetKeep (strm)
|
|||||||
s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
|
s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
|
||||||
#endif
|
#endif
|
||||||
adler32(0L, Z_NULL, 0);
|
adler32(0L, Z_NULL, 0);
|
||||||
s->last_flush = Z_NO_FLUSH;
|
s->last_flush = -2;
|
||||||
|
|
||||||
_tr_init(s);
|
_tr_init(s);
|
||||||
|
|
||||||
@ -649,7 +649,7 @@ int ZEXPORT deflateParams(strm, level, strategy)
|
|||||||
func = configuration_table[s->level].func;
|
func = configuration_table[s->level].func;
|
||||||
|
|
||||||
if ((strategy != s->strategy || func != configuration_table[level].func) &&
|
if ((strategy != s->strategy || func != configuration_table[level].func) &&
|
||||||
s->high_water) {
|
s->last_flush != -2) {
|
||||||
/* Flush the last buffer: */
|
/* Flush the last buffer: */
|
||||||
int err = deflate(strm, Z_BLOCK);
|
int err = deflate(strm, Z_BLOCK);
|
||||||
if (err == Z_STREAM_ERROR)
|
if (err == Z_STREAM_ERROR)
|
||||||
|
Loading…
Reference in New Issue
Block a user