Further changes to the copyright/attribution notices to make it clear that our modifi...

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.2.x@876 632fc199-4ca6-4c93-a231-07263d6284db

diff --git a/change.log b/change.log
index 704d8b23c2ecf72f20b829f04baaf42ea78973dc..c7885a7892ae57775866525bbc58cfcf32c22ca3 100644 (file)
--- 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 6fb7299304aa17e77eecff0ca474d8e833c84cd0..f59d290be2d076d055168958d36bd843beef901b 100644 (file)
--- 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 e5e46f2b4879202d02affc2298acee3f1ad60e1c..d9804e38f89670e785054026dd2d7306e5fcbf03 100644 (file)
--- 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 402941c8cf6fb746832c0bac377ab1850448a7e6..7a8ed221c74c9f960e4300a736f0bf4674d6c883 100644 (file)
--- 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 <ossman@cendio.se> for Cendio AB
  * Modifications:
+ * Copyright 2009 Pierre Ossman <ossman@cendio.se> 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 be32e43a8638b6b88b2221243ba7f3d29b10e1cf..c0530748e1059cfbe21f7a3bcec19dfdc01bd5e8 100644 (file)
--- 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 021980b582ae1b94b21065924a8473d707e69b45..ef137217e6e6d235b323042d97f3be967f3f9027 100644 (file)
--- 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 ef2164afa5c821747cebf89654af5fbaf66597cd..157972b44ce08bdd214da58a52508e2195d78695 100644 (file)
--- 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
 =================================================================