From 050157dc1966a8b9bd14f32faeb5bd06b9fa2e09 Mon Sep 17 00:00:00 2001 From: Lokesh Dhakar Date: Mon, 29 Jun 2015 17:53:07 -0700 Subject: [PATCH] Switch to MIT License. Move demo page items out of repo. --- LICENSE | 21 +++++++++++++++++++++ README.md | 36 ++++++------------------------------ 2 files changed, 27 insertions(+), 30 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..0b34e12 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2015 Lokesh Dhakar + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +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. diff --git a/README.md b/README.md index 78bd675..f1c81ff 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ A script for grabbing the color palette from an image. Uses Javascript and the c [See a Demo](http://lokeshdhakar.com/projects/color-thief) | [Read more on my blog](http://lokeshdhakar.com/color-thief) + ##How to use ###Get the dominant color from an image @@ -31,44 +32,19 @@ getPalette(sourceImage[, colorCount, quality]) returns [ [num, num, num], [num, num, num], ... ] ``` -##Credits and license - -###Author -by Lokesh Dhakar -[lokeshdhakar.com](http://www.lokeshdhakar.com) -[twitter.com/lokesh](http://twitter.com/lokesh) - -###Thanks -* Nick Rabinowitz - For creating quantize.js. -* John Schulz - For clean up and optimization. @JFSIII -* Nathan Spady - For adding drag and drop support to the demo page. - -###License -Licensed under the [Creative Commons Attribution 2.5 License](http://creativecommons.org/licenses/by/2.5/) - -* Free for use in both personal and commercial projects. -* Attribution requires leaving author name, author homepage link, and the license info intact. - ## Changelog ### v2.0.1 - UNRELEASED -- [Fix] @nobodypb - MMCQ lib issues [#16](https://github.com/lokesh/color-thief/pull/16) -- [Fix] @nteike - [#33](https://github.com/lokesh/color-thief/pull/33) -- Drop version number from bower.json -- Fix incorrect bower.json main property path +- [Fix] MMCQ lib issues [#16](https://github.com/lokesh/color-thief/pull/16) by @nobodypb +- [Fix] Incorrect bower.json main property path. [#37](https://github.com/lokesh/color-thief/pull/37) by @chellem, @joscha, @dkushner +- [Fix] Quality less than 1 causes infinite loop [#33](https://github.com/lokesh/color-thief/pull/33) by @nteike +- [Fix] MMCQ.quantize(...) can return false or undefined thus breaking the application (#55)[https://github.com/lokesh/color-thief/pull/55] by @mhahmadi +- [Remove] Drop version number from bower.json [#70](https://github.com/lokesh/color-thief/pull/70) by @kkirsche ### v2.0.0 - 2013-06-23 - Embed quantize into color thief file - Strip out jQuery requirement - Credit those who helped with edits - Nathan Spady for drag and drop support. - -**Demo page and example changes** - -- Don't show yellow circle buttons till images have loaded -- Add FB and Twitter buttons -- Add drag n drop support -- Make design responsive -- Touch support on demo page