|
|
@ -491,7 +491,7 @@ int ZEXPORT deflateResetKeep (strm) |
|
|
|
#ifdef GZIP |
|
|
|
#ifdef GZIP |
|
|
|
s->wrap == 2 ? GZIP_STATE : |
|
|
|
s->wrap == 2 ? GZIP_STATE : |
|
|
|
#endif |
|
|
|
#endif |
|
|
|
s->wrap ? INIT_STATE : BUSY_STATE; |
|
|
|
INIT_STATE; |
|
|
|
strm->adler = |
|
|
|
strm->adler = |
|
|
|
#ifdef GZIP |
|
|
|
#ifdef GZIP |
|
|
|
s->wrap == 2 ? crc32(0L, Z_NULL, 0) : |
|
|
|
s->wrap == 2 ? crc32(0L, Z_NULL, 0) : |
|
|
@ -814,6 +814,8 @@ int ZEXPORT deflate (strm, flush) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/* Write the header */ |
|
|
|
/* Write the header */ |
|
|
|
|
|
|
|
if (s->status == INIT_STATE && s->wrap == 0) |
|
|
|
|
|
|
|
s->status = BUSY_STATE; |
|
|
|
if (s->status == INIT_STATE) { |
|
|
|
if (s->status == INIT_STATE) { |
|
|
|
/* zlib header */ |
|
|
|
/* zlib header */ |
|
|
|
uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8; |
|
|
|
uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8; |
|
|
|