summaryrefslogtreecommitdiff
path: root/deflate.c
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2011-09-09 23:20:42 -0700
committerMark Adler <madler@alumni.caltech.edu>2011-09-09 23:20:42 -0700
commita383133c4e7b93113cee912f213cf9502d785fa7 (patch)
treebb7c39ab38418fcab817accad1e625b3de0c8237 /deflate.c
parent14763ac7c6c03bca62c39e35c03cf5bfc7728802 (diff)
downloadzlib-a383133c4e7b93113cee912f213cf9502d785fa7.tar.gz
zlib-a383133c4e7b93113cee912f213cf9502d785fa7.tar.bz2
zlib-a383133c4e7b93113cee912f213cf9502d785fa7.zip
zlib 1.1.4v1.1.4
Diffstat (limited to 'deflate.c')
-rw-r--r--deflate.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/deflate.c b/deflate.c
index 25d5818..16ebdad 100644
--- a/deflate.c
+++ b/deflate.c
@@ -1,5 +1,5 @@
1/* deflate.c -- compress data using the deflation algorithm 1/* deflate.c -- compress data using the deflation algorithm
2 * Copyright (C) 1995-1998 Jean-loup Gailly. 2 * Copyright (C) 1995-2002 Jean-loup Gailly.
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
@@ -52,7 +52,7 @@
52#include "deflate.h" 52#include "deflate.h"
53 53
54const char deflate_copyright[] = 54const char deflate_copyright[] =
55 " deflate 1.1.3 Copyright 1995-1998 Jean-loup Gailly "; 55 " deflate 1.1.4 Copyright 1995-2002 Jean-loup Gailly ";
56/* 56/*
57 If you use the zlib library in a product, an acknowledgment is welcome 57 If you use the zlib library in a product, an acknowledgment is welcome
58 in the documentation of your product. If for some reason you cannot 58 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,
242 windowBits = -windowBits; 242 windowBits = -windowBits;
243 } 243 }
244 if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED || 244 if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||
245 windowBits < 8 || windowBits > 15 || level < 0 || level > 9 || 245 windowBits < 9 || windowBits > 15 || level < 0 || level > 9 ||
246 strategy < 0 || strategy > Z_HUFFMAN_ONLY) { 246 strategy < 0 || strategy > Z_HUFFMAN_ONLY) {
247 return Z_STREAM_ERROR; 247 return Z_STREAM_ERROR;
248 } 248 }