diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2004-09-08 16:04:43 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2004-09-08 16:04:43 +0000 |
| commit | 88ff012c446c98bf017a29af883d0d6b0c25c26d (patch) | |
| tree | 5e16df496a98b33aa9cb875ee5785945943f5034 /zlib/uncompr.c | |
| parent | 53d7e32ff3f2c6baf17d10988736ba6bf3f8c4c6 (diff) | |
Update PNG to 1.2.6 + wutil patch.
Update ZLIB to 1.2.1.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3809 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'zlib/uncompr.c')
| -rw-r--r-- | zlib/uncompr.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/zlib/uncompr.c b/zlib/uncompr.c index 35578f93c..ea73a9550 100644 --- a/zlib/uncompr.c +++ b/zlib/uncompr.c @@ -1,10 +1,11 @@ /* uncompr.c -- decompress a memory buffer - * Copyright (C) 1995-2002 Jean-loup Gailly. - * For conditions of distribution and use, see copyright notice in zlib.h + * Copyright (C) 1995-2003 Jean-loup Gailly. + * For conditions of distribution and use, see copyright notice in zlib.h */ -/* @(#) $Id: uncompr.c,v 1.1.2.1 2004/07/05 14:12:38 easysw Exp $ */ +/* @(#) $Id: uncompr.c,v 1.1.2.2 2004/09/08 16:04:43 easysw Exp $ */ +#define ZLIB_INTERNAL #include "zlib.h" /* =========================================================================== @@ -49,7 +50,9 @@ int ZEXPORT uncompress (dest, destLen, source, sourceLen) err = inflate(&stream, Z_FINISH); if (err != Z_STREAM_END) { inflateEnd(&stream); - return err == Z_OK ? Z_BUF_ERROR : err; + if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0)) + return Z_DATA_ERROR; + return err; } *destLen = stream.total_out; |