summaryrefslogtreecommitdiff
path: root/Build/source/libs/zlib/zlib-1.2.5/contrib
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-09-28 08:55:14 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-09-28 08:55:14 +0000
commitea93ad9c5957f1badfded9711a62d0b59eb5da37 (patch)
tree85ee6a54bca67c4a6b344fcb976be08291eea48a /Build/source/libs/zlib/zlib-1.2.5/contrib
parent318761867b5f3343ba020e670c0b160bbf1a6bd0 (diff)
zlib 1.2.5 (20apr10)
git-svn-id: svn://tug.org/texlive/trunk@19929 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/zlib/zlib-1.2.5/contrib')
-rw-r--r--Build/source/libs/zlib/zlib-1.2.5/contrib/delphi/ZLib.pas2
-rw-r--r--Build/source/libs/zlib/zlib-1.2.5/contrib/dotzlib/DotZLib/UnitTests.cs2
-rw-r--r--Build/source/libs/zlib/zlib-1.2.5/contrib/infback9/inftree9.c4
-rw-r--r--Build/source/libs/zlib/zlib-1.2.5/contrib/pascal/zlibpas.pas2
-rw-r--r--Build/source/libs/zlib/zlib-1.2.5/contrib/puff/puff.c29
-rw-r--r--Build/source/libs/zlib/zlib-1.2.5/contrib/puff/puff.h4
-rw-r--r--Build/source/libs/zlib/zlib-1.2.5/contrib/vstudio/vc10/zlib.rc6
-rw-r--r--Build/source/libs/zlib/zlib-1.2.5/contrib/vstudio/vc9/zlib.rc6
8 files changed, 34 insertions, 21 deletions
diff --git a/Build/source/libs/zlib/zlib-1.2.5/contrib/delphi/ZLib.pas b/Build/source/libs/zlib/zlib-1.2.5/contrib/delphi/ZLib.pas
index 179f9a90ccf..0d86fb52fcf 100644
--- a/Build/source/libs/zlib/zlib-1.2.5/contrib/delphi/ZLib.pas
+++ b/Build/source/libs/zlib/zlib-1.2.5/contrib/delphi/ZLib.pas
@@ -152,7 +152,7 @@ procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
const OutBuf: Pointer; BufSize: Integer);
const
- zlib_version = '1.2.4';
+ zlib_version = '1.2.5';
type
EZlibError = class(Exception);
diff --git a/Build/source/libs/zlib/zlib-1.2.5/contrib/dotzlib/DotZLib/UnitTests.cs b/Build/source/libs/zlib/zlib-1.2.5/contrib/dotzlib/DotZLib/UnitTests.cs
index 0c355537a5f..528a0398e03 100644
--- a/Build/source/libs/zlib/zlib-1.2.5/contrib/dotzlib/DotZLib/UnitTests.cs
+++ b/Build/source/libs/zlib/zlib-1.2.5/contrib/dotzlib/DotZLib/UnitTests.cs
@@ -156,7 +156,7 @@ namespace DotZLibTests
public void Info_Version()
{
Info info = new Info();
- Assert.AreEqual("1.2.4", Info.Version);
+ Assert.AreEqual("1.2.5", Info.Version);
Assert.AreEqual(32, info.SizeOfUInt);
Assert.AreEqual(32, info.SizeOfULong);
Assert.AreEqual(32, info.SizeOfPointer);
diff --git a/Build/source/libs/zlib/zlib-1.2.5/contrib/infback9/inftree9.c b/Build/source/libs/zlib/zlib-1.2.5/contrib/infback9/inftree9.c
index 510bba694ec..306c5f1b19e 100644
--- a/Build/source/libs/zlib/zlib-1.2.5/contrib/infback9/inftree9.c
+++ b/Build/source/libs/zlib/zlib-1.2.5/contrib/infback9/inftree9.c
@@ -9,7 +9,7 @@
#define MAXBITS 15
const char inflate9_copyright[] =
- " inflate9 1.2.4 Copyright 1995-2010 Mark Adler ";
+ " inflate9 1.2.5 Copyright 1995-2010 Mark Adler ";
/*
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
@@ -64,7 +64,7 @@ unsigned short FAR *work;
static const unsigned short lext[31] = { /* Length codes 257..285 extra */
128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
- 133, 133, 133, 133, 144, 64, 195};
+ 133, 133, 133, 133, 144, 73, 195};
static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,
diff --git a/Build/source/libs/zlib/zlib-1.2.5/contrib/pascal/zlibpas.pas b/Build/source/libs/zlib/zlib-1.2.5/contrib/pascal/zlibpas.pas
index dc7d37dae02..637ae3a3f8e 100644
--- a/Build/source/libs/zlib/zlib-1.2.5/contrib/pascal/zlibpas.pas
+++ b/Build/source/libs/zlib/zlib-1.2.5/contrib/pascal/zlibpas.pas
@@ -10,7 +10,7 @@ unit zlibpas;
interface
const
- ZLIB_VERSION = '1.2.4';
+ ZLIB_VERSION = '1.2.5';
type
alloc_func = function(opaque: Pointer; items, size: Integer): Pointer;
diff --git a/Build/source/libs/zlib/zlib-1.2.5/contrib/puff/puff.c b/Build/source/libs/zlib/zlib-1.2.5/contrib/puff/puff.c
index df5b79f82b4..650694e9ed8 100644
--- a/Build/source/libs/zlib/zlib-1.2.5/contrib/puff/puff.c
+++ b/Build/source/libs/zlib/zlib-1.2.5/contrib/puff/puff.c
@@ -1,8 +1,8 @@
/*
* puff.c
- * Copyright (C) 2002-2008 Mark Adler
+ * Copyright (C) 2002-2010 Mark Adler
* For conditions of distribution and use, see copyright notice in puff.h
- * version 2.0, 25 Jul 2008
+ * version 2.1, 4 Apr 2010
*
* puff.c is a simple inflate written to be an unambiguous way to specify the
* deflate format. It is not written for speed but rather simplicity. As a
@@ -67,6 +67,8 @@
* - Add option in TEST code for puff to write the data
* - Add option in TEST code to skip input bytes
* - Allow TEST code to read from piped stdin
+ * 2.1 4 Apr 2010 - Avoid variable initialization for happier compilers
+ * - Avoid unsigned comparisons for even happier compilers
*/
#include <setjmp.h> /* for setjmp(), longjmp(), and jmp_buf */
@@ -516,8 +518,7 @@ local int fixed(struct state *s)
static int virgin = 1;
static short lencnt[MAXBITS+1], lensym[FIXLCODES];
static short distcnt[MAXBITS+1], distsym[MAXDCODES];
- static struct huffman lencode = {lencnt, lensym};
- static struct huffman distcode = {distcnt, distsym};
+ static struct huffman lencode, distcode;
/* build fixed huffman tables if first call (may not be thread safe) */
if (virgin) {
@@ -540,6 +541,12 @@ local int fixed(struct state *s)
lengths[symbol] = 5;
construct(&distcode, lengths, MAXDCODES);
+ /* construct lencode and distcode */
+ lencode.count = lencnt;
+ lencode.symbol = lensym;
+ distcode.count = distcnt;
+ distcode.symbol = distsym;
+
/* do this just once */
virgin = 0;
}
@@ -643,11 +650,16 @@ local int dynamic(struct state *s)
short lengths[MAXCODES]; /* descriptor code lengths */
short lencnt[MAXBITS+1], lensym[MAXLCODES]; /* lencode memory */
short distcnt[MAXBITS+1], distsym[MAXDCODES]; /* distcode memory */
- struct huffman lencode = {lencnt, lensym}; /* length code */
- struct huffman distcode = {distcnt, distsym}; /* distance code */
+ struct huffman lencode, distcode; /* length and distance codes */
static const short order[19] = /* permutation of code length codes */
{16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
+ /* construct lencode and distcode */
+ lencode.count = lencnt;
+ lencode.symbol = lensym;
+ distcode.count = distcnt;
+ distcode.symbol = distsym;
+
/* get number of lengths in each table, check lengths */
nlen = bits(s, 5) + 257;
ndist = bits(s, 5) + 1;
@@ -869,7 +881,8 @@ local void *load(char *name, size_t *len)
int main(int argc, char **argv)
{
- int ret, skip = 0, put = 0;
+ int ret, put = 0;
+ unsigned skip = 0;
char *arg, *name = NULL;
unsigned char *source = NULL, *dest;
size_t len = 0;
@@ -881,7 +894,7 @@ int main(int argc, char **argv)
if (arg[1] == 'w' && arg[2] == 0)
put = 1;
else if (arg[1] >= '0' && arg[1] <= '9')
- skip = atoi(arg + 1);
+ skip = (unsigned)atoi(arg + 1);
else {
fprintf(stderr, "invalid option %s\n", arg);
return 3;
diff --git a/Build/source/libs/zlib/zlib-1.2.5/contrib/puff/puff.h b/Build/source/libs/zlib/zlib-1.2.5/contrib/puff/puff.h
index 8d7f5f87cc3..88d1b3844ff 100644
--- a/Build/source/libs/zlib/zlib-1.2.5/contrib/puff/puff.h
+++ b/Build/source/libs/zlib/zlib-1.2.5/contrib/puff/puff.h
@@ -1,6 +1,6 @@
/* puff.h
- Copyright (C) 2002-2008 Mark Adler, all rights reserved
- version 1.9, 10 Jan 2008
+ Copyright (C) 2002-2010 Mark Adler, all rights reserved
+ version 2.1, 4 Apr 2010
This software is provided 'as-is', without any express or implied
warranty. In no event will the author be held liable for any damages
diff --git a/Build/source/libs/zlib/zlib-1.2.5/contrib/vstudio/vc10/zlib.rc b/Build/source/libs/zlib/zlib-1.2.5/contrib/vstudio/vc10/zlib.rc
index f27ffb6128a..a399bb07e42 100644
--- a/Build/source/libs/zlib/zlib-1.2.5/contrib/vstudio/vc10/zlib.rc
+++ b/Build/source/libs/zlib/zlib-1.2.5/contrib/vstudio/vc10/zlib.rc
@@ -2,8 +2,8 @@
#define IDR_VERSION1 1
IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
- FILEVERSION 1,2,4,0
- PRODUCTVERSION 1,2,4,0
+ FILEVERSION 1,2,5,0
+ PRODUCTVERSION 1,2,5,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS 0
FILEOS VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN
BEGIN
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
- VALUE "FileVersion", "1.2.4.0\0"
+ VALUE "FileVersion", "1.2.5\0"
VALUE "InternalName", "zlib\0"
VALUE "OriginalFilename", "zlib.dll\0"
VALUE "ProductName", "ZLib.DLL\0"
diff --git a/Build/source/libs/zlib/zlib-1.2.5/contrib/vstudio/vc9/zlib.rc b/Build/source/libs/zlib/zlib-1.2.5/contrib/vstudio/vc9/zlib.rc
index f27ffb6128a..a399bb07e42 100644
--- a/Build/source/libs/zlib/zlib-1.2.5/contrib/vstudio/vc9/zlib.rc
+++ b/Build/source/libs/zlib/zlib-1.2.5/contrib/vstudio/vc9/zlib.rc
@@ -2,8 +2,8 @@
#define IDR_VERSION1 1
IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
- FILEVERSION 1,2,4,0
- PRODUCTVERSION 1,2,4,0
+ FILEVERSION 1,2,5,0
+ PRODUCTVERSION 1,2,5,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS 0
FILEOS VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN
BEGIN
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
- VALUE "FileVersion", "1.2.4.0\0"
+ VALUE "FileVersion", "1.2.5\0"
VALUE "InternalName", "zlib\0"
VALUE "OriginalFilename", "zlib.dll\0"
VALUE "ProductName", "ZLib.DLL\0"