diff options
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/delphi/ZLib.pas | 2 | ||||
-rw-r--r-- | contrib/dotzlib/DotZLib/UnitTests.cs | 2 | ||||
-rw-r--r-- | contrib/infback9/inftree9.c | 4 | ||||
-rw-r--r-- | contrib/minizip/configure.ac | 2 | ||||
-rw-r--r-- | contrib/pascal/zlibpas.pas | 4 | ||||
-rw-r--r-- | contrib/vstudio/readme.txt | 2 | ||||
-rw-r--r-- | contrib/vstudio/vc10/zlib.rc | 6 | ||||
-rw-r--r-- | contrib/vstudio/vc11/zlib.rc | 6 | ||||
-rw-r--r-- | contrib/vstudio/vc12/zlib.rc | 6 | ||||
-rw-r--r-- | contrib/vstudio/vc14/zlib.rc | 6 | ||||
-rw-r--r-- | contrib/vstudio/vc9/zlib.rc | 6 |
11 files changed, 23 insertions, 23 deletions
diff --git a/contrib/delphi/ZLib.pas b/contrib/delphi/ZLib.pas index 4c654cf..e9d72f0 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.9.1'; | 155 | zlib_version = '1.2.10'; |
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 f22a8de..a0e3985 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.9.1", Info.Version); | 159 | Assert.AreEqual("1.2.10", 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 97f330b..ea56047 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.9.1 Copyright 1995-2017 Mark Adler "; | 12 | " inflate9 1.2.10 Copyright 1995-2017 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, 203, 201}; | 67 | 133, 133, 133, 133, 144, 192, 202}; |
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/minizip/configure.ac b/contrib/minizip/configure.ac index 6496d71..bbb2283 100644 --- a/contrib/minizip/configure.ac +++ b/contrib/minizip/configure.ac | |||
@@ -1,7 +1,7 @@ | |||
1 | # -*- Autoconf -*- | 1 | # -*- Autoconf -*- |
2 | # Process this file with autoconf to produce a configure script. | 2 | # Process this file with autoconf to produce a configure script. |
3 | 3 | ||
4 | AC_INIT([minizip], [1.2.9.1], [bugzilla.redhat.com]) | 4 | AC_INIT([minizip], [1.2.10], [bugzilla.redhat.com]) |
5 | AC_CONFIG_SRCDIR([minizip.c]) | 5 | AC_CONFIG_SRCDIR([minizip.c]) |
6 | AM_INIT_AUTOMAKE([foreign]) | 6 | AM_INIT_AUTOMAKE([foreign]) |
7 | LT_INIT | 7 | LT_INIT |
diff --git a/contrib/pascal/zlibpas.pas b/contrib/pascal/zlibpas.pas index 0ae6d75..2330898 100644 --- a/contrib/pascal/zlibpas.pas +++ b/contrib/pascal/zlibpas.pas | |||
@@ -10,8 +10,8 @@ unit zlibpas; | |||
10 | interface | 10 | interface |
11 | 11 | ||
12 | const | 12 | const |
13 | ZLIB_VERSION = '1.2.9.1'; | 13 | ZLIB_VERSION = '1.2.10'; |
14 | ZLIB_VERNUM = $1291; | 14 | ZLIB_VERNUM = $12a0; |
15 | 15 | ||
16 | type | 16 | type |
17 | alloc_func = function(opaque: Pointer; items, size: Integer): Pointer; | 17 | alloc_func = function(opaque: Pointer; items, size: Integer): Pointer; |
diff --git a/contrib/vstudio/readme.txt b/contrib/vstudio/readme.txt index 439d595..98d8a05 100644 --- a/contrib/vstudio/readme.txt +++ b/contrib/vstudio/readme.txt | |||
@@ -1,4 +1,4 @@ | |||
1 | Building instructions for the DLL versions of Zlib 1.2.9.1 | 1 | Building instructions for the DLL versions of Zlib 1.2.10 |
2 | ======================================================== | 2 | ======================================================== |
3 | 3 | ||
4 | This directory contains projects that build zlib and minizip using | 4 | This directory contains projects that build zlib and minizip using |
diff --git a/contrib/vstudio/vc10/zlib.rc b/contrib/vstudio/vc10/zlib.rc index a947595..f1c19bc 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, 9, 1 | 5 | FILEVERSION 1, 2, 10, 0 |
6 | PRODUCTVERSION 1, 2, 9, 1 | 6 | PRODUCTVERSION 1, 2, 10, 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.9.1\0" | 20 | VALUE "FileVersion", "1.2.10\0" |
21 | VALUE "InternalName", "zlib\0" | 21 | VALUE "InternalName", "zlib\0" |
22 | VALUE "OriginalFilename", "zlibwapi.dll\0" | 22 | VALUE "OriginalFilename", "zlibwapi.dll\0" |
23 | VALUE "ProductName", "ZLib.DLL\0" | 23 | VALUE "ProductName", "ZLib.DLL\0" |
diff --git a/contrib/vstudio/vc11/zlib.rc b/contrib/vstudio/vc11/zlib.rc index a947595..f1c19bc 100644 --- a/contrib/vstudio/vc11/zlib.rc +++ b/contrib/vstudio/vc11/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, 9, 1 | 5 | FILEVERSION 1, 2, 10, 0 |
6 | PRODUCTVERSION 1, 2, 9, 1 | 6 | PRODUCTVERSION 1, 2, 10, 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.9.1\0" | 20 | VALUE "FileVersion", "1.2.10\0" |
21 | VALUE "InternalName", "zlib\0" | 21 | VALUE "InternalName", "zlib\0" |
22 | VALUE "OriginalFilename", "zlibwapi.dll\0" | 22 | VALUE "OriginalFilename", "zlibwapi.dll\0" |
23 | VALUE "ProductName", "ZLib.DLL\0" | 23 | VALUE "ProductName", "ZLib.DLL\0" |
diff --git a/contrib/vstudio/vc12/zlib.rc b/contrib/vstudio/vc12/zlib.rc index e7c1d65..ef38298 100644 --- a/contrib/vstudio/vc12/zlib.rc +++ b/contrib/vstudio/vc12/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, 9, 1 | 5 | FILEVERSION 1, 2, 10, 0 |
6 | PRODUCTVERSION 1, 2, 9, 1 | 6 | PRODUCTVERSION 1, 2, 10, 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.9.1\0" | 20 | VALUE "FileVersion", "1.2.10\0" |
21 | VALUE "InternalName", "zlib\0" | 21 | VALUE "InternalName", "zlib\0" |
22 | VALUE "OriginalFilename", "zlibwapi.dll\0" | 22 | VALUE "OriginalFilename", "zlibwapi.dll\0" |
23 | VALUE "ProductName", "ZLib.DLL\0" | 23 | VALUE "ProductName", "ZLib.DLL\0" |
diff --git a/contrib/vstudio/vc14/zlib.rc b/contrib/vstudio/vc14/zlib.rc index e7c1d65..ef38298 100644 --- a/contrib/vstudio/vc14/zlib.rc +++ b/contrib/vstudio/vc14/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, 9, 1 | 5 | FILEVERSION 1, 2, 10, 0 |
6 | PRODUCTVERSION 1, 2, 9, 1 | 6 | PRODUCTVERSION 1, 2, 10, 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.9.1\0" | 20 | VALUE "FileVersion", "1.2.10\0" |
21 | VALUE "InternalName", "zlib\0" | 21 | VALUE "InternalName", "zlib\0" |
22 | VALUE "OriginalFilename", "zlibwapi.dll\0" | 22 | VALUE "OriginalFilename", "zlibwapi.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 a947595..f1c19bc 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, 9, 1 | 5 | FILEVERSION 1, 2, 10, 0 |
6 | PRODUCTVERSION 1, 2, 9, 1 | 6 | PRODUCTVERSION 1, 2, 10, 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.9.1\0" | 20 | VALUE "FileVersion", "1.2.10\0" |
21 | VALUE "InternalName", "zlib\0" | 21 | VALUE "InternalName", "zlib\0" |
22 | VALUE "OriginalFilename", "zlibwapi.dll\0" | 22 | VALUE "OriginalFilename", "zlibwapi.dll\0" |
23 | VALUE "ProductName", "ZLib.DLL\0" | 23 | VALUE "ProductName", "ZLib.DLL\0" |