zlib 1.2.5v1.2.5

author: Mark Adler <madler@alumni.caltech.edu> 2011-09-09 23:35:10 -0700
committer: Mark Adler <madler@alumni.caltech.edu> 2011-09-09 23:35:10 -0700
commit: 9712272c78b9d9c93746d9c8e156a3728c65ca72 (patch)
tree: 61cc13495f0688608e4f368ab5b8385f6ca0f858 /contrib
parent: 73014202489f913dbffc91d22089ea8a8920c054 (diff)
download: zlib-9712272c78b9d9c93746d9c8e156a3728c65ca72.tar.gz
zlib-9712272c78b9d9c93746d9c8e156a3728c65ca72.tar.bz2
zlib-9712272c78b9d9c93746d9c8e156a3728c65ca72.zip
6 files changed, 11 insertions, 11 deletions
diff --git a/contrib/delphi/ZLib.pas b/contrib/delphi/ZLib.pas
index 0496ee4..0d86fb5 100644
--- a/contrib/delphi/ZLib.pas
+++ b/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.5';
+  zlib_version = '1.2.5';
 type
  EZlibError = class(Exception);
diff --git a/contrib/dotzlib/DotZLib/UnitTests.cs b/contrib/dotzlib/DotZLib/UnitTests.cs
index 4531408..3bbcc8c 100644
--- a/contrib/dotzlib/DotZLib/UnitTests.cs
+++ b/contrib/dotzlib/DotZLib/UnitTests.cs
@@ -156,7 +156,7 @@ namespace DotZLibTests
        public void Info_Version()
        {
            Info info = new Info();
-            Assert.AreEqual("1.2.4.5", 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/contrib/infback9/inftree9.c b/contrib/infback9/inftree9.c
index c01cc1e..306c5f1 100644
--- a/contrib/infback9/inftree9.c
+++ b/contrib/infback9/inftree9.c
@@ -9,7 +9,7 @@
 #define MAXBITS 15
 const char inflate9_copyright[] =
-   " inflate9 1.2.4.5 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, 75, 75};
+        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/contrib/pascal/zlibpas.pas b/contrib/pascal/zlibpas.pas
index 2bbf956..637ae3a 100644
--- a/contrib/pascal/zlibpas.pas
+++ b/contrib/pascal/zlibpas.pas
@@ -10,7 +10,7 @@ unit zlibpas;
 interface
 const
-  ZLIB_VERSION = '1.2.4.5';
+  ZLIB_VERSION = '1.2.5';
 type
  alloc_func = function(opaque: Pointer; items, size: Integer): Pointer;
diff --git a/contrib/vstudio/vc10/zlib.rc b/contrib/vstudio/vc10/zlib.rc
index b2196d9..f822450 100644
--- a/contrib/vstudio/vc10/zlib.rc
+++ b/contrib/vstudio/vc10/zlib.rc
@@ -2,8 +2,8 @@
 #define IDR_VERSION1  1
 IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION    1,2,4,5
+  FILEVERSION    1,2,5,0
-  PRODUCTVERSION 1,2,4,5
+  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.5\0"
+      VALUE "FileVersion",      "1.2.5\0"
      VALUE "InternalName",     "zlib\0"
      VALUE "OriginalFilename", "zlib.dll\0"
      VALUE "ProductName",      "ZLib.DLL\0"
diff --git a/contrib/vstudio/vc9/zlib.rc b/contrib/vstudio/vc9/zlib.rc
index b2196d9..f822450 100644
--- a/contrib/vstudio/vc9/zlib.rc
+++ b/contrib/vstudio/vc9/zlib.rc
@@ -2,8 +2,8 @@
 #define IDR_VERSION1  1
 IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION    1,2,4,5
+  FILEVERSION    1,2,5,0
-  PRODUCTVERSION 1,2,4,5
+  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.5\0"
+      VALUE "FileVersion",      "1.2.5\0"
      VALUE "InternalName",     "zlib\0"
      VALUE "OriginalFilename", "zlib.dll\0"
      VALUE "ProductName",      "ZLib.DLL\0"
author	Mark Adler <madler@alumni.caltech.edu>	2011-09-09 23:35:10 -0700
committer	Mark Adler <madler@alumni.caltech.edu>	2011-09-09 23:35:10 -0700
commit	9712272c78b9d9c93746d9c8e156a3728c65ca72 (patch)
tree	61cc13495f0688608e4f368ab5b8385f6ca0f858 /contrib
parent	73014202489f913dbffc91d22089ea8a8920c054 (diff)
download	zlib-9712272c78b9d9c93746d9c8e156a3728c65ca72.tar.gz zlib-9712272c78b9d9c93746d9c8e156a3728c65ca72.tar.bz2 zlib-9712272c78b9d9c93746d9c8e156a3728c65ca72.zip

diff --git a/contrib/delphi/ZLib.pas b/contrib/delphi/ZLib.pas index 0496ee4..0d86fb5 100644 --- a/contrib/delphi/ZLib.pas +++ b/contrib/delphi/ZLib.pas
@@ -152,7 +152,7 @@ procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
152	const OutBuf: Pointer; BufSize: Integer);	152	const OutBuf: Pointer; BufSize: Integer);
153		153
154	const	154	const
155	zlib_version = '1.2.4.5';	155	zlib_version = '1.2.5';
156		156
157	type	157	type
158	EZlibError = class(Exception);	158	EZlibError = class(Exception);


