Обновление zlib 1.2.12

gynkms · Apr 1, 2022 · f618ce3 · f618ce3
1 parent 860e780
commit f618ce3
Show file tree

Hide file tree

Showing 25 changed files with 10,903 additions and 1,038 deletions.
diff --git a/docs/Changelog.Rus.txt b/docs/Changelog.Rus.txt
@@ -45,6 +45,7 @@ VideoRenderers
 	MediaInfo git-v21.09-162-gdc7c37c2b;
 	openjpeg git-v2.4.0-89-g6a29f5a9;
 	rapidjson git-v1.1.0-685-ge4bde977;
+	zlib 1.2.12;
 
 1.6.1
 =============================

diff --git a/docs/Changelog.txt b/docs/Changelog.txt
@@ -45,6 +45,7 @@ Updated libraries:
 	MediaInfo git-v21.09-162-gdc7c37c2b;
 	openjpeg git-v2.4.0-89-g6a29f5a9;
 	rapidjson git-v1.1.0-685-ge4bde977;
+	zlib 1.2.12;
 
 
 1.6.1

diff --git a/src/ExtLib/zlib/ChangeLog b/src/ExtLib/zlib/ChangeLog
diff --git a/src/ExtLib/zlib/README b/src/ExtLib/zlib/README
@@ -1,6 +1,6 @@
 ZLIB DATA COMPRESSION LIBRARY
 
-zlib 1.2.11 is a general purpose data compression library.  All the code is
+zlib 1.2.12 is a general purpose data compression library.  All the code is
 thread safe.  The data format used by the zlib library is described by RFCs
 (Request for Comments) 1950 to 1952 in the files
 http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
@@ -31,7 +31,7 @@ Mark Nelson <[email protected]> wrote an article about zlib for the Jan.  1997
 issue of Dr.  Dobb's Journal; a copy of the article is available at
 http://marknelson.us/1997/01/01/zlib-engine/ .
 
-The changes made in version 1.2.11 are documented in the file ChangeLog.
+The changes made in version 1.2.12 are documented in the file ChangeLog.
 
 Unsupported third party contributions are provided in directory contrib/ .
 
@@ -84,7 +84,7 @@ Acknowledgments:
 
 Copyright notice:
 
- (C) 1995-2017 Jean-loup Gailly and Mark Adler
+ (C) 1995-2022 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -108,7 +108,10 @@ Copyright notice:
 If you use the zlib library in a product, we would appreciate *not* receiving
 lengthy legal documents to sign.  The sources are provided for free but without
 warranty of any kind.  The library has been entirely written by Jean-loup
-Gailly and Mark Adler; it does not include third-party code.
+Gailly and Mark Adler; it does not include third-party code.  We make all
+contributions to and distributions of this project solely in our personal
+capacity, and are not conveying any rights to any intellectual property of
+any third parties.
 
 If you redistribute modified sources, we would appreciate that you include in
 the file ChangeLog history information documenting your changes.  Please read

diff --git a/src/ExtLib/zlib/adler32.c b/src/ExtLib/zlib/adler32.c
@@ -3,6 +3,8 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
+/* @(#) $Id$ */
+
 #include "zutil.h"
 
 local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));

diff --git a/src/ExtLib/zlib/compress.c b/src/ExtLib/zlib/compress.c
@@ -3,6 +3,8 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
+/* @(#) $Id$ */
+
 #define ZLIB_INTERNAL
 #include "zlib.h"