dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

file-jpeg: Fix the copyright and license notices of jpeg-icc.* 

This code was originally written by Thomas G. Lane and Todd Newman,
and proposed for inclusion in the Independent JPEG Group's software.
However, that fell through when Tom left the IJG. It was not written by
Marti Maria - Little cms only had a copy of that code.

This code has recently been merged into libjpeg-turbo, so it seems
reasonable to now consider libjpeg-turbo as the canonical source of
these files. However, since the GIMP carries the original version of
the code proposed for IJG's JPEG, and doesn't contain any of the more
recent and minor tweaks made during its inclusion in libjpeg-turbo,
only the original copyright holders (ie., Thomas G. Lane and Todd
Newman) are mentioned.

The relevant license text was lifted from the Independent JPEG Group's
software, similar to the way it's done in Chromium and other users of
this code.

https://gitlab.gnome.org/GNOME/gimp/issues/2119
This commit is contained in:
Debarshi Ray 2018-08-29 17:36:16 +02:00
parent be668697cb
commit 5dcee9ad37
4 changed files with 64 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
plug-ins/file-jpeg/COPYING.ijg Normal file
View File

@ -0,0 +1,49 @@
LICENSE extracted from IJG's jpeg distribution:
-----------------------------------------------
In plain English:
1. We don't promise that this software works. (But if you find any bugs,
please let us know!)
2. You can use this software for whatever you want. You don't have to pay us.
3. You may not pretend that you wrote this software. If you use it in a
program, you must acknowledge somewhere in your documentation that
you've used the IJG code.
In legalese:
The authors make NO WARRANTY or representation, either express or implied,
with respect to this software, its quality, accuracy, merchantability, or
fitness for a particular purpose. This software is provided "AS IS", and you,
its user, assume the entire risk as to its quality and accuracy.
This software is copyright 1997-1998, Thomas G. Lane, Todd Newman.
All Rights Reserved except as specified below.
Permission is hereby granted to use, copy, modify, and distribute this
software (or portions thereof) for any purpose, without fee, subject to these
conditions:
(1) If any part of the source code for this software is distributed, then this
README file must be included, with this copyright and no-warranty notice
unaltered; and any additions, deletions, or changes to the original files
must be clearly indicated in accompanying documentation.
(2) If only executable code is distributed, then the accompanying
documentation must state that "this software is based in part on the work of
the Independent JPEG Group".
(3) Permission for use of this software is granted only if the user accepts
full responsibility for any undesirable consequences; the authors accept
NO LIABILITY for damages of any kind.
These conditions apply to any software derived from or based on the IJG code,
not just to the unmodified library. If you use our work, you ought to
acknowledge us.
Permission is NOT granted for the use of any IJG author's name or company name
in advertising or publicity relating to this software or products derived from
it. This software may be referred to only as "the Independent JPEG Group's
software".
We specifically permit and encourage the use of this software as the basis of
commercial products, provided that all warranty or liability claims are
assumed by the product vendor.

3
plug-ins/file-jpeg/Makefile.am
View File

@ -75,3 +75,6 @@ jpegqual_LDADD = \
$(GTK_LIBS) \
$(RT_LIBS) \
$(INTLLIBS)
EXTRA_DIST = \
COPYING.ijg

31
plug-ins/file-jpeg/jpeg-icc.c
View File

@ -12,33 +12,14 @@
* IJG release 6b; it will not compile or work with older IJG versions.
*/
/* This code was originally copied from the jpegicc tool as found in
* the lcms source code. This code comes with the following copyright
* notice:
/* This code was originally proposed for the Independent JPEG Group's
* software, but that fell through, and only recently got merged into
* libjpeg-turbo. This code comes with the following copyright notice:
*
* Little cms
* Copyright (C) 1998-2004 Marti Maria
* Copyright (C) 1997-1998, Thomas G. Lane, Todd Newman.
*
* 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.
* For conditions of distribution and use, see the accompanying
* COPYING.ijg file.
*/
#include "config.h"

21
plug-ins/file-jpeg/jpeg-icc.h
View File

@ -1,22 +1,13 @@
/* jpeg-icc.h
*
* This code was originally copied from the jpegicc tool as found in
* the lcms source code. This code comes with the following copyright
* notice:
* This code was originally proposed for the Independent JPEG Group's
* software, but that fell through, and only recently got merged into
* libjpeg-turbo. This code comes with the following copyright notice:
*
* Little cms
* Copyright (C) 1998-2004 Marti Maria
* Copyright (C) 1997-1998, Thomas G. Lane, Todd Newman.
*
* 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.
* For conditions of distribution and use, see the accompanying
* COPYING.ijg file.
*/
#ifndef __JPEG_ICC_H__