summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2016-12-31 11:41:31 -0800
committerMark Adler <madler@alumni.caltech.edu>2016-12-31 23:37:10 -0800
commit2fa463bacfff79181df1a5270fb67cc679a53e71 (patch)
tree6b1f6de2f9b9941e5e105be4558f04c3de4f775b
parent14e3194e1ebbfc2825e51caf8312e4e3b45c9c81 (diff)
downloadzlib-2fa463bacfff79181df1a5270fb67cc679a53e71.tar.gz
zlib-2fa463bacfff79181df1a5270fb67cc679a53e71.tar.bz2
zlib-2fa463bacfff79181df1a5270fb67cc679a53e71.zip
zlib 1.2.9v1.2.9
Diffstat
-rw-r--r--CMakeLists.txt2
-rw-r--r--ChangeLog33
-rw-r--r--Makefile.in4
-rw-r--r--README6
-rw-r--r--adler32.c2
-rw-r--r--compress.c2
-rw-r--r--contrib/delphi/ZLib.pas2
-rw-r--r--contrib/dotzlib/DotZLib/UnitTests.cs2
-rw-r--r--contrib/infback9/inftree9.c6
-rw-r--r--contrib/minizip/configure.ac2
-rw-r--r--contrib/pascal/zlibpas.pas4
-rw-r--r--contrib/vstudio/readme.txt2
-rw-r--r--contrib/vstudio/vc10/zlib.rc8
-rw-r--r--contrib/vstudio/vc10/zlibvc.def12
-rw-r--r--contrib/vstudio/vc11/zlib.rc8
-rw-r--r--contrib/vstudio/vc11/zlibvc.def10
-rw-r--r--contrib/vstudio/vc12/zlib.rc4
-rw-r--r--contrib/vstudio/vc12/zlibvc.def296
-rw-r--r--contrib/vstudio/vc14/zlib.rc4
-rw-r--r--contrib/vstudio/vc14/zlibvc.def296
-rw-r--r--contrib/vstudio/vc9/zlib.rc8
-rw-r--r--contrib/vstudio/vc9/zlibvc.def10
-rw-r--r--crc32.c2
-rw-r--r--deflate.c2
-rw-r--r--deflate.h2
-rw-r--r--examples/gzlog.c2
-rw-r--r--gzguts.h2
-rw-r--r--gzlib.c2
-rw-r--r--gzread.c2
-rw-r--r--gzwrite.c2
-rw-r--r--infback.c2
-rw-r--r--inffast.c2
-rw-r--r--inflate.c2
-rw-r--r--inflate.h2
-rw-r--r--inftrees.c6
-rw-r--r--os400/README4002
-rw-r--r--os400/bndsrc27
-rw-r--r--os400/zlib.inc90
-rw-r--r--qnx/package.qpg10
-rw-r--r--test/example.c2
-rw-r--r--test/infcover.c2
-rw-r--r--test/minigzip.c2
-rw-r--r--treebuild.xml4
-rw-r--r--trees.c2
-rw-r--r--win32/README-WIN32.txt4
-rw-r--r--win32/zlib.def180
-rw-r--r--zconf.h16
-rw-r--r--zconf.h.cmakein16
-rw-r--r--zconf.h.in16
-rw-r--r--zlib.338
-rw-r--r--zlib.3.pdfbin9353 -> 19422 bytes
-rw-r--r--zlib.h12
-rw-r--r--zlib.map177
-rw-r--r--zutil.c2
-rw-r--r--zutil.h2
55 files changed, 777 insertions, 580 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22f2658..14411a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
3 3
4project(zlib C) 4project(zlib C)
5 5
6set(VERSION "1.2.8.1") 6set(VERSION "1.2.9")
7 7
8option(ASM686 "Enable building i686 assembly implementation") 8option(ASM686 "Enable building i686 assembly implementation")
9option(AMD64 "Enable building amd64 assembly implementation") 9option(AMD64 "Enable building amd64 assembly implementation")
diff --git a/ChangeLog b/ChangeLog
index ad9a55e..63d0495 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,37 @@
1 1
2 ChangeLog file for zlib 2 ChangeLog file for zlib
3 3
4Changes in 1.2.8.1 (xx May 2013) 4Changes in 1.2.9 (31 Dec 2016)
5- 5- Fix contrib/minizip to permit unzipping with desktop API [Zouzou]
6- Improve contrib/blast to return unused bytes
7- Assure that gzoffset() is correct when appending
8- Improve compress() and uncompress() to support large lengths
9- Fix bug in test/example.c where error code not saved
10- Remedy Coverity warning [Randers-Pehrson]
11- Improve speed of gzprintf() in transparent mode
12- Fix inflateInit2() bug when windowBits is 16 or 32
13- Change DEBUG macro to ZLIB_DEBUG
14- Avoid uninitialized access by gzclose_w()
15- Allow building zlib outside of the source directory
16- Fix bug that accepted invalid zlib header when windowBits is zero
17- Fix gzseek() problem on MinGW due to buggy _lseeki64 there
18- Loop on write() calls in gzwrite.c in case of non-blocking I/O
19- Add --warn (-w) option to ./configure for more compiler warnings
20- Reject a window size of 256 bytes if not using the zlib wrapper
21- Fix bug when level 0 used with Z_HUFFMAN or Z_RLE
22- Add --debug (-d) option to ./configure to define ZLIB_DEBUG
23- Fix bugs in creating a very large gzip header
24- Add uncompress2() function, which returns the input size used
25- Assure that deflateParams() will not switch functions mid-block
26- Dramatically speed up deflation for level 0 (storing)
27- Add gzfread(), duplicating the interface of fread()
28- Add gzfwrite(), duplicating the interface of fwrite()
29- Add deflateGetDictionary() function
30- Use snprintf() for later versions of Microsoft C
31- Fix *Init macros to use z_ prefix when requested
32- Replace as400 with os400 for OS/400 support [Monnerat]
33- Add crc32_z() and adler32_z() functions with size_t lengths
34- Update Visual Studio project files [AraHaan]
6 35
7Changes in 1.2.8 (28 Apr 2013) 36Changes in 1.2.8 (28 Apr 2013)
8- Update contrib/minizip/iowin32.c for Windows RT [Vollant] 37- Update contrib/minizip/iowin32.c for Windows RT [Vollant]
diff --git a/Makefile.in b/Makefile.in
index 7408644..c8b487c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
1# Makefile for zlib 1# Makefile for zlib
2# Copyright (C) 1995-2013 Jean-loup Gailly, Mark Adler 2# Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
3# For conditions of distribution and use, see copyright notice in zlib.h 3# For conditions of distribution and use, see copyright notice in zlib.h
4 4
5# To compile and test, type: 5# To compile and test, type:
@@ -32,7 +32,7 @@ CPP=$(CC) -E
32 32
33STATICLIB=libz.a 33STATICLIB=libz.a
34SHAREDLIB=libz.so 34SHAREDLIB=libz.so
35SHAREDLIBV=libz.so.1.2.8.1 35SHAREDLIBV=libz.so.1.2.9
36SHAREDLIBM=libz.so.1 36SHAREDLIBM=libz.so.1
37LIBS=$(STATICLIB) $(SHAREDLIBV) 37LIBS=$(STATICLIB) $(SHAREDLIBV)
38 38
diff --git a/README b/README
index e7a0bc7..8002f39 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
1ZLIB DATA COMPRESSION LIBRARY 1ZLIB DATA COMPRESSION LIBRARY
2 2
3zlib 1.2.8.1 is a general purpose data compression library. All the code is 3zlib 1.2.9 is a general purpose data compression library. All the code is
4thread safe. The data format used by the zlib library is described by RFCs 4thread safe. The data format used by the zlib library is described by RFCs
5(Request for Comments) 1950 to 1952 in the files 5(Request for Comments) 1950 to 1952 in the files
6http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and 6http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
@@ -31,7 +31,7 @@ Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997
31issue of Dr. Dobb's Journal; a copy of the article is available at 31issue of Dr. Dobb's Journal; a copy of the article is available at
32http://marknelson.us/1997/01/01/zlib-engine/ . 32http://marknelson.us/1997/01/01/zlib-engine/ .
33 33
34The changes made in version 1.2.8.1 are documented in the file ChangeLog. 34The changes made in version 1.2.9 are documented in the file ChangeLog.
35 35
36Unsupported third party contributions are provided in directory contrib/ . 36Unsupported third party contributions are provided in directory contrib/ .
37 37
@@ -84,7 +84,7 @@ Acknowledgments:
84 84
85Copyright notice: 85Copyright notice:
86 86
87 (C) 1995-2013 Jean-loup Gailly and Mark Adler 87 (C) 1995-2016 Jean-loup Gailly and Mark Adler
88 88
89 This software is provided 'as-is', without any express or implied 89 This software is provided 'as-is', without any express or implied
90 warranty. In no event will the authors be held liable for any damages 90 warranty. In no event will the authors be held liable for any damages
diff --git a/adler32.c b/adler32.c
index 019a233..d0be438 100644
--- a/adler32.c
+++ b/adler32.c
@@ -1,5 +1,5 @@
1/* adler32.c -- compute the Adler-32 checksum of a data stream 1/* adler32.c -- compute the Adler-32 checksum of a data stream
2 * Copyright (C) 1995-2011 Mark Adler 2 * Copyright (C) 1995-2011, 2016 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/compress.c b/compress.c
index f0d0757..e2db404 100644
--- a/compress.c
+++ b/compress.c
@@ -1,5 +1,5 @@
1/* compress.c -- compress a memory buffer 1/* compress.c -- compress a memory buffer
2 * Copyright (C) 1995-2005, 2014 Jean-loup Gailly, Mark Adler 2 * Copyright (C) 1995-2005, 2014, 2016 Jean-loup Gailly, Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/contrib/delphi/ZLib.pas b/contrib/delphi/ZLib.pas
index b2cbfad..7a3cb66 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
154const 154const
155 zlib_version = '1.2.8.1'; 155 zlib_version = '1.2.9';
156 156
157type 157type
158 EZlibError = class(Exception); 158 EZlibError = class(Exception);
diff --git a/contrib/dotzlib/DotZLib/UnitTests.cs b/contrib/dotzlib/DotZLib/UnitTests.cs
index 5ad86d9..3d156f4 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.8.1", Info.Version); 159 Assert.AreEqual("1.2.9", 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 f31e995..2103aee 100644
--- a/contrib/infback9/inftree9.c
+++ b/contrib/infback9/inftree9.c
@@ -1,5 +1,5 @@
1/* inftree9.c -- generate Huffman trees for efficient decoding 1/* inftree9.c -- generate Huffman trees for efficient decoding
2 * Copyright (C) 1995-2013 Mark Adler 2 * Copyright (C) 1995-2016 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
@@ -9,7 +9,7 @@
9#define MAXBITS 15 9#define MAXBITS 15
10 10
11const char inflate9_copyright[] = 11const char inflate9_copyright[] =
12 " inflate9 1.2.8.1 Copyright 1995-2013 Mark Adler "; 12 " inflate9 1.2.9 Copyright 1995-2016 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, 198}; 67 133, 133, 133, 133, 144, 192, 79};
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 06b9566..54d823f 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
4AC_INIT([minizip], [1.2.8.1], [bugzilla.redhat.com]) 4AC_INIT([minizip], [1.2.9], [bugzilla.redhat.com])
5AC_CONFIG_SRCDIR([minizip.c]) 5AC_CONFIG_SRCDIR([minizip.c])
6AM_INIT_AUTOMAKE([foreign]) 6AM_INIT_AUTOMAKE([foreign])
7LT_INIT 7LT_INIT
diff --git a/contrib/pascal/zlibpas.pas b/contrib/pascal/zlibpas.pas
index 0d1d5ff..aebaea0 100644
--- a/contrib/pascal/zlibpas.pas
+++ b/contrib/pascal/zlibpas.pas
@@ -10,8 +10,8 @@ unit zlibpas;
10interface 10interface
11 11
12const 12const
13 ZLIB_VERSION = '1.2.8.1'; 13 ZLIB_VERSION = '1.2.9';
14 ZLIB_VERNUM = $1281; 14 ZLIB_VERNUM = $1290;
15 15
16type 16type
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 1646742..3954bc4 100644
--- a/contrib/vstudio/readme.txt
+++ b/contrib/vstudio/readme.txt
@@ -1,4 +1,4 @@
1Building instructions for the DLL versions of Zlib 1.2.8.1 1Building instructions for the DLL versions of Zlib 1.2.9
2======================================================== 2========================================================
3 3
4This directory contains projects that build zlib and minizip using 4This directory contains projects that build zlib and minizip using
diff --git a/contrib/vstudio/vc10/zlib.rc b/contrib/vstudio/vc10/zlib.rc
index 3e9f7a8..d846820 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
4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE 4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5 FILEVERSION 1, 2, 8, 1 5 FILEVERSION 1, 2, 9, 0
6 PRODUCTVERSION 1, 2, 8, 1 6 PRODUCTVERSION 1, 2, 9, 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,12 +17,12 @@ 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.8.1\0" 20 VALUE "FileVersion", "1.2.9\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"
24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" 24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25 VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0" 25 VALUE "LegalCopyright", "(C) 1995-2016 Jean-loup Gailly & Mark Adler\0"
26 END 26 END
27 END 27 END
28 BLOCK "VarFileInfo" 28 BLOCK "VarFileInfo"
diff --git a/contrib/vstudio/vc10/zlibvc.def b/contrib/vstudio/vc10/zlibvc.def
index d2da2a1..54e683d 100644
--- a/contrib/vstudio/vc10/zlibvc.def
+++ b/contrib/vstudio/vc10/zlibvc.def
@@ -2,7 +2,7 @@ LIBRARY
2; zlib data compression and ZIP file I/O library 2; zlib data compression and ZIP file I/O library
3 3
4VERSION 1.2 4VERSION 1.2
5 5
6EXPORTS 6EXPORTS
7 adler32 @1 7 adler32 @1
8 compress @2 8 compress @2
@@ -141,3 +141,13 @@ EXPORTS
141; zlib1 v1.2.8 added: 141; zlib1 v1.2.8 added:
142 inflateGetDictionary @166 142 inflateGetDictionary @166
143 gzvprintf @167 143 gzvprintf @167
144
145; zlib1 v1.2.9 added:
146 inflateCodesUsed @168
147 inflateValidate @169
148 uncompress2 @170
149 gzfread @171
150 gzfwrite @172
151 deflateGetDictionary @173
152 adler32_z @174
153 crc32_z @175
diff --git a/contrib/vstudio/vc11/zlib.rc b/contrib/vstudio/vc11/zlib.rc
index 3e9f7a8..d846820 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
4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE 4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5 FILEVERSION 1, 2, 8, 1 5 FILEVERSION 1, 2, 9, 0
6 PRODUCTVERSION 1, 2, 8, 1 6 PRODUCTVERSION 1, 2, 9, 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,12 +17,12 @@ 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.8.1\0" 20 VALUE "FileVersion", "1.2.9\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"
24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" 24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25 VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0" 25 VALUE "LegalCopyright", "(C) 1995-2016 Jean-loup Gailly & Mark Adler\0"
26 END 26 END
27 END 27 END
28 BLOCK "VarFileInfo" 28 BLOCK "VarFileInfo"
diff --git a/contrib/vstudio/vc11/zlibvc.def b/contrib/vstudio/vc11/zlibvc.def
index 66cf3fb..54e683d 100644
--- a/contrib/vstudio/vc11/zlibvc.def
+++ b/contrib/vstudio/vc11/zlibvc.def
@@ -141,3 +141,13 @@ EXPORTS
141; zlib1 v1.2.8 added: 141; zlib1 v1.2.8 added:
142 inflateGetDictionary @166 142 inflateGetDictionary @166
143 gzvprintf @167 143 gzvprintf @167
144
145; zlib1 v1.2.9 added:
146 inflateCodesUsed @168
147 inflateValidate @169
148 uncompress2 @170
149 gzfread @171
150 gzfwrite @172
151 deflateGetDictionary @173
152 adler32_z @174
153 crc32_z @175
diff --git a/contrib/vstudio/vc12/zlib.rc b/contrib/vstudio/vc12/zlib.rc
index 46a7ee1..4f6396d 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
4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE 4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5 FILEVERSION 1, 2, 8, 1 5 FILEVERSION 1, 2, 9, 0
6 PRODUCTVERSION 1, 2, 8, 1 6 PRODUCTVERSION 1, 2, 9, 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
diff --git a/contrib/vstudio/vc12/zlibvc.def b/contrib/vstudio/vc12/zlibvc.def
index 83106b9..54e683d 100644
--- a/contrib/vstudio/vc12/zlibvc.def
+++ b/contrib/vstudio/vc12/zlibvc.def
@@ -1,143 +1,153 @@
1LIBRARY 1LIBRARY
2; zlib data compression and ZIP file I/O library 2; zlib data compression and ZIP file I/O library
3 3
4VERSION 1.2 4VERSION 1.2
5 5
6EXPORTS 6EXPORTS
7 adler32 @1 7 adler32 @1
8 compress @2 8 compress @2
9 crc32 @3 9 crc32 @3
10 deflate @4 10 deflate @4
11 deflateCopy @5 11 deflateCopy @5
12 deflateEnd @6 12 deflateEnd @6
13 deflateInit2_ @7 13 deflateInit2_ @7
14 deflateInit_ @8 14 deflateInit_ @8
15 deflateParams @9 15 deflateParams @9
16 deflateReset @10 16 deflateReset @10
17 deflateSetDictionary @11 17 deflateSetDictionary @11
18 gzclose @12 18 gzclose @12
19 gzdopen @13 19 gzdopen @13
20 gzerror @14 20 gzerror @14
21 gzflush @15 21 gzflush @15
22 gzopen @16 22 gzopen @16
23 gzread @17 23 gzread @17
24 gzwrite @18 24 gzwrite @18
25 inflate @19 25 inflate @19
26 inflateEnd @20 26 inflateEnd @20
27 inflateInit2_ @21 27 inflateInit2_ @21
28 inflateInit_ @22 28 inflateInit_ @22
29 inflateReset @23 29 inflateReset @23
30 inflateSetDictionary @24 30 inflateSetDictionary @24
31 inflateSync @25 31 inflateSync @25
32 uncompress @26 32 uncompress @26
33 zlibVersion @27 33 zlibVersion @27
34 gzprintf @28 34 gzprintf @28
35 gzputc @29 35 gzputc @29
36 gzgetc @30 36 gzgetc @30
37 gzseek @31 37 gzseek @31
38 gzrewind @32 38 gzrewind @32
39 gztell @33 39 gztell @33
40 gzeof @34 40 gzeof @34
41 gzsetparams @35 41 gzsetparams @35
42 zError @36 42 zError @36
43 inflateSyncPoint @37 43 inflateSyncPoint @37
44 get_crc_table @38 44 get_crc_table @38
45 compress2 @39 45 compress2 @39
46 gzputs @40 46 gzputs @40
47 gzgets @41 47 gzgets @41
48 inflateCopy @42 48 inflateCopy @42
49 inflateBackInit_ @43 49 inflateBackInit_ @43
50 inflateBack @44 50 inflateBack @44
51 inflateBackEnd @45 51 inflateBackEnd @45
52 compressBound @46 52 compressBound @46
53 deflateBound @47 53 deflateBound @47
54 gzclearerr @48 54 gzclearerr @48
55 gzungetc @49 55 gzungetc @49
56 zlibCompileFlags @50 56 zlibCompileFlags @50
57 deflatePrime @51 57 deflatePrime @51
58 deflatePending @52 58 deflatePending @52
59 59
60 unzOpen @61 60 unzOpen @61
61 unzClose @62 61 unzClose @62
62 unzGetGlobalInfo @63 62 unzGetGlobalInfo @63
63 unzGetCurrentFileInfo @64 63 unzGetCurrentFileInfo @64
64 unzGoToFirstFile @65 64 unzGoToFirstFile @65
65 unzGoToNextFile @66 65 unzGoToNextFile @66
66 unzOpenCurrentFile @67 66 unzOpenCurrentFile @67
67 unzReadCurrentFile @68 67 unzReadCurrentFile @68
68 unzOpenCurrentFile3 @69 68 unzOpenCurrentFile3 @69
69 unztell @70 69 unztell @70
70 unzeof @71 70 unzeof @71
71 unzCloseCurrentFile @72 71 unzCloseCurrentFile @72
72 unzGetGlobalComment @73 72 unzGetGlobalComment @73
73 unzStringFileNameCompare @74 73 unzStringFileNameCompare @74
74 unzLocateFile @75 74 unzLocateFile @75
75 unzGetLocalExtrafield @76 75 unzGetLocalExtrafield @76
76 unzOpen2 @77 76 unzOpen2 @77
77 unzOpenCurrentFile2 @78 77 unzOpenCurrentFile2 @78
78 unzOpenCurrentFilePassword @79 78 unzOpenCurrentFilePassword @79
79 79
80 zipOpen @80 80 zipOpen @80
81 zipOpenNewFileInZip @81 81 zipOpenNewFileInZip @81
82 zipWriteInFileInZip @82 82 zipWriteInFileInZip @82
83 zipCloseFileInZip @83 83 zipCloseFileInZip @83
84 zipClose @84 84 zipClose @84
85 zipOpenNewFileInZip2 @86 85 zipOpenNewFileInZip2 @86
86 zipCloseFileInZipRaw @87 86 zipCloseFileInZipRaw @87
87 zipOpen2 @88 87 zipOpen2 @88
88 zipOpenNewFileInZip3 @89 88 zipOpenNewFileInZip3 @89
89 89
90 unzGetFilePos @100 90 unzGetFilePos @100
91 unzGoToFilePos @101 91 unzGoToFilePos @101
92 92
93 fill_win32_filefunc @110 93 fill_win32_filefunc @110
94 94
95; zlibwapi v1.2.4 added: 95; zlibwapi v1.2.4 added:
96 fill_win32_filefunc64 @111 96 fill_win32_filefunc64 @111
97 fill_win32_filefunc64A @112 97 fill_win32_filefunc64A @112
98 fill_win32_filefunc64W @113 98 fill_win32_filefunc64W @113
99 99
100 unzOpen64 @120 100 unzOpen64 @120
101 unzOpen2_64 @121 101 unzOpen2_64 @121
102 unzGetGlobalInfo64 @122 102 unzGetGlobalInfo64 @122
103 unzGetCurrentFileInfo64 @124 103 unzGetCurrentFileInfo64 @124
104 unzGetCurrentFileZStreamPos64 @125 104 unzGetCurrentFileZStreamPos64 @125
105 unztell64 @126 105 unztell64 @126
106 unzGetFilePos64 @127 106 unzGetFilePos64 @127
107 unzGoToFilePos64 @128 107 unzGoToFilePos64 @128
108 108
109 zipOpen64 @130 109 zipOpen64 @130
110 zipOpen2_64 @131 110 zipOpen2_64 @131
111 zipOpenNewFileInZip64 @132 111 zipOpenNewFileInZip64 @132
112 zipOpenNewFileInZip2_64 @133 112 zipOpenNewFileInZip2_64 @133
113 zipOpenNewFileInZip3_64 @134 113 zipOpenNewFileInZip3_64 @134
114 zipOpenNewFileInZip4_64 @135 114 zipOpenNewFileInZip4_64 @135
115 zipCloseFileInZipRaw64 @136 115 zipCloseFileInZipRaw64 @136
116 116
117; zlib1 v1.2.4 added: 117; zlib1 v1.2.4 added:
118 adler32_combine @140 118 adler32_combine @140
119 crc32_combine @142 119 crc32_combine @142
120 deflateSetHeader @144 120 deflateSetHeader @144
121 deflateTune @145 121 deflateTune @145
122 gzbuffer @146 122 gzbuffer @146
123 gzclose_r @147 123 gzclose_r @147
124 gzclose_w @148 124 gzclose_w @148
125 gzdirect @149 125 gzdirect @149
126 gzoffset @150 126 gzoffset @150
127 inflateGetHeader @156 127 inflateGetHeader @156
128 inflateMark @157 128 inflateMark @157
129 inflatePrime @158 129 inflatePrime @158
130 inflateReset2 @159 130 inflateReset2 @159
131 inflateUndermine @160 131 inflateUndermine @160
132 132
133; zlib1 v1.2.6 added: 133; zlib1 v1.2.6 added:
134 gzgetc_ @161 134 gzgetc_ @161
135 inflateResetKeep @163 135 inflateResetKeep @163
136 deflateResetKeep @164 136 deflateResetKeep @164
137 137
138; zlib1 v1.2.7 added: 138; zlib1 v1.2.7 added:
139 gzopen_w @165 139 gzopen_w @165
140 140
141; zlib1 v1.2.8 added: 141; zlib1 v1.2.8 added:
142 inflateGetDictionary @166 142 inflateGetDictionary @166
143 gzvprintf @167 143 gzvprintf @167
144
145; zlib1 v1.2.9 added:
146 inflateCodesUsed @168
147 inflateValidate @169
148 uncompress2 @170
149 gzfread @171
150 gzfwrite @172
151 deflateGetDictionary @173
152 adler32_z @174
153 crc32_z @175
diff --git a/contrib/vstudio/vc14/zlib.rc b/contrib/vstudio/vc14/zlib.rc
index 46a7ee1..4f6396d 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
4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE 4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5 FILEVERSION 1, 2, 8, 1 5 FILEVERSION 1, 2, 9, 0
6 PRODUCTVERSION 1, 2, 8, 1 6 PRODUCTVERSION 1, 2, 9, 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
diff --git a/contrib/vstudio/vc14/zlibvc.def b/contrib/vstudio/vc14/zlibvc.def
index 83106b9..54e683d 100644
--- a/contrib/vstudio/vc14/zlibvc.def
+++ b/contrib/vstudio/vc14/zlibvc.def
@@ -1,143 +1,153 @@
1LIBRARY 1LIBRARY
2; zlib data compression and ZIP file I/O library 2; zlib data compression and ZIP file I/O library
3 3
4VERSION 1.2 4VERSION 1.2
5 5
6EXPORTS 6EXPORTS
7 adler32 @1 7 adler32 @1
8 compress @2 8 compress @2
9 crc32 @3 9 crc32 @3
10 deflate @4 10 deflate @4
11 deflateCopy @5 11 deflateCopy @5
12 deflateEnd @6 12 deflateEnd @6
13 deflateInit2_ @7 13 deflateInit2_ @7
14 deflateInit_ @8 14 deflateInit_ @8
15 deflateParams @9 15 deflateParams @9
16 deflateReset @10 16 deflateReset @10
17 deflateSetDictionary @11 17 deflateSetDictionary @11
18 gzclose @12 18 gzclose @12
19 gzdopen @13 19 gzdopen @13
20 gzerror @14 20 gzerror @14
21 gzflush @15 21 gzflush @15
22 gzopen @16 22 gzopen @16
23 gzread @17 23 gzread @17
24 gzwrite @18 24 gzwrite @18
25 inflate @19 25 inflate @19
26 inflateEnd @20 26 inflateEnd @20
27 inflateInit2_ @21 27 inflateInit2_ @21
28 inflateInit_ @22 28 inflateInit_ @22
29 inflateReset @23 29 inflateReset @23
30 inflateSetDictionary @24 30 inflateSetDictionary @24
31 inflateSync @25 31 inflateSync @25
32 uncompress @26 32 uncompress @26
33 zlibVersion @27 33 zlibVersion @27
34 gzprintf @28 34 gzprintf @28
35 gzputc @29 35 gzputc @29
36 gzgetc @30 36 gzgetc @30
37 gzseek @31 37 gzseek @31
38 gzrewind @32 38 gzrewind @32
39 gztell @33 39 gztell @33
40 gzeof @34 40 gzeof @34
41 gzsetparams @35 41 gzsetparams @35
42 zError @36 42 zError @36
43 inflateSyncPoint @37 43 inflateSyncPoint @37
44 get_crc_table @38 44 get_crc_table @38
45 compress2 @39 45 compress2 @39
46 gzputs @40 46 gzputs @40
47 gzgets @41 47 gzgets @41
48 inflateCopy @42 48 inflateCopy @42
49 inflateBackInit_ @43 49 inflateBackInit_ @43
50 inflateBack @44 50 inflateBack @44
51 inflateBackEnd @45 51 inflateBackEnd @45
52 compressBound @46 52 compressBound @46
53 deflateBound @47 53 deflateBound @47
54 gzclearerr @48 54 gzclearerr @48
55 gzungetc @49 55 gzungetc @49
56 zlibCompileFlags @50 56 zlibCompileFlags @50
57 deflatePrime @51 57 deflatePrime @51
58 deflatePending @52 58 deflatePending @52
59 59
60 unzOpen @61 60 unzOpen @61
61 unzClose @62 61 unzClose @62
62 unzGetGlobalInfo @63 62 unzGetGlobalInfo @63
63 unzGetCurrentFileInfo @64 63 unzGetCurrentFileInfo @64
64 unzGoToFirstFile @65 64 unzGoToFirstFile @65
65 unzGoToNextFile @66 65 unzGoToNextFile @66
66 unzOpenCurrentFile @67 66 unzOpenCurrentFile @67
67 unzReadCurrentFile @68 67 unzReadCurrentFile @68
68 unzOpenCurrentFile3 @69 68 unzOpenCurrentFile3 @69
69 unztell @70 69 unztell @70
70 unzeof @71 70 unzeof @71
71 unzCloseCurrentFile @72 71 unzCloseCurrentFile @72
72 unzGetGlobalComment @73 72 unzGetGlobalComment @73
73 unzStringFileNameCompare @74 73 unzStringFileNameCompare @74
74 unzLocateFile @75 74 unzLocateFile @75
75 unzGetLocalExtrafield @76 75 unzGetLocalExtrafield @76
76 unzOpen2 @77 76 unzOpen2 @77
77 unzOpenCurrentFile2 @78 77 unzOpenCurrentFile2 @78
78 unzOpenCurrentFilePassword @79 78 unzOpenCurrentFilePassword @79
79 79
80 zipOpen @80 80 zipOpen @80
81 zipOpenNewFileInZip @81 81 zipOpenNewFileInZip @81
82 zipWriteInFileInZip @82 82 zipWriteInFileInZip @82
83 zipCloseFileInZip @83 83 zipCloseFileInZip @83
84 zipClose @84 84 zipClose @84
85 zipOpenNewFileInZip2 @86 85 zipOpenNewFileInZip2 @86
86 zipCloseFileInZipRaw @87 86 zipCloseFileInZipRaw @87
87 zipOpen2 @88 87 zipOpen2 @88
88 zipOpenNewFileInZip3 @89 88 zipOpenNewFileInZip3 @89
89 89
90 unzGetFilePos @100 90 unzGetFilePos @100
91 unzGoToFilePos @101 91 unzGoToFilePos @101
92 92
93 fill_win32_filefunc @110 93 fill_win32_filefunc @110
94 94
95; zlibwapi v1.2.4 added: 95; zlibwapi v1.2.4 added:
96 fill_win32_filefunc64 @111 96 fill_win32_filefunc64 @111
97 fill_win32_filefunc64A @112 97 fill_win32_filefunc64A @112
98 fill_win32_filefunc64W @113 98 fill_win32_filefunc64W @113
99 99
100 unzOpen64 @120 100 unzOpen64 @120
101 unzOpen2_64 @121 101 unzOpen2_64 @121
102 unzGetGlobalInfo64 @122 102 unzGetGlobalInfo64 @122
103 unzGetCurrentFileInfo64 @124 103 unzGetCurrentFileInfo64 @124
104 unzGetCurrentFileZStreamPos64 @125 104 unzGetCurrentFileZStreamPos64 @125
105 unztell64 @126 105 unztell64 @126
106 unzGetFilePos64 @127 106 unzGetFilePos64 @127
107 unzGoToFilePos64 @128 107 unzGoToFilePos64 @128
108 108
109 zipOpen64 @130 109 zipOpen64 @130
110 zipOpen2_64 @131 110 zipOpen2_64 @131
111 zipOpenNewFileInZip64 @132 111 zipOpenNewFileInZip64 @132
112 zipOpenNewFileInZip2_64 @133 112 zipOpenNewFileInZip2_64 @133
113 zipOpenNewFileInZip3_64 @134 113 zipOpenNewFileInZip3_64 @134
114 zipOpenNewFileInZip4_64 @135 114 zipOpenNewFileInZip4_64 @135
115 zipCloseFileInZipRaw64 @136 115 zipCloseFileInZipRaw64 @136
116 116
117; zlib1 v1.2.4 added: 117; zlib1 v1.2.4 added:
118 adler32_combine @140 118 adler32_combine @140
119 crc32_combine @142 119 crc32_combine @142
120 deflateSetHeader @144 120 deflateSetHeader @144
121 deflateTune @145 121 deflateTune @145
122 gzbuffer @146 122 gzbuffer @146
123 gzclose_r @147 123 gzclose_r @147
124 gzclose_w @148 124 gzclose_w @148
125 gzdirect @149 125 gzdirect @149
126 gzoffset @150 126 gzoffset @150
127 inflateGetHeader @156 127 inflateGetHeader @156
128 inflateMark @157 128 inflateMark @157
129 inflatePrime @158 129 inflatePrime @158
130 inflateReset2 @159 130 inflateReset2 @159
131 inflateUndermine @160 131 inflateUndermine @160
132 132
133; zlib1 v1.2.6 added: 133; zlib1 v1.2.6 added:
134 gzgetc_ @161 134 gzgetc_ @161
135 inflateResetKeep @163 135 inflateResetKeep @163
136 deflateResetKeep @164 136 deflateResetKeep @164
137 137
138; zlib1 v1.2.7 added: 138; zlib1 v1.2.7 added:
139 gzopen_w @165 139 gzopen_w @165
140 140
141; zlib1 v1.2.8 added: 141; zlib1 v1.2.8 added:
142 inflateGetDictionary @166 142 inflateGetDictionary @166
143 gzvprintf @167 143 gzvprintf @167
144
145; zlib1 v1.2.9 added:
146 inflateCodesUsed @168
147 inflateValidate @169
148 uncompress2 @170
149 gzfread @171
150 gzfwrite @172
151 deflateGetDictionary @173
152 adler32_z @174
153 crc32_z @175
diff --git a/contrib/vstudio/vc9/zlib.rc b/contrib/vstudio/vc9/zlib.rc
index 3e9f7a8..d846820 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
4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE 4IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5 FILEVERSION 1, 2, 8, 1 5 FILEVERSION 1, 2, 9, 0
6 PRODUCTVERSION 1, 2, 8, 1 6 PRODUCTVERSION 1, 2, 9, 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,12 +17,12 @@ 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.8.1\0" 20 VALUE "FileVersion", "1.2.9\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"
24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" 24 VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25 VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0" 25 VALUE "LegalCopyright", "(C) 1995-2016 Jean-loup Gailly & Mark Adler\0"
26 END 26 END
27 END 27 END
28 BLOCK "VarFileInfo" 28 BLOCK "VarFileInfo"
diff --git a/contrib/vstudio/vc9/zlibvc.def b/contrib/vstudio/vc9/zlibvc.def
index 66cf3fb..54e683d 100644
--- a/contrib/vstudio/vc9/zlibvc.def
+++ b/contrib/vstudio/vc9/zlibvc.def
@@ -141,3 +141,13 @@ EXPORTS
141; zlib1 v1.2.8 added: 141; zlib1 v1.2.8 added:
142 inflateGetDictionary @166 142 inflateGetDictionary @166
143 gzvprintf @167 143 gzvprintf @167
144
145; zlib1 v1.2.9 added:
146 inflateCodesUsed @168
147 inflateValidate @169
148 uncompress2 @170
149 gzfread @171
150 gzfwrite @172
151 deflateGetDictionary @173
152 adler32_z @174
153 crc32_z @175
diff --git a/crc32.c b/crc32.c
index ce000ef..9580440 100644
--- a/crc32.c
+++ b/crc32.c
@@ -1,5 +1,5 @@
1/* crc32.c -- compute the CRC-32 of a data stream 1/* crc32.c -- compute the CRC-32 of a data stream
2 * Copyright (C) 1995-2006, 2010, 2011, 2012 Mark Adler 2 * Copyright (C) 1995-2006, 2010, 2011, 2012, 2016 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 * 4 *
5 * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster 5 * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
diff --git a/deflate.c b/deflate.c
index 9079741..415adbf 100644
--- a/deflate.c
+++ b/deflate.c
@@ -52,7 +52,7 @@
52#include "deflate.h" 52#include "deflate.h"
53 53
54const char deflate_copyright[] = 54const char deflate_copyright[] =
55 " deflate 1.2.8.1 Copyright 1995-2016 Jean-loup Gailly and Mark Adler "; 55 " deflate 1.2.9 Copyright 1995-2016 Jean-loup Gailly and Mark Adler ";
56/* 56/*
57 If you use the zlib library in a product, an acknowledgment is welcome 57 If you use the zlib library in a product, an acknowledgment is welcome
58 in the documentation of your product. If for some reason you cannot 58 in the documentation of your product. If for some reason you cannot
diff --git a/deflate.h b/deflate.h
index fa8577e..23ecdd3 100644
--- a/deflate.h
+++ b/deflate.h
@@ -1,5 +1,5 @@
1/* deflate.h -- internal compression state 1/* deflate.h -- internal compression state
2 * Copyright (C) 1995-2012 Jean-loup Gailly 2 * Copyright (C) 1995-2016 Jean-loup Gailly
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/examples/gzlog.c b/examples/gzlog.c
index f33a862..b8c2927 100644
--- a/examples/gzlog.c
+++ b/examples/gzlog.c
@@ -1,6 +1,6 @@
1/* 1/*
2 * gzlog.c 2 * gzlog.c
3 * Copyright (C) 2004, 2008, 2012 Mark Adler, all rights reserved 3 * Copyright (C) 2004, 2008, 2012, 2016 Mark Adler, all rights reserved
4 * For conditions of distribution and use, see copyright notice in gzlog.h 4 * For conditions of distribution and use, see copyright notice in gzlog.h
5 * version 2.2, 14 Aug 2012 5 * version 2.2, 14 Aug 2012
6 */ 6 */
diff --git a/gzguts.h b/gzguts.h
index f728792..990a4d2 100644
--- a/gzguts.h
+++ b/gzguts.h
@@ -1,5 +1,5 @@
1/* gzguts.h -- zlib internal header definitions for gz* operations 1/* gzguts.h -- zlib internal header definitions for gz* operations
2 * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler 2 * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/gzlib.c b/gzlib.c
index 3b2b71b..a87d3d1 100644
--- a/gzlib.c
+++ b/gzlib.c
@@ -1,5 +1,5 @@
1/* gzlib.c -- zlib functions common to reading and writing gzip files 1/* gzlib.c -- zlib functions common to reading and writing gzip files
2 * Copyright (C) 2004, 2010, 2011, 2012, 2013 Mark Adler 2 * Copyright (C) 2004, 2010, 2011, 2012, 2013, 2016 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/gzread.c b/gzread.c
index deea79b..956b91e 100644
--- a/gzread.c
+++ b/gzread.c
@@ -1,5 +1,5 @@
1/* gzread.c -- zlib functions for reading gzip files 1/* gzread.c -- zlib functions for reading gzip files
2 * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler 2 * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/gzwrite.c b/gzwrite.c
index b866251..a2ee573 100644
--- a/gzwrite.c
+++ b/gzwrite.c
@@ -1,5 +1,5 @@
1/* gzwrite.c -- zlib functions for writing gzip files 1/* gzwrite.c -- zlib functions for writing gzip files
2 * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler 2 * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/infback.c b/infback.c
index ea3f76a..59679ec 100644
--- a/infback.c
+++ b/infback.c
@@ -1,5 +1,5 @@
1/* infback.c -- inflate using a call-back interface 1/* infback.c -- inflate using a call-back interface
2 * Copyright (C) 1995-2011 Mark Adler 2 * Copyright (C) 1995-2016 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/inffast.c b/inffast.c
index f0d163d..a15876d 100644
--- a/inffast.c
+++ b/inffast.c
@@ -1,5 +1,5 @@
1/* inffast.c -- fast decoding 1/* inffast.c -- fast decoding
2 * Copyright (C) 1995-2008, 2010, 2013 Mark Adler 2 * Copyright (C) 1995-2008, 2010, 2013, 2016 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/inflate.c b/inflate.c
index 92e9139..ac333e8 100644
--- a/inflate.c
+++ b/inflate.c
@@ -1,5 +1,5 @@
1/* inflate.c -- zlib decompression 1/* inflate.c -- zlib decompression
2 * Copyright (C) 1995-2012 Mark Adler 2 * Copyright (C) 1995-2016 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/inflate.h b/inflate.h
index 047124d..a46cce6 100644
--- a/inflate.h
+++ b/inflate.h
@@ -1,5 +1,5 @@
1/* inflate.h -- internal inflate state definition 1/* inflate.h -- internal inflate state definition
2 * Copyright (C) 1995-2009 Mark Adler 2 * Copyright (C) 1995-2016 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/inftrees.c b/inftrees.c
index 8b2ad4f..fa27dcb 100644
--- a/inftrees.c
+++ b/inftrees.c
@@ -1,5 +1,5 @@
1/* inftrees.c -- generate Huffman trees for efficient decoding 1/* inftrees.c -- generate Huffman trees for efficient decoding
2 * Copyright (C) 1995-2013 Mark Adler 2 * Copyright (C) 1995-2016 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
@@ -9,7 +9,7 @@
9#define MAXBITS 15 9#define MAXBITS 15
10 10
11const char inflate_copyright[] = 11const char inflate_copyright[] =
12 " inflate 1.2.8.1 Copyright 1995-2013 Mark Adler "; 12 " inflate 1.2.9 Copyright 1995-2016 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
@@ -62,7 +62,7 @@ unsigned short FAR *work;
62 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; 62 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
63 static const unsigned short lext[31] = { /* Length codes 257..285 extra */ 63 static const unsigned short lext[31] = { /* Length codes 257..285 extra */
64 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, 64 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
65 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 203, 198}; 65 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 192, 79};
66 static const unsigned short dbase[32] = { /* Distance codes 0..29 base */ 66 static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
67 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 67 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
68 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 68 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
diff --git a/os400/README400 b/os400/README400
index 601f1ae..7926d7c 100644
--- a/os400/README400
+++ b/os400/README400
@@ -1,4 +1,4 @@
1 ZLIB version 1.2.8 for OS/400 installation instructions 1 ZLIB version 1.2.9 for OS/400 installation instructions
2 2
31) Download and unpack the zlib tarball to some IFS directory. 31) Download and unpack the zlib tarball to some IFS directory.
4 (i.e.: /path/to/the/zlib/ifs/source/directory) 4 (i.e.: /path/to/the/zlib/ifs/source/directory)
diff --git a/os400/bndsrc b/os400/bndsrc
index 934d781..5e6e0a2 100644
--- a/os400/bndsrc
+++ b/os400/bndsrc
@@ -46,6 +46,7 @@ STRPGMEXP PGMLVL(*CURRENT) SIGNATURE('ZLIB')
46 EXPORT SYMBOL("uncompress") 46 EXPORT SYMBOL("uncompress")
47 EXPORT SYMBOL("zlibVersion") 47 EXPORT SYMBOL("zlibVersion")
48 EXPORT SYMBOL("zError") 48 EXPORT SYMBOL("zError")
49 EXPORT SYMBOL("z_errmsg")
49 50
50/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/ 51/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
51/* Version 1.2.1 additional entry points. */ 52/* Version 1.2.1 additional entry points. */
@@ -53,6 +54,7 @@ STRPGMEXP PGMLVL(*CURRENT) SIGNATURE('ZLIB')
53 54
54 EXPORT SYMBOL("compressBound") 55 EXPORT SYMBOL("compressBound")
55 EXPORT SYMBOL("deflateBound") 56 EXPORT SYMBOL("deflateBound")
57 EXPORT SYMBOL("deflatePending")
56 EXPORT SYMBOL("gzungetc") 58 EXPORT SYMBOL("gzungetc")
57 EXPORT SYMBOL("gzclearerr") 59 EXPORT SYMBOL("gzclearerr")
58 EXPORT SYMBOL("inflateBack") 60 EXPORT SYMBOL("inflateBack")
@@ -62,21 +64,25 @@ STRPGMEXP PGMLVL(*CURRENT) SIGNATURE('ZLIB')
62 EXPORT SYMBOL("zlibCompileFlags") 64 EXPORT SYMBOL("zlibCompileFlags")
63 65
64/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/ 66/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
65/* Version 1.2.5 additional entry points. */ 67/* Version 1.2.4 additional entry points. */
66/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/ 68/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
67 69
68 EXPORT SYMBOL("adler32_combine") 70 EXPORT SYMBOL("adler32_combine")
69 EXPORT SYMBOL("adler32_combine64") 71 EXPORT SYMBOL("adler32_combine64")
70 EXPORT SYMBOL("crc32_combine") 72 EXPORT SYMBOL("crc32_combine")
71 EXPORT SYMBOL("crc32_combine64") 73 EXPORT SYMBOL("crc32_combine64")
74 EXPORT SYMBOL("deflateSetHeader")
75 EXPORT SYMBOL("deflateTune")
72 EXPORT SYMBOL("gzbuffer") 76 EXPORT SYMBOL("gzbuffer")
77 EXPORT SYMBOL("gzclose_r")
78 EXPORT SYMBOL("gzclose_w")
79 EXPORT SYMBOL("gzdirect")
73 EXPORT SYMBOL("gzoffset") 80 EXPORT SYMBOL("gzoffset")
74 EXPORT SYMBOL("gzoffset64") 81 EXPORT SYMBOL("gzoffset64")
75 EXPORT SYMBOL("gzopen64") 82 EXPORT SYMBOL("gzopen64")
76 EXPORT SYMBOL("gzseek64") 83 EXPORT SYMBOL("gzseek64")
77 EXPORT SYMBOL("gztell64") 84 EXPORT SYMBOL("gztell64")
78 EXPORT SYMBOL("gzclose_r") 85 EXPORT SYMBOL("inflateGetHeader")
79 EXPORT SYMBOL("gzclose_w")
80 EXPORT SYMBOL("inflateMark") 86 EXPORT SYMBOL("inflateMark")
81 EXPORT SYMBOL("inflatePrime") 87 EXPORT SYMBOL("inflatePrime")
82 EXPORT SYMBOL("inflateReset2") 88 EXPORT SYMBOL("inflateReset2")
@@ -87,7 +93,6 @@ STRPGMEXP PGMLVL(*CURRENT) SIGNATURE('ZLIB')
87/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/ 93/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
88 94
89 EXPORT SYMBOL("deflateResetKeep") 95 EXPORT SYMBOL("deflateResetKeep")
90 EXPORT SYMBOL("deflatePending")
91 EXPORT SYMBOL("gzgetc_") 96 EXPORT SYMBOL("gzgetc_")
92 EXPORT SYMBOL("inflateResetKeep") 97 EXPORT SYMBOL("inflateResetKeep")
93 98
@@ -95,6 +100,20 @@ STRPGMEXP PGMLVL(*CURRENT) SIGNATURE('ZLIB')
95/* Version 1.2.8 additional entry points. */ 100/* Version 1.2.8 additional entry points. */
96/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/ 101/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
97 102
103 EXPORT SYMBOL("gzvprintf")
98 EXPORT SYMBOL("inflateGetDictionary") 104 EXPORT SYMBOL("inflateGetDictionary")
99 105
106/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
107/* Version 1.2.9 additional entry points. */
108/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
109
110 EXPORT SYMBOL("adler32_z")
111 EXPORT SYMBOL("crc32_z")
112 EXPORT SYMBOL("deflateGetDictionary")
113 EXPORT SYMBOL("gzfread")
114 EXPORT SYMBOL("gzfwrite")
115 EXPORT SYMBOL("inflateCodesUsed")
116 EXPORT SYMBOL("inflateValidate")
117 EXPORT SYMBOL("uncompress2")
118
100ENDPGMEXP 119ENDPGMEXP
diff --git a/os400/zlib.inc b/os400/zlib.inc
index 7341a6d..5431e54 100644
--- a/os400/zlib.inc
+++ b/os400/zlib.inc
@@ -1,7 +1,7 @@
1 * ZLIB.INC - Interface to the general purpose compression library 1 * ZLIB.INC - Interface to the general purpose compression library
2 * 2 *
3 * ILE RPG400 version by Patrick Monnerat, DATASPHERE. 3 * ILE RPG400 version by Patrick Monnerat, DATASPHERE.
4 * Version 1.2.8 4 * Version 1.2.9
5 * 5 *
6 * 6 *
7 * WARNING: 7 * WARNING:
@@ -22,12 +22,12 @@
22 * 22 *
23 * Versioning information. 23 * Versioning information.
24 * 24 *
25 D ZLIB_VERSION C '1.2.8' 25 D ZLIB_VERSION C '1.2.9'
26 D ZLIB_VERNUM C X'1280' 26 D ZLIB_VERNUM C X'1290'
27 D ZLIB_VER_MAJOR C 1 27 D ZLIB_VER_MAJOR C 1
28 D ZLIB_VER_MINOR C 2 28 D ZLIB_VER_MINOR C 2
29 D ZLIB_VER_REVISION... 29 D ZLIB_VER_REVISION...
30 D C 8 30 D C 9
31 D ZLIB_VER_SUBREVISION... 31 D ZLIB_VER_SUBREVISION...
32 D C 0 32 D C 0
33 * 33 *
@@ -50,7 +50,7 @@
50 D Z_DATA_ERROR C -3 50 D Z_DATA_ERROR C -3
51 D Z_MEM_ERROR C -4 51 D Z_MEM_ERROR C -4
52 D Z_BUF_ERROR C -5 52 D Z_BUF_ERROR C -5
53 DZ_VERSION_ERROR C -6 53 D Z_VERSION_ERROR C -6
54 * 54 *
55 D Z_NO_COMPRESSION... 55 D Z_NO_COMPRESSION...
56 D C 0 56 D C 0
@@ -80,6 +80,7 @@
80 * 80 *
81 D z_streamp S * Stream struct ptr 81 D z_streamp S * Stream struct ptr
82 D gzFile S * File pointer 82 D gzFile S * File pointer
83 D gz_headerp S *
83 D z_off_t S 10i 0 Stream offsets 84 D z_off_t S 10i 0 Stream offsets
84 D z_off64_t S 20i 0 Stream offsets 85 D z_off64_t S 20i 0 Stream offsets
85 * 86 *
@@ -132,6 +133,12 @@
132 D source 65535 const options(*varsize) Source buffer 133 D source 65535 const options(*varsize) Source buffer
133 D sourceLen 10U 0 value Source length 134 D sourceLen 10U 0 value Source length
134 * 135 *
136 D uncompress2 PR 10I 0 extproc('uncompress2')
137 D dest 65535 options(*varsize) Destination buffer
138 D destLen 10U 0 Destination length
139 D source 65535 const options(*varsize) Source buffer
140 D sourceLen 10U 0 Source length
141 *
135 /if not defined(LARGE_FILES) 142 /if not defined(LARGE_FILES)
136 D gzopen PR extproc('gzopen') 143 D gzopen PR extproc('gzopen')
137 D like(gzFile) 144 D like(gzFile)
@@ -168,11 +175,23 @@
168 D buf 65535 options(*varsize) Buffer 175 D buf 65535 options(*varsize) Buffer
169 D len 10u 0 value Buffer length 176 D len 10u 0 value Buffer length
170 * 177 *
178 D gzfread PR 20I 0 extproc('gzfread')
179 D buf 65535 options(*varsize) Buffer
180 D size 20u 0 value Buffer length
181 D nitems 20u 0 value Buffer length
182 D file value like(gzFile) File pointer
183 *
171 D gzwrite PR 10I 0 extproc('gzwrite') 184 D gzwrite PR 10I 0 extproc('gzwrite')
172 D file value like(gzFile) File pointer 185 D file value like(gzFile) File pointer
173 D buf 65535 const options(*varsize) Buffer 186 D buf 65535 const options(*varsize) Buffer
174 D len 10u 0 value Buffer length 187 D len 10u 0 value Buffer length
175 * 188 *
189 D gzfwrite PR 20I 0 extproc('gzfwrite')
190 D buf 65535 options(*varsize) Buffer
191 D size 20u 0 value Buffer length
192 D nitems 20u 0 value Buffer length
193 D file value like(gzFile) File pointer
194 *
176 D gzputs PR 10I 0 extproc('gzputs') 195 D gzputs PR 10I 0 extproc('gzputs')
177 D file value like(gzFile) File pointer 196 D file value like(gzFile) File pointer
178 D s * value options(*string) String to output 197 D s * value options(*string) String to output
@@ -254,6 +273,9 @@
254 D gzeof PR 10i 0 extproc('gzeof') 273 D gzeof PR 10i 0 extproc('gzeof')
255 D file value like(gzFile) File pointer 274 D file value like(gzFile) File pointer
256 * 275 *
276 D gzdirect PR 10i 0 extproc('gzdirect')
277 D file value like(gzFile) File pointer
278 *
257 D gzclose_r PR 10i 0 extproc('gzclose_r') 279 D gzclose_r PR 10i 0 extproc('gzclose_r')
258 D file value like(gzFile) File pointer 280 D file value like(gzFile) File pointer
259 * 281 *
@@ -311,7 +333,7 @@
311 D method 10I 0 value Compression method 333 D method 10I 0 value Compression method
312 D windowBits 10I 0 value log2(window size) 334 D windowBits 10I 0 value log2(window size)
313 D memLevel 10I 0 value Mem/cmpress tradeoff 335 D memLevel 10I 0 value Mem/cmpress tradeoff
314 D strategy 10I 0 value Compression stategy 336 D strategy 10I 0 value Compression strategy
315 D version * value options(*string) Version string 337 D version * value options(*string) Version string
316 D stream_size 10i 0 value Stream struct. size 338 D stream_size 10i 0 value Stream struct. size
317 * 339 *
@@ -331,7 +353,14 @@
331 D deflateParams PR 10I 0 extproc('deflateParams') Change level & strat 353 D deflateParams PR 10I 0 extproc('deflateParams') Change level & strat
332 D strm like(z_stream) Compression stream 354 D strm like(z_stream) Compression stream
333 D level 10I 0 value Compression level 355 D level 10I 0 value Compression level
334 D strategy 10I 0 value Compression stategy 356 D strategy 10I 0 value Compression strategy
357 *
358 D deflateTune PR 10I 0 extproc('deflateTune')
359 D strm like(z_stream) Compression stream
360 D good 10I 0 value
361 D lazy 10I 0 value
362 D nice 10I 0 value
363 D chain 10I 0 value
335 * 364 *
336 D deflateBound PR 10U 0 extproc('deflateBound') Change level & strat 365 D deflateBound PR 10U 0 extproc('deflateBound') Change level & strat
337 D strm like(z_stream) Compression stream 366 D strm like(z_stream) Compression stream
@@ -365,6 +394,12 @@
365 D dictionary 65535 options(*varsize) Dictionary bytes 394 D dictionary 65535 options(*varsize) Dictionary bytes
366 D dictLength 10U 0 Dictionary length 395 D dictLength 10U 0 Dictionary length
367 * 396 *
397 D deflateGetDictionary...
398 D PR 10I 0 extproc('deflateGetDictionary') Get dictionary
399 D strm like(z_stream) Expansion stream
400 D dictionary 65535 options(*varsize) Dictionary bytes
401 D dictLength 10U 0 Dictionary length
402 *
368 D inflateSync PR 10I 0 extproc('inflateSync') Sync. expansion 403 D inflateSync PR 10I 0 extproc('inflateSync') Sync. expansion
369 D strm like(z_stream) Expansion stream 404 D strm like(z_stream) Expansion stream
370 * 405 *
@@ -387,6 +422,25 @@
387 D inflateMark PR 10I 0 extproc('inflateMark') Get inflate info 422 D inflateMark PR 10I 0 extproc('inflateMark') Get inflate info
388 D strm like(z_stream) Expansion stream 423 D strm like(z_stream) Expansion stream
389 * 424 *
425 D inflateCodesUsed...
426 PR 20U 0 extproc('inflateCodesUsed')
427 D strm like(z_stream) Expansion stream
428 *
429 D inflateValidate...
430 PR 20U 0 extproc('inflateValidate')
431 D strm like(z_stream) Expansion stream
432 D check 10I 0 value
433 *
434 D inflateGetHeader...
435 PR 10U 0 extproc('inflateGetHeader')
436 D strm like(z_stream) Expansion stream
437 D head like(gz_headerp)
438 *
439 D deflateSetHeader...
440 PR 10U 0 extproc('deflateSetHeader')
441 D strm like(z_stream) Expansion stream
442 D head like(gz_headerp)
443 *
390 D inflateBackInit... 444 D inflateBackInit...
391 D PR 10I 0 extproc('inflateBackInit_') 445 D PR 10I 0 extproc('inflateBackInit_')
392 D strm like(z_stream) Expansion stream 446 D strm like(z_stream) Expansion stream
@@ -417,11 +471,33 @@
417 D buf 65535 const options(*varsize) Bytes to accumulate 471 D buf 65535 const options(*varsize) Bytes to accumulate
418 D len 10U 0 value Buffer length 472 D len 10U 0 value Buffer length
419 * 473 *
474 D adler32_combine...
475 PR 10U 0 extproc('adler32_combine') New checksum
476 D adler1 10U 0 value Old checksum
477 D adler2 10U 0 value Old checksum
478 D len2 20U 0 value Buffer length
479 *
480 D adler32_z PR 10U 0 extproc('adler32_z') New checksum
481 D adler 10U 0 value Old checksum
482 D buf 65535 const options(*varsize) Bytes to accumulate
483 D len 20U 0 value Buffer length
484 *
420 D crc32 PR 10U 0 extproc('crc32') New checksum 485 D crc32 PR 10U 0 extproc('crc32') New checksum
421 D crc 10U 0 value Old checksum 486 D crc 10U 0 value Old checksum
422 D buf 65535 const options(*varsize) Bytes to accumulate 487 D buf 65535 const options(*varsize) Bytes to accumulate
423 D len 10U 0 value Buffer length 488 D len 10U 0 value Buffer length
424 * 489 *
490 D crc32_combine...
491 PR 10U 0 extproc('crc32_combine') New checksum
492 D crc1 10U 0 value Old checksum
493 D crc2 10U 0 value Old checksum
494 D len2 20U 0 value Buffer length
495 *
496 D crc32_z PR 10U 0 extproc('crc32_z') New checksum
497 D crc 10U 0 value Old checksum
498 D buf 65535 const options(*varsize) Bytes to accumulate
499 D len 20U 0 value Buffer length
500 *
425 ************************************************************************** 501 **************************************************************************
426 * Miscellaneous function prototypes 502 * Miscellaneous function prototypes
427 ************************************************************************** 503 **************************************************************************
diff --git a/qnx/package.qpg b/qnx/package.qpg
index c186113..67a8777 100644
--- a/qnx/package.qpg
+++ b/qnx/package.qpg
@@ -25,10 +25,10 @@
25 <QPG:Files> 25 <QPG:Files>
26 <QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/> 26 <QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/>
27 <QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/> 27 <QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/>
28 <QPG:Add file="../libz.so.1.2.8.1" install="/opt/lib/" user="root:bin" permission="644"/> 28 <QPG:Add file="../libz.so.1.2.9" install="/opt/lib/" user="root:bin" permission="644"/>
29 <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.8.1"/> 29 <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.9"/>
30 <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.8.1"/> 30 <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.9"/>
31 <QPG:Add file="../libz.so.1.2.8.1" install="/opt/lib/" component="slib"/> 31 <QPG:Add file="../libz.so.1.2.9" install="/opt/lib/" component="slib"/>
32 </QPG:Files> 32 </QPG:Files>
33 33
34 <QPG:PackageFilter> 34 <QPG:PackageFilter>
@@ -63,7 +63,7 @@
63 </QPM:ProductDescription> 63 </QPM:ProductDescription>
64 64
65 <QPM:ReleaseDescription> 65 <QPM:ReleaseDescription>
66 <QPM:ReleaseVersion>1.2.8.1</QPM:ReleaseVersion> 66 <QPM:ReleaseVersion>1.2.9</QPM:ReleaseVersion>
67 <QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency> 67 <QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
68 <QPM:ReleaseStability>Stable</QPM:ReleaseStability> 68 <QPM:ReleaseStability>Stable</QPM:ReleaseStability>
69 <QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor> 69 <QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor>
diff --git a/test/example.c b/test/example.c
index f008749..eee17ce 100644
--- a/test/example.c
+++ b/test/example.c
@@ -1,5 +1,5 @@
1/* example.c -- usage example of the zlib compression library 1/* example.c -- usage example of the zlib compression library
2 * Copyright (C) 1995-2006, 2011 Jean-loup Gailly. 2 * Copyright (C) 1995-2006, 2011, 2016 Jean-loup Gailly
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/test/infcover.c b/test/infcover.c
index 3153234..2be0164 100644
--- a/test/infcover.c
+++ b/test/infcover.c
@@ -1,5 +1,5 @@
1/* infcover.c -- test zlib's inflate routines with full code coverage 1/* infcover.c -- test zlib's inflate routines with full code coverage
2 * Copyright (C) 2011 Mark Adler 2 * Copyright (C) 2011, 2016 Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/test/minigzip.c b/test/minigzip.c
index b392304..e22fb08 100644
--- a/test/minigzip.c
+++ b/test/minigzip.c
@@ -1,5 +1,5 @@
1/* minigzip.c -- simulate gzip using the zlib compression library 1/* minigzip.c -- simulate gzip using the zlib compression library
2 * Copyright (C) 1995-2006, 2010, 2011 Jean-loup Gailly. 2 * Copyright (C) 1995-2006, 2010, 2011, 2016 Jean-loup Gailly
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/treebuild.xml b/treebuild.xml
index d3732d8..931ee5a 100644
--- a/treebuild.xml
+++ b/treebuild.xml
@@ -1,6 +1,6 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<package name="zlib" version="1.2.8.1"> 2<package name="zlib" version="1.2.9">
3 <library name="zlib" dlversion="1.2.8.1" dlname="z"> 3 <library name="zlib" dlversion="1.2.9" dlname="z">
4 <property name="description"> zip compression library </property> 4 <property name="description"> zip compression library </property>
5 <property name="include-target-dir" value="$(@PACKAGE/install-includedir)" /> 5 <property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
6 6
diff --git a/trees.c b/trees.c
index 559a0de..357f313 100644
--- a/trees.c
+++ b/trees.c
@@ -1,5 +1,5 @@
1/* trees.c -- output deflated data using Huffman coding 1/* trees.c -- output deflated data using Huffman coding
2 * Copyright (C) 1995-2012 Jean-loup Gailly 2 * Copyright (C) 1995-2016 Jean-loup Gailly
3 * detect_data_type() function provided freely by Cosmin Truta, 2006 3 * detect_data_type() function provided freely by Cosmin Truta, 2006
4 * For conditions of distribution and use, see copyright notice in zlib.h 4 * For conditions of distribution and use, see copyright notice in zlib.h
5 */ 5 */
diff --git a/win32/README-WIN32.txt b/win32/README-WIN32.txt
index 4a74e3e..5002f3c 100644
--- a/win32/README-WIN32.txt
+++ b/win32/README-WIN32.txt
@@ -1,6 +1,6 @@
1ZLIB DATA COMPRESSION LIBRARY 1ZLIB DATA COMPRESSION LIBRARY
2 2
3zlib 1.2.8.1 is a general purpose data compression library. All the code is 3zlib 1.2.9 is a general purpose data compression library. All the code is
4thread safe. The data format used by the zlib library is described by RFCs 4thread safe. The data format used by the zlib library is described by RFCs
5(Request for Comments) 1950 to 1952 in the files 5(Request for Comments) 1950 to 1952 in the files
6http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format) 6http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
@@ -22,7 +22,7 @@ before asking for help.
22 22
23Manifest: 23Manifest:
24 24
25The package zlib-1.2.8.1-win32-x86.zip will contain the following files: 25The package zlib-1.2.9-win32-x86.zip will contain the following files:
26 26
27 README-WIN32.txt This document 27 README-WIN32.txt This document
28 ChangeLog Changes since previous zlib packages 28 ChangeLog Changes since previous zlib packages
diff --git a/win32/zlib.def b/win32/zlib.def
index face655..784b138 100644
--- a/win32/zlib.def
+++ b/win32/zlib.def
@@ -1,86 +1,94 @@
1; zlib data compression library 1; zlib data compression library
2EXPORTS 2EXPORTS
3; basic functions 3; basic functions
4 zlibVersion 4 zlibVersion
5 deflate 5 deflate
6 deflateEnd 6 deflateEnd
7 inflate 7 inflate
8 inflateEnd 8 inflateEnd
9; advanced functions 9; advanced functions
10 deflateSetDictionary 10 deflateSetDictionary
11 deflateCopy 11 deflateGetDictionary
12 deflateReset 12 deflateCopy
13 deflateParams 13 deflateReset
14 deflateTune 14 deflateParams
15 deflateBound 15 deflateTune
16 deflatePending 16 deflateBound
17 deflatePrime 17 deflatePending
18 deflateSetHeader 18 deflatePrime
19 inflateSetDictionary 19 deflateSetHeader
20 inflateGetDictionary 20 inflateSetDictionary
21 inflateSync 21 inflateGetDictionary
22 inflateCopy 22 inflateSync
23 inflateReset 23 inflateCopy
24 inflateReset2 24 inflateReset
25 inflatePrime 25 inflateReset2
26 inflateMark 26 inflatePrime
27 inflateGetHeader 27 inflateMark
28 inflateBack 28 inflateGetHeader
29 inflateBackEnd 29 inflateBack
30 zlibCompileFlags 30 inflateBackEnd
31; utility functions 31 zlibCompileFlags
32 compress 32; utility functions
33 compress2 33 compress
34 compressBound 34 compress2
35 uncompress 35 compressBound
36 gzopen 36 uncompress
37 gzdopen 37 uncompress2
38 gzbuffer 38 gzopen
39 gzsetparams 39 gzdopen
40 gzread 40 gzbuffer
41 gzwrite 41 gzsetparams
42 gzprintf 42 gzread
43 gzvprintf 43 gzfread
44 gzputs 44 gzwrite
45 gzgets 45 gzfwrite
46 gzputc 46 gzprintf
47 gzgetc 47 gzvprintf
48 gzungetc 48 gzputs
49 gzflush 49 gzgets
50 gzseek 50 gzputc
51 gzrewind 51 gzgetc
52 gztell 52 gzungetc
53 gzoffset 53 gzflush
54 gzeof 54 gzseek
55 gzdirect 55 gzrewind
56 gzclose 56 gztell
57 gzclose_r 57 gzoffset
58 gzclose_w 58 gzeof
59 gzerror 59 gzdirect
60 gzclearerr 60 gzclose
61; large file functions 61 gzclose_r
62 gzopen64 62 gzclose_w
63 gzseek64 63 gzerror
64 gztell64 64 gzclearerr
65 gzoffset64 65; large file functions
66 adler32_combine64 66 gzopen64
67 crc32_combine64 67 gzseek64
68; checksum functions 68 gztell64
69 adler32 69 gzoffset64
70 crc32 70 adler32_combine64
71 adler32_combine 71 crc32_combine64
72 crc32_combine 72; checksum functions
73; various hacks, don't look :) 73 adler32
74 deflateInit_ 74 adler32_z
75 deflateInit2_ 75 crc32
76 inflateInit_ 76 crc32_z
77 inflateInit2_ 77 adler32_combine
78 inflateBackInit_ 78 crc32_combine
79 gzgetc_ 79; various hacks, don't look :)
80 zError 80 deflateInit_
81 inflateSyncPoint 81 deflateInit2_
82 get_crc_table 82 inflateInit_
83 inflateUndermine 83 inflateInit2_
84 inflateResetKeep 84 inflateBackInit_
85 deflateResetKeep 85 gzgetc_
86 gzopen_w 86 zError
87 inflateSyncPoint
88 get_crc_table
89 inflateUndermine
90 inflateValidate
91 inflateCodesUsed
92 inflateResetKeep
93 deflateResetKeep
94 gzopen_w
diff --git a/zconf.h b/zconf.h
index ca1eb81..5e1d68a 100644
--- a/zconf.h
+++ b/zconf.h
@@ -1,5 +1,5 @@
1/* zconf.h -- configuration of the zlib compression library 1/* zconf.h -- configuration of the zlib compression library
2 * Copyright (C) 1995-2013 Jean-loup Gailly. 2 * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
@@ -29,6 +29,7 @@
29# define adler32 z_adler32 29# define adler32 z_adler32
30# define adler32_combine z_adler32_combine 30# define adler32_combine z_adler32_combine
31# define adler32_combine64 z_adler32_combine64 31# define adler32_combine64 z_adler32_combine64
32# define adler32_z z_adler32_z
32# ifndef Z_SOLO 33# ifndef Z_SOLO
33# define compress z_compress 34# define compress z_compress
34# define compress2 z_compress2 35# define compress2 z_compress2
@@ -37,10 +38,12 @@
37# define crc32 z_crc32 38# define crc32 z_crc32
38# define crc32_combine z_crc32_combine 39# define crc32_combine z_crc32_combine
39# define crc32_combine64 z_crc32_combine64 40# define crc32_combine64 z_crc32_combine64
41# define crc32_z z_crc32_z
40# define deflate z_deflate 42# define deflate z_deflate
41# define deflateBound z_deflateBound 43# define deflateBound z_deflateBound
42# define deflateCopy z_deflateCopy 44# define deflateCopy z_deflateCopy
43# define deflateEnd z_deflateEnd 45# define deflateEnd z_deflateEnd
46# define deflateGetDictionary z_deflateGetDictionary
44# define deflateInit z_deflateInit 47# define deflateInit z_deflateInit
45# define deflateInit2 z_deflateInit2 48# define deflateInit2 z_deflateInit2
46# define deflateInit2_ z_deflateInit2_ 49# define deflateInit2_ z_deflateInit2_
@@ -69,6 +72,8 @@
69# define gzeof z_gzeof 72# define gzeof z_gzeof
70# define gzerror z_gzerror 73# define gzerror z_gzerror
71# define gzflush z_gzflush 74# define gzflush z_gzflush
75# define gzfread z_gzfread
76# define gzfwrite z_gzfwrite
72# define gzgetc z_gzgetc 77# define gzgetc z_gzgetc
73# define gzgetc_ z_gzgetc_ 78# define gzgetc_ z_gzgetc_
74# define gzgets z_gzgets 79# define gzgets z_gzgets
@@ -80,7 +85,6 @@
80# define gzopen_w z_gzopen_w 85# define gzopen_w z_gzopen_w
81# endif 86# endif
82# define gzprintf z_gzprintf 87# define gzprintf z_gzprintf
83# define gzvprintf z_gzvprintf
84# define gzputc z_gzputc 88# define gzputc z_gzputc
85# define gzputs z_gzputs 89# define gzputs z_gzputs
86# define gzread z_gzread 90# define gzread z_gzread
@@ -91,6 +95,7 @@
91# define gztell z_gztell 95# define gztell z_gztell
92# define gztell64 z_gztell64 96# define gztell64 z_gztell64
93# define gzungetc z_gzungetc 97# define gzungetc z_gzungetc
98# define gzvprintf z_gzvprintf
94# define gzwrite z_gzwrite 99# define gzwrite z_gzwrite
95# endif 100# endif
96# define inflate z_inflate 101# define inflate z_inflate
@@ -98,8 +103,10 @@
98# define inflateBackEnd z_inflateBackEnd 103# define inflateBackEnd z_inflateBackEnd
99# define inflateBackInit z_inflateBackInit 104# define inflateBackInit z_inflateBackInit
100# define inflateBackInit_ z_inflateBackInit_ 105# define inflateBackInit_ z_inflateBackInit_
106# define inflateCodesUsed z_inflateCodesUsed
101# define inflateCopy z_inflateCopy 107# define inflateCopy z_inflateCopy
102# define inflateEnd z_inflateEnd 108# define inflateEnd z_inflateEnd
109# define inflateGetDictionary z_inflateGetDictionary
103# define inflateGetHeader z_inflateGetHeader 110# define inflateGetHeader z_inflateGetHeader
104# define inflateInit z_inflateInit 111# define inflateInit z_inflateInit
105# define inflateInit2 z_inflateInit2 112# define inflateInit2 z_inflateInit2
@@ -109,17 +116,18 @@
109# define inflatePrime z_inflatePrime 116# define inflatePrime z_inflatePrime
110# define inflateReset z_inflateReset 117# define inflateReset z_inflateReset
111# define inflateReset2 z_inflateReset2 118# define inflateReset2 z_inflateReset2
119# define inflateResetKeep z_inflateResetKeep
112# define inflateSetDictionary z_inflateSetDictionary 120# define inflateSetDictionary z_inflateSetDictionary
113# define inflateGetDictionary z_inflateGetDictionary
114# define inflateSync z_inflateSync 121# define inflateSync z_inflateSync
115# define inflateSyncPoint z_inflateSyncPoint 122# define inflateSyncPoint z_inflateSyncPoint
116# define inflateUndermine z_inflateUndermine 123# define inflateUndermine z_inflateUndermine
117# define inflateResetKeep z_inflateResetKeep 124# define inflateValidate z_inflateValidate
118# define inflate_copyright z_inflate_copyright 125# define inflate_copyright z_inflate_copyright
119# define inflate_fast z_inflate_fast 126# define inflate_fast z_inflate_fast
120# define inflate_table z_inflate_table 127# define inflate_table z_inflate_table
121# ifndef Z_SOLO 128# ifndef Z_SOLO
122# define uncompress z_uncompress 129# define uncompress z_uncompress
130# define uncompress2 z_uncompress2
123# endif 131# endif
124# define zError z_zError 132# define zError z_zError
125# ifndef Z_SOLO 133# ifndef Z_SOLO
diff --git a/zconf.h.cmakein b/zconf.h.cmakein
index 27a220b..a7f24cc 100644
--- a/zconf.h.cmakein
+++ b/zconf.h.cmakein
@@ -1,5 +1,5 @@
1/* zconf.h -- configuration of the zlib compression library 1/* zconf.h -- configuration of the zlib compression library
2 * Copyright (C) 1995-2013 Jean-loup Gailly. 2 * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
@@ -31,6 +31,7 @@
31# define adler32 z_adler32 31# define adler32 z_adler32
32# define adler32_combine z_adler32_combine 32# define adler32_combine z_adler32_combine
33# define adler32_combine64 z_adler32_combine64 33# define adler32_combine64 z_adler32_combine64
34# define adler32_z z_adler32_z
34# ifndef Z_SOLO 35# ifndef Z_SOLO
35# define compress z_compress 36# define compress z_compress
36# define compress2 z_compress2 37# define compress2 z_compress2
@@ -39,10 +40,12 @@
39# define crc32 z_crc32 40# define crc32 z_crc32
40# define crc32_combine z_crc32_combine 41# define crc32_combine z_crc32_combine
41# define crc32_combine64 z_crc32_combine64 42# define crc32_combine64 z_crc32_combine64
43# define crc32_z z_crc32_z
42# define deflate z_deflate 44# define deflate z_deflate
43# define deflateBound z_deflateBound 45# define deflateBound z_deflateBound
44# define deflateCopy z_deflateCopy 46# define deflateCopy z_deflateCopy
45# define deflateEnd z_deflateEnd 47# define deflateEnd z_deflateEnd
48# define deflateGetDictionary z_deflateGetDictionary
46# define deflateInit z_deflateInit 49# define deflateInit z_deflateInit
47# define deflateInit2 z_deflateInit2 50# define deflateInit2 z_deflateInit2
48# define deflateInit2_ z_deflateInit2_ 51# define deflateInit2_ z_deflateInit2_
@@ -71,6 +74,8 @@
71# define gzeof z_gzeof 74# define gzeof z_gzeof
72# define gzerror z_gzerror 75# define gzerror z_gzerror
73# define gzflush z_gzflush 76# define gzflush z_gzflush
77# define gzfread z_gzfread
78# define gzfwrite z_gzfwrite
74# define gzgetc z_gzgetc 79# define gzgetc z_gzgetc
75# define gzgetc_ z_gzgetc_ 80# define gzgetc_ z_gzgetc_
76# define gzgets z_gzgets 81# define gzgets z_gzgets
@@ -82,7 +87,6 @@
82# define gzopen_w z_gzopen_w 87# define gzopen_w z_gzopen_w
83# endif 88# endif
84# define gzprintf z_gzprintf 89# define gzprintf z_gzprintf
85# define gzvprintf z_gzvprintf
86# define gzputc z_gzputc 90# define gzputc z_gzputc
87# define gzputs z_gzputs 91# define gzputs z_gzputs
88# define gzread z_gzread 92# define gzread z_gzread
@@ -93,6 +97,7 @@
93# define gztell z_gztell 97# define gztell z_gztell
94# define gztell64 z_gztell64 98# define gztell64 z_gztell64
95# define gzungetc z_gzungetc 99# define gzungetc z_gzungetc
100# define gzvprintf z_gzvprintf
96# define gzwrite z_gzwrite 101# define gzwrite z_gzwrite
97# endif 102# endif
98# define inflate z_inflate 103# define inflate z_inflate
@@ -100,8 +105,10 @@
100# define inflateBackEnd z_inflateBackEnd 105# define inflateBackEnd z_inflateBackEnd
101# define inflateBackInit z_inflateBackInit 106# define inflateBackInit z_inflateBackInit
102# define inflateBackInit_ z_inflateBackInit_ 107# define inflateBackInit_ z_inflateBackInit_
108# define inflateCodesUsed z_inflateCodesUsed
103# define inflateCopy z_inflateCopy 109# define inflateCopy z_inflateCopy
104# define inflateEnd z_inflateEnd 110# define inflateEnd z_inflateEnd
111# define inflateGetDictionary z_inflateGetDictionary
105# define inflateGetHeader z_inflateGetHeader 112# define inflateGetHeader z_inflateGetHeader
106# define inflateInit z_inflateInit 113# define inflateInit z_inflateInit
107# define inflateInit2 z_inflateInit2 114# define inflateInit2 z_inflateInit2
@@ -111,17 +118,18 @@
111# define inflatePrime z_inflatePrime 118# define inflatePrime z_inflatePrime
112# define inflateReset z_inflateReset 119# define inflateReset z_inflateReset
113# define inflateReset2 z_inflateReset2 120# define inflateReset2 z_inflateReset2
121# define inflateResetKeep z_inflateResetKeep
114# define inflateSetDictionary z_inflateSetDictionary 122# define inflateSetDictionary z_inflateSetDictionary
115# define inflateGetDictionary z_inflateGetDictionary
116# define inflateSync z_inflateSync 123# define inflateSync z_inflateSync
117# define inflateSyncPoint z_inflateSyncPoint 124# define inflateSyncPoint z_inflateSyncPoint
118# define inflateUndermine z_inflateUndermine 125# define inflateUndermine z_inflateUndermine
119# define inflateResetKeep z_inflateResetKeep 126# define inflateValidate z_inflateValidate
120# define inflate_copyright z_inflate_copyright 127# define inflate_copyright z_inflate_copyright
121# define inflate_fast z_inflate_fast 128# define inflate_fast z_inflate_fast
122# define inflate_table z_inflate_table 129# define inflate_table z_inflate_table
123# ifndef Z_SOLO 130# ifndef Z_SOLO
124# define uncompress z_uncompress 131# define uncompress z_uncompress
132# define uncompress2 z_uncompress2
125# endif 133# endif
126# define zError z_zError 134# define zError z_zError
127# ifndef Z_SOLO 135# ifndef Z_SOLO
diff --git a/zconf.h.in b/zconf.h.in
index ca1eb81..5e1d68a 100644
--- a/zconf.h.in
+++ b/zconf.h.in
@@ -1,5 +1,5 @@
1/* zconf.h -- configuration of the zlib compression library 1/* zconf.h -- configuration of the zlib compression library
2 * Copyright (C) 1995-2013 Jean-loup Gailly. 2 * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
@@ -29,6 +29,7 @@
29# define adler32 z_adler32 29# define adler32 z_adler32
30# define adler32_combine z_adler32_combine 30# define adler32_combine z_adler32_combine
31# define adler32_combine64 z_adler32_combine64 31# define adler32_combine64 z_adler32_combine64
32# define adler32_z z_adler32_z
32# ifndef Z_SOLO 33# ifndef Z_SOLO
33# define compress z_compress 34# define compress z_compress
34# define compress2 z_compress2 35# define compress2 z_compress2
@@ -37,10 +38,12 @@
37# define crc32 z_crc32 38# define crc32 z_crc32
38# define crc32_combine z_crc32_combine 39# define crc32_combine z_crc32_combine
39# define crc32_combine64 z_crc32_combine64 40# define crc32_combine64 z_crc32_combine64
41# define crc32_z z_crc32_z
40# define deflate z_deflate 42# define deflate z_deflate
41# define deflateBound z_deflateBound 43# define deflateBound z_deflateBound
42# define deflateCopy z_deflateCopy 44# define deflateCopy z_deflateCopy
43# define deflateEnd z_deflateEnd 45# define deflateEnd z_deflateEnd
46# define deflateGetDictionary z_deflateGetDictionary
44# define deflateInit z_deflateInit 47# define deflateInit z_deflateInit
45# define deflateInit2 z_deflateInit2 48# define deflateInit2 z_deflateInit2
46# define deflateInit2_ z_deflateInit2_ 49# define deflateInit2_ z_deflateInit2_
@@ -69,6 +72,8 @@
69# define gzeof z_gzeof 72# define gzeof z_gzeof
70# define gzerror z_gzerror 73# define gzerror z_gzerror
71# define gzflush z_gzflush 74# define gzflush z_gzflush
75# define gzfread z_gzfread
76# define gzfwrite z_gzfwrite
72# define gzgetc z_gzgetc 77# define gzgetc z_gzgetc
73# define gzgetc_ z_gzgetc_ 78# define gzgetc_ z_gzgetc_
74# define gzgets z_gzgets 79# define gzgets z_gzgets
@@ -80,7 +85,6 @@
80# define gzopen_w z_gzopen_w 85# define gzopen_w z_gzopen_w
81# endif 86# endif
82# define gzprintf z_gzprintf 87# define gzprintf z_gzprintf
83# define gzvprintf z_gzvprintf
84# define gzputc z_gzputc 88# define gzputc z_gzputc
85# define gzputs z_gzputs 89# define gzputs z_gzputs
86# define gzread z_gzread 90# define gzread z_gzread
@@ -91,6 +95,7 @@
91# define gztell z_gztell 95# define gztell z_gztell
92# define gztell64 z_gztell64 96# define gztell64 z_gztell64
93# define gzungetc z_gzungetc 97# define gzungetc z_gzungetc
98# define gzvprintf z_gzvprintf
94# define gzwrite z_gzwrite 99# define gzwrite z_gzwrite
95# endif 100# endif
96# define inflate z_inflate 101# define inflate z_inflate
@@ -98,8 +103,10 @@
98# define inflateBackEnd z_inflateBackEnd 103# define inflateBackEnd z_inflateBackEnd
99# define inflateBackInit z_inflateBackInit 104# define inflateBackInit z_inflateBackInit
100# define inflateBackInit_ z_inflateBackInit_ 105# define inflateBackInit_ z_inflateBackInit_
106# define inflateCodesUsed z_inflateCodesUsed
101# define inflateCopy z_inflateCopy 107# define inflateCopy z_inflateCopy
102# define inflateEnd z_inflateEnd 108# define inflateEnd z_inflateEnd
109# define inflateGetDictionary z_inflateGetDictionary
103# define inflateGetHeader z_inflateGetHeader 110# define inflateGetHeader z_inflateGetHeader
104# define inflateInit z_inflateInit 111# define inflateInit z_inflateInit
105# define inflateInit2 z_inflateInit2 112# define inflateInit2 z_inflateInit2
@@ -109,17 +116,18 @@
109# define inflatePrime z_inflatePrime 116# define inflatePrime z_inflatePrime
110# define inflateReset z_inflateReset 117# define inflateReset z_inflateReset
111# define inflateReset2 z_inflateReset2 118# define inflateReset2 z_inflateReset2
119# define inflateResetKeep z_inflateResetKeep
112# define inflateSetDictionary z_inflateSetDictionary 120# define inflateSetDictionary z_inflateSetDictionary
113# define inflateGetDictionary z_inflateGetDictionary
114# define inflateSync z_inflateSync 121# define inflateSync z_inflateSync
115# define inflateSyncPoint z_inflateSyncPoint 122# define inflateSyncPoint z_inflateSyncPoint
116# define inflateUndermine z_inflateUndermine 123# define inflateUndermine z_inflateUndermine
117# define inflateResetKeep z_inflateResetKeep 124# define inflateValidate z_inflateValidate
118# define inflate_copyright z_inflate_copyright 125# define inflate_copyright z_inflate_copyright
119# define inflate_fast z_inflate_fast 126# define inflate_fast z_inflate_fast
120# define inflate_table z_inflate_table 127# define inflate_table z_inflate_table
121# ifndef Z_SOLO 128# ifndef Z_SOLO
122# define uncompress z_uncompress 129# define uncompress z_uncompress
130# define uncompress2 z_uncompress2
123# endif 131# endif
124# define zError z_zError 132# define zError z_zError
125# ifndef Z_SOLO 133# ifndef Z_SOLO
diff --git a/zlib.3 b/zlib.3
index 1cc3805..cbac458 100644
--- a/zlib.3
+++ b/zlib.3
@@ -1,4 +1,4 @@
1.TH ZLIB 3 "7 July 2015" 1.TH ZLIB 3 "31 Dec 2016"
2.SH NAME 2.SH NAME
3zlib \- compression/decompression library 3zlib \- compression/decompression library
4.SH SYNOPSIS 4.SH SYNOPSIS
@@ -48,32 +48,10 @@ Changes to this version are documented in the file
48that accompanies the source. 48that accompanies the source.
49.LP 49.LP
50.I zlib 50.I zlib
51is available in Java using the java.util.zip package: 51is built in to many languages and operating systems, including but not limited to
52.IP 52Java, Python, .NET, PHP, Perl, Ruby, Swift, and Go.
53http://java.sun.com/developer/technicalArticles/Programming/compression/
54.LP
55A Perl interface to
56.IR zlib ,
57written by Paul Marquess (pmqs@cpan.org),
58is available at CPAN (Comprehensive Perl Archive Network) sites,
59including:
60.IP
61http://search.cpan.org/~pmqs/IO-Compress-Zlib/
62.LP
63A Python interface to
64.IR zlib ,
65written by A.M. Kuchling (amk@magnet.com),
66is available in Python 1.5 and later versions:
67.IP
68http://docs.python.org/library/zlib.html
69.LP 53.LP
70.I zlib 54An experimental package to read and write files in the .zip format,
71is built into
72.IR tcl:
73.IP
74http://wiki.tcl.tk/4610
75.LP
76An experimental package to read and write files in .zip format,
77written on top of 55written on top of
78.I zlib 56.I zlib
79by Gilles Vollant (info@winimage.com), 57by Gilles Vollant (info@winimage.com),
@@ -92,7 +70,9 @@ web site can be found at:
92.IP 70.IP
93http://zlib.net/ 71http://zlib.net/
94.LP 72.LP
95The data format used by the zlib library is described by RFC 73The data format used by the
74.I zlib
75library is described by RFC
96(Request for Comments) 1950 to 1952 in the files: 76(Request for Comments) 1950 to 1952 in the files:
97.IP 77.IP
98http://tools.ietf.org/html/rfc1950 (for the zlib header and trailer format) 78http://tools.ietf.org/html/rfc1950 (for the zlib header and trailer format)
@@ -125,9 +105,9 @@ before asking for help.
125Send questions and/or comments to zlib@gzip.org, 105Send questions and/or comments to zlib@gzip.org,
126or (for the Windows DLL version) to Gilles Vollant (info@winimage.com). 106or (for the Windows DLL version) to Gilles Vollant (info@winimage.com).
127.SH AUTHORS AND LICENSE 107.SH AUTHORS AND LICENSE
128Version 1.2.8.1 108Version 1.2.9
129.LP 109.LP
130Copyright (C) 1995-2015 Jean-loup Gailly and Mark Adler 110Copyright (C) 1995-2016 Jean-loup Gailly and Mark Adler
131.LP 111.LP
132This software is provided 'as-is', without any express or implied 112This software is provided 'as-is', without any express or implied
133warranty. In no event will the authors be held liable for any damages 113warranty. In no event will the authors be held liable for any damages
diff --git a/zlib.3.pdf b/zlib.3.pdf
index 7073f1a..5c71eed 100644
--- a/zlib.3.pdf
+++ b/zlib.3.pdf
Binary files differ
diff --git a/zlib.h b/zlib.h
index 0f9816d..69fbb97 100644
--- a/zlib.h
+++ b/zlib.h
@@ -1,7 +1,7 @@
1/* zlib.h -- interface of the 'zlib' general purpose compression library 1/* zlib.h -- interface of the 'zlib' general purpose compression library
2 version 1.2.8.1, May xxth, 2013 2 version 1.2.9, December 31st, 2016
3 3
4 Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler 4 Copyright (C) 1995-2016 Jean-loup Gailly and Mark Adler
5 5
6 This software is provided 'as-is', without any express or implied 6 This software is provided 'as-is', without any express or implied
7 warranty. In no event will the authors be held liable for any damages 7 warranty. In no event will the authors be held liable for any damages
@@ -37,12 +37,12 @@
37extern "C" { 37extern "C" {
38#endif 38#endif
39 39
40#define ZLIB_VERSION "1.2.8.1-motley" 40#define ZLIB_VERSION "1.2.9"
41#define ZLIB_VERNUM 0x1281 41#define ZLIB_VERNUM 0x1290
42#define ZLIB_VER_MAJOR 1 42#define ZLIB_VER_MAJOR 1
43#define ZLIB_VER_MINOR 2 43#define ZLIB_VER_MINOR 2
44#define ZLIB_VER_REVISION 8 44#define ZLIB_VER_REVISION 9
45#define ZLIB_VER_SUBREVISION 1 45#define ZLIB_VER_SUBREVISION 0
46 46
47/* 47/*
48 The 'zlib' compression library provides in-memory compression and 48 The 'zlib' compression library provides in-memory compression and
diff --git a/zlib.map b/zlib.map
index 55c6647..40fa9db 100644
--- a/zlib.map
+++ b/zlib.map
@@ -1,83 +1,94 @@
1ZLIB_1.2.0 { 1ZLIB_1.2.0 {
2 global: 2 global:
3 compressBound; 3 compressBound;
4 deflateBound; 4 deflateBound;
5 inflateBack; 5 inflateBack;
6 inflateBackEnd; 6 inflateBackEnd;
7 inflateBackInit_; 7 inflateBackInit_;
8 inflateCopy; 8 inflateCopy;
9 local: 9 local:
10 deflate_copyright; 10 deflate_copyright;
11 inflate_copyright; 11 inflate_copyright;
12 inflate_fast; 12 inflate_fast;
13 inflate_table; 13 inflate_table;
14 zcalloc; 14 zcalloc;
15 zcfree; 15 zcfree;
16 z_errmsg; 16 z_errmsg;
17 gz_error; 17 gz_error;
18 gz_intmax; 18 gz_intmax;
19 _*; 19 _*;
20}; 20};
21 21
22ZLIB_1.2.0.2 { 22ZLIB_1.2.0.2 {
23 gzclearerr; 23 gzclearerr;
24 gzungetc; 24 gzungetc;
25 zlibCompileFlags; 25 zlibCompileFlags;
26} ZLIB_1.2.0; 26} ZLIB_1.2.0;
27 27
28ZLIB_1.2.0.8 { 28ZLIB_1.2.0.8 {
29 deflatePrime; 29 deflatePrime;
30} ZLIB_1.2.0.2; 30} ZLIB_1.2.0.2;
31 31
32ZLIB_1.2.2 { 32ZLIB_1.2.2 {
33 adler32_combine; 33 adler32_combine;
34 crc32_combine; 34 crc32_combine;
35 deflateSetHeader; 35 deflateSetHeader;
36 inflateGetHeader; 36 inflateGetHeader;
37} ZLIB_1.2.0.8; 37} ZLIB_1.2.0.8;
38 38
39ZLIB_1.2.2.3 { 39ZLIB_1.2.2.3 {
40 deflateTune; 40 deflateTune;
41 gzdirect; 41 gzdirect;
42} ZLIB_1.2.2; 42} ZLIB_1.2.2;
43 43
44ZLIB_1.2.2.4 { 44ZLIB_1.2.2.4 {
45 inflatePrime; 45 inflatePrime;
46} ZLIB_1.2.2.3; 46} ZLIB_1.2.2.3;
47 47
48ZLIB_1.2.3.3 { 48ZLIB_1.2.3.3 {
49 adler32_combine64; 49 adler32_combine64;
50 crc32_combine64; 50 crc32_combine64;
51 gzopen64; 51 gzopen64;
52 gzseek64; 52 gzseek64;
53 gztell64; 53 gztell64;
54 inflateUndermine; 54 inflateUndermine;
55} ZLIB_1.2.2.4; 55} ZLIB_1.2.2.4;
56 56
57ZLIB_1.2.3.4 { 57ZLIB_1.2.3.4 {
58 inflateReset2; 58 inflateReset2;
59 inflateMark; 59 inflateMark;
60} ZLIB_1.2.3.3; 60} ZLIB_1.2.3.3;
61 61
62ZLIB_1.2.3.5 { 62ZLIB_1.2.3.5 {
63 gzbuffer; 63 gzbuffer;
64 gzoffset; 64 gzoffset;
65 gzoffset64; 65 gzoffset64;
66 gzclose_r; 66 gzclose_r;
67 gzclose_w; 67 gzclose_w;
68} ZLIB_1.2.3.4; 68} ZLIB_1.2.3.4;
69 69
70ZLIB_1.2.5.1 { 70ZLIB_1.2.5.1 {
71 deflatePending; 71 deflatePending;
72} ZLIB_1.2.3.5; 72} ZLIB_1.2.3.5;
73 73
74ZLIB_1.2.5.2 { 74ZLIB_1.2.5.2 {
75 deflateResetKeep; 75 deflateResetKeep;
76 gzgetc_; 76 gzgetc_;
77 inflateResetKeep; 77 inflateResetKeep;
78} ZLIB_1.2.5.1; 78} ZLIB_1.2.5.1;
79 79
80ZLIB_1.2.7.1 { 80ZLIB_1.2.7.1 {
81 inflateGetDictionary; 81 inflateGetDictionary;
82 gzvprintf; 82 gzvprintf;
83} ZLIB_1.2.5.2; 83} ZLIB_1.2.5.2;
84
85ZLIB_1.2.9 {
86 inflateCodesUsed;
87 inflateValidate;
88 uncompress2;
89 gzfread;
90 gzfwrite;
91 deflateGetDictionary;
92 adler32_z;
93 crc32_z;
94} ZLIB_1.2.7.1;
diff --git a/zutil.c b/zutil.c
index 74e48aa..3b4d904 100644
--- a/zutil.c
+++ b/zutil.c
@@ -1,5 +1,5 @@
1/* zutil.c -- target dependent utility functions for the compression library 1/* zutil.c -- target dependent utility functions for the compression library
2 * Copyright (C) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly. 2 * Copyright (C) 1995-2005, 2010, 2011, 2012, 2016 Jean-loup Gailly
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
diff --git a/zutil.h b/zutil.h
index 96cc90f..b079ea6 100644
--- a/zutil.h
+++ b/zutil.h
@@ -1,5 +1,5 @@
1/* zutil.h -- internal interface and configuration of the compression library 1/* zutil.h -- internal interface and configuration of the compression library
2 * Copyright (C) 1995-2013 Jean-loup Gailly. 2 * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-15 21:25:01 +0000