Index: third_party/zlib/README.chromium |
diff --git a/third_party/zlib/README.chromium b/third_party/zlib/README.chromium |
index ea58bd7d9abab3fd220ad8b6acfb046ab0b3dd0f..fe6bc105db4cbe1182b2df77cab9f644f53ae5ad 100644 |
--- a/third_party/zlib/README.chromium |
+++ b/third_party/zlib/README.chromium |
@@ -1,43 +1,28 @@ |
Name: zlib |
+Short Name: zlib |
URL: http://zlib.net/ |
-Version: 1.2.8 |
+Version: 1.2.11 |
Security Critical: yes |
License: Custom license |
+License File: LICENSE |
License Android Compatible: yes |
Description: |
-General purpose compression library |
+"A massively spiffy yet delicately unobtrusive compression library." |
-Local Modifications: |
-A few minor changes, all marked with "Google": |
-- Added #ifdefs to avoid compile warnings when NO_GZCOMPRESS is defined. |
-- Removed use of strerror for WinCE in gzio.c. |
-- Added 'int z_errno' global for WinCE, to which 'errno' is defined in zutil.h. |
-- Added 'mozzconf.h' to mangle the function names. |
-- Added logic in zlib.h to undef our earlier mangles when defaulting to 64 bit offset versions of API. |
-- Added casts to suppress VC++ warnings |
-The 'google.patch' file represents our changes from the original zlib-1.2.5. |
- |
-Integrated Intel SIMD optimisations from: https://github.com/jtkukunas/zlib/ |
-and modified to accomodate the older version and existing changes in tree. |
- |
-This introduces new files: simd_stub.c, crc_folding.c, fill_window_sse.c and |
-x86.[ch]. All but the latter are built into a static library to allow the |
-compiler to use the desired instructions only when valid. The latter version is |
-only built on x86 (32-bit and 64-bit) systems with it's functionality stubbed |
-on the others. |
+zlib is a free, general-purpose, legally unencumbered lossless data-compression |
+library. zlib implements the "deflate" compression algorithm described by RFC |
+1951, which combines the LZ77 (Lempel-Ziv) algorithm with Huffman coding. zlib |
+also implements the zlib (RFC 1950) and gzip (RFC 1952) wrapper formats. |
-Other changes to accomodate: |
-- fill_window() implementation calls into _sse() variant when supported and the |
- original implementation renamed to _c() |
-- read_buf was moved from local to ZLIB_INTERNAL for fill_window_sse.c to use |
-- INSERT_STRING macro was made a function, insert_string() and an implementation using CRC instruction added |
-- some crc funcionality moved into crc32.c |
- |
-Update to zlib-1.2.8, generate a third patch which includes the jtkukunas optimisations. We may merge some more from jtkukunas branch later. |
-Currently we upgrade to madler's version 1.2.8,merged SIMD optimisation and |
-some other changes above. |
-The step as follows: |
-1.download a clean madler zlib from github. |
-2.apply google.patch, simd.patch sequencely. |
-3.update these patches. |
+Local Modifications: |
+ - Only source code from the zlib distribution used to build the zlib and |
+ minizip libraries are present. Many other files have been omitted. Only *.c |
+ and *.h files from the upstream root directory and contrib/minizip were |
+ imported. |
+ - The contents of the google directory are original Chromium-specific |
+ additions. |
+ - google.patch contains changes from the upstream version, mostly related to |
+ the build. |
+ - Intel SIMD optimisations from https://github.com/jtkukunas/zlib/ have been |
+ integrated. These changes are reflected in simd.patch. |