summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authormal@chromium.org <mal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-16 03:46:58 +0000
committermal@chromium.org <mal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-16 03:46:58 +0000
commit53b8e6cd46b054ce0ce011ce66a89690376fe566 (patch)
tree9b9380e79b70974f1af1eec29f8853066d7efa2e /third_party
parent9b54971cfb69b55293b096b6e7b2bfda2fb0c57e (diff)
downloadchromium_src-53b8e6cd46b054ce0ce011ce66a89690376fe566.zip
chromium_src-53b8e6cd46b054ce0ce011ce66a89690376fe566.tar.gz
chromium_src-53b8e6cd46b054ce0ce011ce66a89690376fe566.tar.bz2
Add licensing info for qcms.
The two license attributions are taken from Firefox's about:license page and correspond to the license headers in the source files. This change makes licenses.py happy. R=abarth,evanm TEST= about:credits includes a qcms section crediting Marti Maria and SunSoft. Review URL: http://codereview.chromium.org/6262004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71568 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/qcms/LICENSE55
-rw-r--r--third_party/qcms/README.chromium3
2 files changed, 56 insertions, 2 deletions
diff --git a/third_party/qcms/LICENSE b/third_party/qcms/LICENSE
new file mode 100644
index 0000000..51de07c
--- /dev/null
+++ b/third_party/qcms/LICENSE
@@ -0,0 +1,55 @@
+This license applies to certain files in the directory third_party/qcms/.
+
+Copyright (C) 2009 Mozilla Corporation
+Copyright (C) 1998-2007 Marti Maria
+
+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.
+
+
+
+This license applies to the ICC_H block in third_party/qcms/qcms.h.
+
+Copyright (c) 1994-1996 SunSoft, Inc.
+
+ Rights Reserved
+
+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 restrict-
+ion, 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 NON-
+INFRINGEMENT. IN NO EVENT SHALL SUNSOFT, INC. OR ITS PARENT
+COMPANY 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.
+
+Except as contained in this notice, the name of SunSoft, Inc.
+shall not be used in advertising or otherwise to promote the
+sale, use or other dealings in this Software without written
+authorization from SunSoft Inc.
diff --git a/third_party/qcms/README.chromium b/third_party/qcms/README.chromium
index 272e1e3..f843a2a 100644
--- a/third_party/qcms/README.chromium
+++ b/third_party/qcms/README.chromium
@@ -1,6 +1,5 @@
-Name: qcms
+Name: qcms library
URL: http://mxr.mozilla.org/mozilla-central/source/gfx/qcms/
-License File: Varies by file, see comment blocks at the top of each file.
Contain support for apply an ICC color profile to an image. The code is
originally based on tinycms, by re-written by Mozilla for better security and