From cf763c0cd8116ac225bd2d36a71da33a3c7fcc46 Mon Sep 17 00:00:00 2001 From: DRC Date: Tue, 1 Jan 2013 09:51:37 +0000 Subject: [PATCH] Further changes to the copyright/attribution notices to make it clear that our modified files are not part of the IJG's software. git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.2.x@876 632fc199-4ca6-4c93-a231-07263d6284db --- change.log | 3 +++ cjpeg.1 | 5 ++++- djpeg.1 | 5 ++++- jdcolor.c | 2 +- rdbmp.c | 3 ++- transupp.c | 2 +- usage.txt | 2 +- 7 files changed, 16 insertions(+), 6 deletions(-) diff --git a/change.log b/change.log index 704d8b23..c7885a78 100644 --- a/change.log +++ b/change.log @@ -1,3 +1,6 @@ +NOTE: This file was modified by The libjpeg-turbo Project to include only +information relevant to libjpeg-turbo. + CHANGE LOG for Independent JPEG Group's JPEG software diff --git a/cjpeg.1 b/cjpeg.1 index 6fb72993..f59d290b 100644 --- a/cjpeg.1 +++ b/cjpeg.1 @@ -1,4 +1,4 @@ -.TH CJPEG 1 "31 January 2012" +.TH CJPEG 1 "1 January 2013" .SH NAME cjpeg \- compress an image file to a JPEG file .SH SYNOPSIS @@ -308,6 +308,9 @@ Wallace, Gregory K. "The JPEG Still Picture Compression Standard", Communications of the ACM, April 1991 (vol. 34, no. 4), pp. 30-44. .SH AUTHOR Independent JPEG Group +.PP +This file was modified by The libjpeg-turbo Project to include only information +relevant to libjpeg-turbo and to wordsmith certain sections. .SH BUGS Support for GIF input files was removed in cjpeg v6b due to concerns over the Unisys LZW patent. Although this patent expired in 2006, cjpeg still diff --git a/djpeg.1 b/djpeg.1 index e5e46f2b..d9804e38 100644 --- a/djpeg.1 +++ b/djpeg.1 @@ -1,4 +1,4 @@ -.TH DJPEG 1 "11 October 2010" +.TH DJPEG 1 "1 January 2013" .SH NAME djpeg \- decompress a JPEG file to an image file .SH SYNOPSIS @@ -242,6 +242,9 @@ Wallace, Gregory K. "The JPEG Still Picture Compression Standard", Communications of the ACM, April 1991 (vol. 34, no. 4), pp. 30-44. .SH AUTHOR Independent JPEG Group +.PP +This file was modified by The libjpeg-turbo Project to include only information +relevant to libjpeg-turbo and to wordsmith certain sections. .SH BUGS To avoid the Unisys LZW patent, .B djpeg diff --git a/jdcolor.c b/jdcolor.c index 402941c8..7a8ed221 100644 --- a/jdcolor.c +++ b/jdcolor.c @@ -3,8 +3,8 @@ * * This file was part of the Independent JPEG Group's software: * Copyright (C) 1991-1997, Thomas G. Lane. - * Copyright 2009 Pierre Ossman for Cendio AB * Modifications: + * Copyright 2009 Pierre Ossman for Cendio AB * Copyright (C) 2009, 2011-2012, D. R. Commander. * For conditions of distribution and use, see the accompanying README file. * diff --git a/rdbmp.c b/rdbmp.c index be32e43a..c0530748 100644 --- a/rdbmp.c +++ b/rdbmp.c @@ -1,10 +1,11 @@ /* * rdbmp.c * + * This file was part of the Independent JPEG Group's software: * Copyright (C) 1994-1996, Thomas G. Lane. * Modified 2009-2010 by Guido Vollbeding. + * Modifications: * Modified 2011 by Siarhei Siamashka. - * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * * This file contains routines to read input images in Microsoft "BMP" diff --git a/transupp.c b/transupp.c index 021980b5..ef137217 100644 --- a/transupp.c +++ b/transupp.c @@ -1,7 +1,7 @@ /* * transupp.c * - * This file was part of the Independent JPEG Group's software. + * This file was part of the Independent JPEG Group's software: * Copyright (C) 1997-2009, Thomas G. Lane, Guido Vollbeding. * Modifications: * Copyright (C) 2010, D. R. Commander. diff --git a/usage.txt b/usage.txt index ef2164af..157972b4 100644 --- a/usage.txt +++ b/usage.txt @@ -1,5 +1,5 @@ NOTE: This file was modified by The libjpeg-turbo Project to include only -information relevant to libjpeg-turbo and to clarify certain passages. +information relevant to libjpeg-turbo and to wordsmith certain sections. USAGE instructions for the Independent JPEG Group's JPEG software =================================================================