diff --git a/contrib/dotzlib/DotZLib/UnitTests.cs b/contrib/dotzlib/DotZLib/UnitTests.cs index 4531408..3bbcc8c 100644 --- a/contrib/dotzlib/DotZLib/UnitTests.cs +++ b/contrib/dotzlib/DotZLib/UnitTests.cs
@@ -156,7 +156,7 @@ namespace DotZLibTests
156	public void Info_Version()	156	public void Info_Version()
157	{	157	{
158	Info info = new Info();	158	Info info = new Info();
159	Assert.AreEqual("1.2.4.5", Info.Version);	159	Assert.AreEqual("1.2.5", Info.Version);
160	Assert.AreEqual(32, info.SizeOfUInt);	160	Assert.AreEqual(32, info.SizeOfUInt);
161	Assert.AreEqual(32, info.SizeOfULong);	161	Assert.AreEqual(32, info.SizeOfULong);
162	Assert.AreEqual(32, info.SizeOfPointer);	162	Assert.AreEqual(32, info.SizeOfPointer);


diff --git a/contrib/infback9/inftree9.c b/contrib/infback9/inftree9.c index c01cc1e..306c5f1 100644 --- a/contrib/infback9/inftree9.c +++ b/contrib/infback9/inftree9.c
@@ -9,7 +9,7 @@
9	#define MAXBITS 15	9	#define MAXBITS 15
10		10
11	const char inflate9_copyright[] =	11	const char inflate9_copyright[] =
12	" inflate9 1.2.4.5 Copyright 1995-2010 Mark Adler ";	12	" inflate9 1.2.5 Copyright 1995-2010 Mark Adler ";
13	/*	13	/*
14	If you use the zlib library in a product, an acknowledgment is welcome	14	If you use the zlib library in a product, an acknowledgment is welcome
15	in the documentation of your product. If for some reason you cannot	15	in the documentation of your product. If for some reason you cannot
@@ -64,7 +64,7 @@ unsigned short FAR *work;
64	static const unsigned short lext[31] = { /* Length codes 257..285 extra */	64	static const unsigned short lext[31] = { /* Length codes 257..285 extra */
65	128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,	65	128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
66	130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,	66	130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
67	133, 133, 133, 133, 144, 75, 75};	67	133, 133, 133, 133, 144, 73, 195};
68	static const unsigned short dbase[32] = { /* Distance codes 0..31 base */	68	static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
69	1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,	69	1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
70	65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,	70	65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,


diff --git a/contrib/pascal/zlibpas.pas b/contrib/pascal/zlibpas.pas index 2bbf956..637ae3a 100644 --- a/contrib/pascal/zlibpas.pas +++ b/contrib/pascal/zlibpas.pas
@@ -10,7 +10,7 @@ unit zlibpas;
10	interface	10	interface
11		11
12	const	12	const
13	ZLIB_VERSION = '1.2.4.5';	13	ZLIB_VERSION = '1.2.5';
14		14
15	type	15	type
16	alloc_func = function(opaque: Pointer; items, size: Integer): Pointer;	16	alloc_func = function(opaque: Pointer; items, size: Integer): Pointer;


diff --git a/contrib/vstudio/vc10/zlib.rc b/contrib/vstudio/vc10/zlib.rc index b2196d9..f822450 100644 --- a/contrib/vstudio/vc10/zlib.rc +++ b/contrib/vstudio/vc10/zlib.rc
@@ -2,8 +2,8 @@
2		2
3	#define IDR_VERSION1 1	3	#define IDR_VERSION1 1
4	IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE	4	IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5	FILEVERSION 1,2,4,5	5	FILEVERSION 1,2,5,0
6	PRODUCTVERSION 1,2,4,5	6	PRODUCTVERSION 1,2,5,0
7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK	7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	FILEFLAGS 0	8	FILEFLAGS 0
9	FILEOS VOS_DOS_WINDOWS32	9	FILEOS VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN
17		17
18	BEGIN	18	BEGIN
19	VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"	19	VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20	VALUE "FileVersion", "1.2.4.5\0"	20	VALUE "FileVersion", "1.2.5\0"
21	VALUE "InternalName", "zlib\0"	21	VALUE "InternalName", "zlib\0"
22	VALUE "OriginalFilename", "zlib.dll\0"	22	VALUE "OriginalFilename", "zlib.dll\0"
23	VALUE "ProductName", "ZLib.DLL\0"	23	VALUE "ProductName", "ZLib.DLL\0"


diff --git a/contrib/vstudio/vc9/zlib.rc b/contrib/vstudio/vc9/zlib.rc index b2196d9..f822450 100644 --- a/contrib/vstudio/vc9/zlib.rc +++ b/contrib/vstudio/vc9/zlib.rc
@@ -2,8 +2,8 @@
2		2
3	#define IDR_VERSION1 1	3	#define IDR_VERSION1 1
4	IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE	4	IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5	FILEVERSION 1,2,4,5	5	FILEVERSION 1,2,5,0
6	PRODUCTVERSION 1,2,4,5	6	PRODUCTVERSION 1,2,5,0
7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK	7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	FILEFLAGS 0	8	FILEFLAGS 0
9	FILEOS VOS_DOS_WINDOWS32	9	FILEOS VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN
17		17
18	BEGIN	18	BEGIN
19	VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"	19	VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20	VALUE "FileVersion", "1.2.4.5\0"	20	VALUE "FileVersion", "1.2.5\0"
21	VALUE "InternalName", "zlib\0"	21	VALUE "InternalName", "zlib\0"
22	VALUE "OriginalFilename", "zlib.dll\0"	22	VALUE "OriginalFilename", "zlib.dll\0"
23	VALUE "ProductName", "ZLib.DLL\0"	23	VALUE "ProductName", "ZLib.DLL\0"