From f06863b844bdef50016d80b3c94701d973d83f2b Mon Sep 17 00:00:00 2001 From: Vitaly Puzrin Date: Sat, 25 Mar 2017 22:14:25 +0300 Subject: [PATCH] Added zlib info to license & readme, #93 --- LICENSE | 37 ++++++++++++++++++++++++++++++++++++- README.md | 6 +++++- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index d082ae32..dae2b2e9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ (The MIT License) -Copyright (C) 2014-2016 by Vitaly Puzrin +Copyright (C) 2014-2017 by Vitaly Puzrin Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -19,3 +19,38 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + + +zlib +============================================================================= + +Acknowledgments: + + The deflate format used by zlib was defined by Phil Katz. The deflate and + zlib specifications were written by L. Peter Deutsch. Thanks to all the + people who reported problems and suggested various improvements in zlib; they + are too numerous to cite here. + +Copyright notice: + + (C) 1995-2017 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 + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Jean-loup Gailly Mark Adler + jloup@gzip.org madler@alumni.caltech.edu diff --git a/README.md b/README.md index ef121e78..a425a837 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ __Why pako is cool:__ - Almost as fast in modern JS engines as C implementation (see benchmarks). - Works in browsers, you can browserify any separate component. - Chunking support for big blobs. -- Results are binary equal to well known [zlib](http://www.zlib.net/) (now v1.2.8 ported). +- Results are binary equal to well known [zlib](http://www.zlib.net/) (now contains ported zlib v1.2.8). This project was done to understand how fast JS can be and is it necessary to develop native C modules for CPU-intensive tasks. Enjoy the result! @@ -169,6 +169,10 @@ Personal thanks to: - David Duponchel ([@dduponchel](https://github.com/dduponchel)) for help with testing. +Original implementation (in C): + +- [zlib](http://zlib.net/) by Jean-loup Gailly and Mark Adler. + License -------