RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2010-03-22 Joel Sherrill <joel.sherrill@oarcorp.com>

Browse Source 
* ChangeLog.zlib, FAQ, Makefile.am, README, adler32.c, compress.c,
	crc32.c, deflate.c, deflate.h, infback.c, inffast.c, inflate.c,
	inflate.h, inftrees.c, inftrees.h, trees.c, uncompr.c, zconf.h,
	zlib.3, zlib.h, zutil.c, zutil.h: Update to zlib 1.2.4.
	* gzclose.c, gzguts.h, gzlib.c, gzread.c, gzwrite.c, doc/algorithm.txt:
	New files.
	* algorithm.txt, gzio.c: Removed.
This commit is contained in:
Joel Sherrill
2011-03-18 10:11:29 +00:00
parent 41ca776ff7
commit 6121dc7736
28 changed files with 4033 additions and 2244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
cpukit/zlib/compress.c
View File

@@ -1,5 +1,5 @@
/* compress.c -- compress a memory buffer
* Copyright (C) 1995-2003 Jean-loup Gailly.
* Copyright (C) 1995-2005 Jean-loup Gailly.
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -19,12 +19,12 @@
memory, Z_BUF_ERROR if there was not enough room in the output buffer,
Z_STREAM_ERROR if the level parameter is invalid.
*/
int ZEXPORT compress2 (
Bytef *dest,
uLongf *destLen,
const Bytef *source,
uLong sourceLen,
int level)
int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
Bytef *dest;
uLongf *destLen;
const Bytef *source;
uLong sourceLen;
int level;
{
z_stream stream;
int err;
@@ -59,11 +59,11 @@ int ZEXPORT compress2 (
/* ===========================================================================
*/
int ZEXPORT compress (
Bytef *dest,
uLongf *destLen,
const Bytef *source,
uLong sourceLen)
int ZEXPORT compress (dest, destLen, source, sourceLen)
Bytef *dest;
uLongf *destLen;
const Bytef *source;
uLong sourceLen;
{
return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
}
@@ -72,8 +72,9 @@ int ZEXPORT compress (
If the default memLevel or windowBits for deflateInit() is changed, then
this function needs to be updated.
*/
uLong ZEXPORT compressBound (
uLong sourceLen)
uLong ZEXPORT compressBound (sourceLen)
uLong sourceLen;
{
return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + 11;
return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
(sourceLen >> 25) + 13;
}