Change the copyright 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@873 632fc199-4ca6-4c93-a231-07263d6284db
diff --git a/cjpeg.c b/cjpeg.c
index 0475c02..703ce10 100644
--- a/cjpeg.c
+++ b/cjpeg.c
@@ -1,10 +1,11 @@
/*
* cjpeg.c
*
+ * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1991-1998, Thomas G. Lane.
* Modified 2003-2008 by Guido Vollbeding.
+ * Modifications:
* Copyright (C) 2010, D. R. Commander.
- * 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 a command-line user interface for the JPEG compressor.
diff --git a/djpeg.c b/djpeg.c
index 2438856..b8f1187 100644
--- a/djpeg.c
+++ b/djpeg.c
@@ -1,9 +1,10 @@
/*
* djpeg.c
*
+ * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1991-1997, Thomas G. Lane.
+ * Modifications:
* Copyright (C) 2010-2011, D. R. Commander.
- * 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 a command-line user interface for the JPEG decompressor.
diff --git a/filelist.txt b/filelist.txt
index 2f905a6..3a115aa 100644
--- a/filelist.txt
+++ b/filelist.txt
@@ -1,7 +1,9 @@
IJG JPEG LIBRARY: FILE LIST
-Copyright (C) 1994-2010, Thomas G. Lane, Guido Vollbeding, D. R. Commander.
-This file is part of the Independent JPEG Group's software.
+This file was part of the Independent JPEG Group's software:
+Copyright (C) 1994-2009, Thomas G. Lane, Guido Vollbeding.
+Modifications:
+Copyright (C) 2010, D. R. Commander.
For conditions of distribution and use, see the accompanying README file.
diff --git a/jccolext.c b/jccolext.c
index dbac84a..84da8cd 100644
--- a/jccolext.c
+++ b/jccolext.c
@@ -1,9 +1,10 @@
/*
* jccolext.c
*
+ * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1991-1996, Thomas G. Lane.
+ * Modifications:
* Copyright (C) 2009-2012, D. R. Commander.
- * 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 input colorspace conversion routines.
diff --git a/jccolor.c b/jccolor.c
index 3a0772b..219c5da 100644
--- a/jccolor.c
+++ b/jccolor.c
@@ -1,10 +1,11 @@
/*
* jccolor.c
*
+ * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1991-1996, Thomas G. Lane.
+ * Modifications:
* Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
* Copyright (C) 2009-2012, D. R. Commander.
- * 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 input colorspace conversion routines.
diff --git a/jcdctmgr.c b/jcdctmgr.c
index 12f8872..43db03a 100644
--- a/jcdctmgr.c
+++ b/jcdctmgr.c
@@ -1,11 +1,12 @@
/*
* jcdctmgr.c
*
+ * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1994-1996, Thomas G. Lane.
+ * Modifications:
* Copyright (C) 1999-2006, MIYASAKA Masaru.
* Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
* Copyright (C) 2011 D. R. Commander
- * 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 the forward-DCT management logic.
diff --git a/jchuff.c b/jchuff.c
index fd4fa46..33da002 100644
--- a/jchuff.c
+++ b/jchuff.c
@@ -1,9 +1,10 @@
/*
* jchuff.c
*
+ * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1991-1997, Thomas G. Lane.
+ * Modifications:
* Copyright (C) 2009-2011, D. R. Commander.
- * 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 Huffman entropy encoding routines.
diff --git a/jcmarker.c b/jcmarker.c
index b1c1e45..039dea1 100644
--- a/jcmarker.c
+++ b/jcmarker.c
@@ -1,9 +1,10 @@
/*
* jcmarker.c
*
+ * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1991-1998, Thomas G. Lane.
+ * Modifications:
* Copyright (C) 2010, D. R. Commander.
- * 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 write JPEG datastream markers.
diff --git a/jcmaster.c b/jcmaster.c
index 3ca346c..bee0caf 100644
--- a/jcmaster.c
+++ b/jcmaster.c
@@ -1,10 +1,11 @@
/*
* jcmaster.c
*
+ * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1991-1997, Thomas G. Lane.
* Modified 2003-2010 by Guido Vollbeding.
+ * Modifications:
* Copyright (C) 2010, D. R. Commander.
- * 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 master control logic for the JPEG compressor.
diff --git a/jcparam.c b/jcparam.c
index 557fdc9..3207520 100644
--- a/jcparam.c
+++ b/jcparam.c
@@ -1,10 +1,11 @@
/*
* jcparam.c
*
+ * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1991-1998, Thomas G. Lane.
* Modified 2003-2008 by Guido Vollbeding.
+ * Modifications:
* Copyright (C) 2009-2011, D. R. Commander.
- * 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 optional default-setting code for the JPEG compressor.
diff --git a/jdapistd.c b/jdapistd.c
index 2343da5..89d2c7c 100644
--- a/jdapistd.c
+++ b/jdapistd.c
@@ -1,9 +1,10 @@
/*
* jdapistd.c
*
+ * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1994-1996, Thomas G. Lane.
+ * Modifications:
* Copyright (C) 2010, D. R. Commander.
- * 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 application interface code for the decompression half
diff --git a/jdcoefct.c b/jdcoefct.c
index 48a9fc6..5315e80 100644
--- a/jdcoefct.c
+++ b/jdcoefct.c
@@ -1,9 +1,10 @@
/*
* jdcoefct.c
*
+ * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1994-1997, Thomas G. Lane.
+ * Modifications:
* Copyright (C) 2010, D. R. Commander.
- * 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 the coefficient buffer controller for decompression.
diff --git a/jdcolext.c b/jdcolext.c
index 3b8aeff..a8e67c3 100644
--- a/jdcolext.c
+++ b/jdcolext.c
@@ -1,9 +1,10 @@
/*
* jdcolext.c
*
+ * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1991-1997, Thomas G. Lane.
+ * Modifications:
* Copyright (C) 2009, 2011, D. R. Commander.
- * 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 output colorspace conversion routines.
diff --git a/jdcolor.c b/jdcolor.c
index 694de9b..402941c 100644
--- a/jdcolor.c
+++ b/jdcolor.c
@@ -1,10 +1,11 @@
/*
* jdcolor.c
*
+ * 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 (C) 2009, 2011-2012, D. R. Commander.
- * 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 output colorspace conversion routines.
diff --git a/jddctmgr.c b/jddctmgr.c
index 044e469..be401d5 100644
--- a/jddctmgr.c
+++ b/jddctmgr.c
@@ -1,10 +1,11 @@
/*
* jddctmgr.c
*
+ * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1994-1996, Thomas G. Lane.
+ * Modifications:
* Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
* Copyright (C) 2010, D. R. Commander.
- * 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 the inverse-DCT management logic.
diff --git a/jdhuff.c b/jdhuff.c
index f822dba..36fd03b 100644
--- a/jdhuff.c
+++ b/jdhuff.c
@@ -1,9 +1,10 @@
/*
* jdhuff.c
*
+ * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1991-1997, Thomas G. Lane.
+ * Modifications:
* Copyright (C) 2009-2011, D. R. Commander.
- * 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 Huffman entropy decoding routines.
diff --git a/jdhuff.h b/jdhuff.h
index 96f2dab..2201436 100644
--- a/jdhuff.h
+++ b/jdhuff.h
@@ -1,9 +1,10 @@
/*
* jdhuff.h
*
+ * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1991-1997, Thomas G. Lane.
+ * Modifications:
* Copyright (C) 2010-2011, D. R. Commander.
- * 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 declarations for Huffman entropy decoding routines
diff --git a/jdinput.c b/jdinput.c
index 9fcd089..aa17d25 100644
--- a/jdinput.c
+++ b/jdinput.c
@@ -1,10 +1,11 @@
/*
* jdinput.c
*
+ * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1991-1997, Thomas G. Lane.
* Modified 2002-2009 by Guido Vollbeding.
+ * Modifications:
* Copyright (C) 2010, D. R. Commander.
- * 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 input control logic for the JPEG decompressor.
diff --git a/jdmainct.c b/jdmainct.c
index eb32cae..2a69c53 100644
--- a/jdmainct.c
+++ b/jdmainct.c
@@ -1,9 +1,10 @@
/*
* jdmainct.c
*
+ * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1994-1996, Thomas G. Lane.
+ * Modifications:
* Copyright (C) 2010, D. R. Commander.
- * 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 the main buffer controller for decompression.
diff --git a/jdmarker.c b/jdmarker.c
index 6fc0f7d..77f7274 100644
--- a/jdmarker.c
+++ b/jdmarker.c
@@ -1,9 +1,10 @@
/*
* jdmarker.c
*
+ * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1991-1998, Thomas G. Lane.
+ * Modifications:
* Copyright (C) 2012, D. R. Commander.
- * 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 decode JPEG datastream markers.
diff --git a/jdmaster.c b/jdmaster.c
index c73ec02..25ad416 100644
--- a/jdmaster.c
+++ b/jdmaster.c
@@ -1,9 +1,10 @@
/*
* jdmaster.c
*
+ * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1991-1997, Thomas G. Lane.
+ * Modifications:
* Copyright (C) 2009-2011, D. R. Commander.
- * 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 master control logic for the JPEG decompressor.
diff --git a/jdmerge.c b/jdmerge.c
index 5336125..17d28f1 100644
--- a/jdmerge.c
+++ b/jdmerge.c
@@ -1,10 +1,11 @@
/*
* jdmerge.c
*
+ * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1994-1996, Thomas G. Lane.
* Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
+ * Modifications:
* Copyright (C) 2009, 2011, D. R. Commander.
- * 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 code for merged upsampling/color conversion.
diff --git a/jdmrgext.c b/jdmrgext.c
index 2b93265..e1ab1e5 100644
--- a/jdmrgext.c
+++ b/jdmrgext.c
@@ -1,9 +1,10 @@
/*
* jdmrgext.c
*
+ * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1994-1996, Thomas G. Lane.
+ * Modifications:
* Copyright (C) 2011, D. R. Commander.
- * 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 code for merged upsampling/color conversion.
diff --git a/jdsample.c b/jdsample.c
index 1864dd6..5211785 100644
--- a/jdsample.c
+++ b/jdsample.c
@@ -1,10 +1,11 @@
/*
* jdsample.c
*
+ * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1991-1996, Thomas G. Lane.
+ * Modifications:
* Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
* Copyright (C) 2010, D. R. Commander.
- * 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 upsampling routines.
diff --git a/jmorecfg.h b/jmorecfg.h
index f22c4f3..b5e98b5 100644
--- a/jmorecfg.h
+++ b/jmorecfg.h
@@ -1,9 +1,10 @@
/*
* jmorecfg.h
*
+ * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1991-1997, Thomas G. Lane.
+ * Modifications:
* Copyright (C) 2009, 2011, D. R. Commander.
- * 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 additional configuration options that customize the
diff --git a/jpeglib.h b/jpeglib.h
index d19a3ef..6bf0b78 100644
--- a/jpeglib.h
+++ b/jpeglib.h
@@ -1,10 +1,11 @@
/*
* jpeglib.h
*
+ * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1991-1998, Thomas G. Lane.
* Modified 2002-2009 by Guido Vollbeding.
+ * Modifications:
* Copyright (C) 2009-2011, D. R. Commander.
- * This file is part of the Independent JPEG Group's software.
* For conditions of distribution and use, see the accompanying README file.
*
* This file defines the application interface for the JPEG library.
diff --git a/jpegtran.c b/jpegtran.c
index 6a22ed2..19c068b 100644
--- a/jpegtran.c
+++ b/jpegtran.c
@@ -1,9 +1,10 @@
/*
* jpegtran.c
*
+ * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1995-2010, Thomas G. Lane, Guido Vollbeding.
+ * Modifications:
* Copyright (C) 2010, D. R. Commander.
- * 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 a command-line user interface for JPEG transcoding.
diff --git a/jquant1.c b/jquant1.c
index 362bb1e..9da420d 100644
--- a/jquant1.c
+++ b/jquant1.c
@@ -1,9 +1,10 @@
/*
* jquant1.c
*
+ * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1991-1996, Thomas G. Lane.
+ * Modifications:
* Copyright (C) 2009, D. R. Commander
- * 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 1-pass color quantization (color mapping) routines.
diff --git a/jquant2.c b/jquant2.c
index da964f7..dc0237b 100644
--- a/jquant2.c
+++ b/jquant2.c
@@ -1,9 +1,10 @@
/*
* jquant2.c
*
+ * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1991-1996, Thomas G. Lane.
+ * Modifications:
* Copyright (C) 2009, D. R. Commander.
- * 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 2-pass color quantization (color mapping) routines.
diff --git a/jversion.h b/jversion.h
index 71d7b91..88c2566 100644
--- a/jversion.h
+++ b/jversion.h
@@ -1,9 +1,10 @@
/*
* jversion.h
*
+ * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1991-2010, Thomas G. Lane, Guido Vollbeding.
+ * Modifications:
* Copyright (C) 2010, 2012, D. R. Commander.
- * 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 software version identification.
@@ -16,7 +17,7 @@
#elif JPEG_LIB_VERSION >= 70
-#define JVERSION "7 27-Jun-2009"
+#define JVERSION "7 27-Jun-2009"
#else
diff --git a/libjpeg.txt b/libjpeg.txt
index d350fc7..6970136 100644
--- a/libjpeg.txt
+++ b/libjpeg.txt
@@ -1,7 +1,9 @@
USING THE IJG JPEG LIBRARY
-Copyright (C) 1994-2010, Thomas G. Lane, Guido Vollbeding, D. R. Commander.
-This file is part of the Independent JPEG Group's software.
+This file was part of the Independent JPEG Group's software:
+Copyright (C) 1994-2009, Thomas G. Lane, Guido Vollbeding.
+Modifications:
+Copyright (C) 2010, D. R. Commander.
For conditions of distribution and use, see the accompanying README file.
diff --git a/rdswitch.c b/rdswitch.c
index d406755..7f3c576 100644
--- a/rdswitch.c
+++ b/rdswitch.c
@@ -1,9 +1,10 @@
/*
* rdswitch.c
*
+ * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1991-1996, Thomas G. Lane.
+ * Modifications:
* Copyright (C) 2010, D. R. Commander.
- * 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 process some of cjpeg's more complicated
diff --git a/structure.txt b/structure.txt
index 6a9266b..b4dfef8 100644
--- a/structure.txt
+++ b/structure.txt
@@ -1,7 +1,9 @@
IJG JPEG LIBRARY: SYSTEM ARCHITECTURE
Copyright (C) 1991-2012, Thomas G. Lane, Guido Vollbeding.
-This file is part of the Independent JPEG Group's software.
+This file was part of the Independent JPEG Group's software.
+It was modified by The libjpeg-turbo Project to include only information
+relevant to libjpeg-turbo.
For conditions of distribution and use, see the accompanying README file.
diff --git a/transupp.c b/transupp.c
index 2513691..021980b 100644
--- a/transupp.c
+++ b/transupp.c
@@ -1,9 +1,10 @@
/*
* transupp.c
*
+ * 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.
- * 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 image transformation routines and other utility code
diff --git a/usage.txt b/usage.txt
index 2abfbea..ef2164a 100644
--- a/usage.txt
+++ b/usage.txt
@@ -1,3 +1,6 @@
+NOTE: This file was modified by The libjpeg-turbo Project to include only
+information relevant to libjpeg-turbo and to clarify certain passages.
+
USAGE instructions for the Independent JPEG Group's JPEG software
=================================================================