projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
adapting to init pattern
[wxWidgets.git]
/
src
/
zlib
/
uncompr.c
diff --git
a/src/zlib/uncompr.c
b/src/zlib/uncompr.c
index b9e3e700813d2ee03c3080b4b30031d394432a08..b59e3d0defb24b22c83167609f2cc5eb7620b96b 100644
(file)
--- a/
src/zlib/uncompr.c
+++ b/
src/zlib/uncompr.c
@@
-1,11
+1,12
@@
/* uncompr.c -- decompress a memory buffer
/* uncompr.c -- decompress a memory buffer
- * Copyright (C) 1995-200
2
Jean-loup Gailly.
+ * Copyright (C) 1995-200
3
Jean-loup Gailly.
* For conditions of distribution and use, see copyright notice in zlib.h
*/
/* @(#) $Id$ */
* For conditions of distribution and use, see copyright notice in zlib.h
*/
/* @(#) $Id$ */
-#include "../zlib/zlib.h"
+#define ZLIB_INTERNAL
+#include "zlib.h"
/* ===========================================================================
Decompresses the source buffer into the destination buffer. sourceLen is
/* ===========================================================================
Decompresses the source buffer into the destination buffer. sourceLen is
@@
-22,15
+23,11
@@
enough memory, Z_BUF_ERROR if there was not enough room in the output
buffer, or Z_DATA_ERROR if the input data was corrupted.
*/
enough memory, Z_BUF_ERROR if there was not enough room in the output
buffer, or Z_DATA_ERROR if the input data was corrupted.
*/
-#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */
-int ZEXPORT uncompress (Bytef* dest, uLongf* destLen, const Bytef* source, uLong sourceLen)
-#else
int ZEXPORT uncompress (dest, destLen, source, sourceLen)
Bytef *dest;
uLongf *destLen;
const Bytef *source;
uLong sourceLen;
int ZEXPORT uncompress (dest, destLen, source, sourceLen)
Bytef *dest;
uLongf *destLen;
const Bytef *source;
uLong sourceLen;
-#endif
{
z_stream stream;
int err;
{
z_stream stream;
int err;
@@
-53,7
+50,9
@@
int ZEXPORT uncompress (dest, destLen, source, sourceLen)
err = inflate(&stream, Z_FINISH);
if (err != Z_STREAM_END) {
inflateEnd(&stream);
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;
}
*destLen = stream.total_out;