diff --git a/plug-ins/file-jpeg/COPYING.ijg b/plug-ins/file-jpeg/COPYING.ijg new file mode 100644 index 0000000000..f17653db59 --- /dev/null +++ b/plug-ins/file-jpeg/COPYING.ijg @@ -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. + diff --git a/plug-ins/file-jpeg/Makefile.am b/plug-ins/file-jpeg/Makefile.am index b4434750b7..20a307ee34 100644 --- a/plug-ins/file-jpeg/Makefile.am +++ b/plug-ins/file-jpeg/Makefile.am @@ -75,3 +75,6 @@ jpegqual_LDADD = \ $(GTK_LIBS) \ $(RT_LIBS) \ $(INTLLIBS) + +EXTRA_DIST = \ + COPYING.ijg diff --git a/plug-ins/file-jpeg/jpeg-icc.c b/plug-ins/file-jpeg/jpeg-icc.c index 88f75d4b8f..64cfd044e1 100644 --- a/plug-ins/file-jpeg/jpeg-icc.c +++ b/plug-ins/file-jpeg/jpeg-icc.c @@ -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" diff --git a/plug-ins/file-jpeg/jpeg-icc.h b/plug-ins/file-jpeg/jpeg-icc.h index b5306a83e5..3b70f75711 100644 --- a/plug-ins/file-jpeg/jpeg-icc.h +++ b/plug-ins/file-jpeg/jpeg-icc.h @@ -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__