zlib 1.2.0.8

This commit is contained in:
Mark Adler
2011-09-09 23:23:14 -07:00
parent b97ec631c6
commit a2506218cd
31 changed files with 1530 additions and 119 deletions

View File

@@ -568,7 +568,7 @@ int flush;
switch (state->mode) {
case HEAD:
if (state->wrap == 0) {
state->mode = TYPE;
state->mode = TYPEDO;
break;
}
NEEDBITS(16);
@@ -1074,8 +1074,8 @@ int flush;
if (state->wrap && out)
strm->adler = state->check =
UPDATE(state->check, strm->next_out - out, out);
strm->data_type = state->bits + (state->last ? 8 : 0) +
(state->mode == TYPE ? 16 : 0);
strm->data_type = state->bits + (state->last ? 64 : 0) +
(state->mode == TYPE ? 128 : 0);
if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)
ret = Z_BUF_ERROR;
return ret;