diff options
| author | Martin Pool <mbp@samba.org> | 2002-03-12 01:14:58 +0000 |
|---|---|---|
| committer | Martin Pool <mbp@samba.org> | 2002-03-12 01:14:58 +0000 |
| commit | be59d0ec2329bd6949bd2fd87ebd9ff69770cfb9 (patch) | |
| tree | 1f6cb3f9567883059878c604076a8e3fabe06d9e /zlib/deflate.c | |
| parent | 0bc467516a83259a1a4b4059001caa6fe0383b46 (diff) | |
| download | android_external_rsync-be59d0ec2329bd6949bd2fd87ebd9ff69770cfb9.tar.gz android_external_rsync-be59d0ec2329bd6949bd2fd87ebd9ff69770cfb9.tar.bz2 android_external_rsync-be59d0ec2329bd6949bd2fd87ebd9ff69770cfb9.zip | |
Patch from Jos Backus to merge zlib-1.1.4.
Diffstat (limited to 'zlib/deflate.c')
| -rw-r--r-- | zlib/deflate.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/zlib/deflate.c b/zlib/deflate.c index 39a968d5..74f67cfe 100644 --- a/zlib/deflate.c +++ b/zlib/deflate.c @@ -1,5 +1,5 @@ /* deflate.c -- compress data using the deflation algorithm - * Copyright (C) 1995-1998 Jean-loup Gailly. + * Copyright (C) 1995-2002 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -52,7 +52,7 @@ #include "deflate.h" const char deflate_copyright[] = - " deflate 1.1.3 Copyright 1995-1998 Jean-loup Gailly "; + " deflate 1.1.4 Copyright 1995-2002 Jean-loup Gailly "; /* If you use the zlib library in a product, an acknowledgment is welcome in the documentation of your product. If for some reason you cannot @@ -242,7 +242,7 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, windowBits = -windowBits; } if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED || - windowBits < 8 || windowBits > 15 || level < 0 || level > 9 || + windowBits < 9 || windowBits > 15 || level < 0 || level > 9 || strategy < 0 || strategy > Z_HUFFMAN_ONLY) { return Z_STREAM_ERROR; } |