Commit4c6d22a

Lance Andersen

committed

8288769: Revert unintentional change to deflate.c

Reviewed-by: iris, bpb, alanb

1 parent5fce02e commit4c6d22aCopy full SHA for 4c6d22a

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -555,7 +555,7 @@ int ZEXPORT deflateResetKeep (strm)`
`555`	`555`	`s->wrap==2 ?crc32(0L,Z_NULL,0) :`
`556`	`556`	`#endif`
`557`	`557`	`adler32(0L,Z_NULL,0);`
`558`		`-s->last_flush=Z_NO_FLUSH;`
	`558`	`+s->last_flush=-2;`
`559`	`559`
`560`	`560`	`_tr_init(s);`
`561`	`561`
`@@ -649,7 +649,7 @@ int ZEXPORT deflateParams(strm, level, strategy)`
`649`	`649`	`func=configuration_table[s->level].func;`
`650`	`650`
`651`	`651`	`if ((strategy!=s->strategy\|\|func!=configuration_table[level].func)&&`
`652`		`-s->high_water) {`
	`652`	`+s->last_flush!=-2) {`
`653`	`653`	`/* Flush the last buffer: */`
`654`	`654`	`interr=deflate(strm,Z_BLOCK);`
`655`	`655`	`if (err==Z_STREAM_ERROR)`

Comments

(0)