diff options
| author | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:07:35 -0700 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:07:35 -0700 |
| commit | 1c71d8b13b54f91ddec361d3053ecce26e6ff761 (patch) | |
| tree | 84f806bb79cc8c7458ddbd7b5402dbf1eec76dd4 /deflate.c | |
| parent | 64b2e892035cf6ea98800c54dce0d63730d50272 (diff) | |
| download | zlib-0.91.tar.gz zlib-0.91.tar.bz2 zlib-0.91.zip | |
zlib 0.91v0.91
Diffstat (limited to '')
| -rw-r--r-- | deflate.c | 11 |
1 files changed, 6 insertions, 5 deletions
| @@ -47,7 +47,7 @@ | |||
| 47 | * | 47 | * |
| 48 | */ | 48 | */ |
| 49 | 49 | ||
| 50 | /* $Id: deflate.c,v 1.6 1995/05/01 17:23:57 jloup Exp $ */ | 50 | /* $Id: deflate.c,v 1.7 1995/05/02 13:28:18 jloup Exp $ */ |
| 51 | 51 | ||
| 52 | #include "deflate.h" | 52 | #include "deflate.h" |
| 53 | 53 | ||
| @@ -165,7 +165,7 @@ int deflateInit (strm, level) | |||
| 165 | z_stream *strm; | 165 | z_stream *strm; |
| 166 | int level; | 166 | int level; |
| 167 | { | 167 | { |
| 168 | return deflateInit2 (strm, level, DEFLATED, MAX_WBITS, MAX_MEM_LEVEL, 0); | 168 | return deflateInit2 (strm, level, DEFLATED, MAX_WBITS, DEF_MEM_LEVEL, 0); |
| 169 | /* To do: ignore strm->next_in if we use it as window */ | 169 | /* To do: ignore strm->next_in if we use it as window */ |
| 170 | } | 170 | } |
| 171 | 171 | ||
| @@ -344,22 +344,23 @@ int deflate (strm, flush) | |||
| 344 | */ | 344 | */ |
| 345 | if (strm->avail_in != 0 || | 345 | if (strm->avail_in != 0 || |
| 346 | (flush == Z_FINISH && strm->state->status != FINISH_STATE)) { | 346 | (flush == Z_FINISH && strm->state->status != FINISH_STATE)) { |
| 347 | int quit; | ||
| 347 | 348 | ||
| 348 | if (flush == Z_FINISH) { | 349 | if (flush == Z_FINISH) { |
| 349 | strm->state->status = FINISH_STATE; | 350 | strm->state->status = FINISH_STATE; |
| 350 | } | 351 | } |
| 351 | if (strm->state->level <= 3) { | 352 | if (strm->state->level <= 3) { |
| 352 | if (deflate_fast(strm->state, flush)) return Z_OK; | 353 | quit = deflate_fast(strm->state, flush); |
| 353 | } else { | 354 | } else { |
| 354 | if (deflate_slow(strm->state, flush)) return Z_OK; | 355 | quit = deflate_slow(strm->state, flush); |
| 355 | } | 356 | } |
| 356 | /* ??? remember Z_FULL_FLUSH if we didn't have enough space */ | ||
| 357 | if (flush == Z_FULL_FLUSH) { | 357 | if (flush == Z_FULL_FLUSH) { |
| 358 | ct_stored_block(strm->state, (char*)0, 0L, 0); /* special marker */ | 358 | ct_stored_block(strm->state, (char*)0, 0L, 0); /* special marker */ |
| 359 | flush_pending(strm); | 359 | flush_pending(strm); |
| 360 | CLEAR_HASH(strm->state); /* forget history */ | 360 | CLEAR_HASH(strm->state); /* forget history */ |
| 361 | if (strm->avail_out == 0) return Z_OK; | 361 | if (strm->avail_out == 0) return Z_OK; |
| 362 | } | 362 | } |
| 363 | if (quit) return Z_OK; | ||
| 363 | } | 364 | } |
| 364 | Assert(strm->avail_out > 0, "bug2"); | 365 | Assert(strm->avail_out > 0, "bug2"); |
| 365 | 366 | ||