Change the copyright notices to make it clear that our modified files are not part of the IJG's software.

2012-12-31 02:42:18 +00:00
parent 6683a2411a
commit de30fe9460
35 changed files with 77 additions and 37 deletions
--- 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.
--- 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.
--- 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.


--- 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.
--- 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.
--- 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.
--- 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.
--- 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.
--- 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.
--- 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.
--- 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
--- 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.
--- 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.
--- 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.
--- a/jddctmgr.c
+++ b/jddctmgr.c
@@ -1,11 +1,12 @@
 /*
 * jddctmgr.c
 *
+ * This file was part of the Independent JPEG Group's software:
 * Copyright (C) 1994-1996, Thomas G. Lane.
 * Modified 2002-2010 by Guido Vollbeding.
+ * 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.
--- 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.
--- 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
--- a/jdinput.c
+++ b/jdinput.c
@@ -1,9 +1,10 @@
 /*
 * jdinput.c
 *
+ * This file was part of the Independent JPEG Group's software:
 * Copyright (C) 1991-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 input control logic for the JPEG decompressor.
--- 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.
--- 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.
--- a/jdmaster.c
+++ b/jdmaster.c
@@ -1,10 +1,11 @@
 /*
 * jdmaster.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) 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.
--- 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.
--- 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.
--- 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.
--- 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
--- 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.
--- 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.
--- 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.
--- 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.
--- 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

--- 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.


--- 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
--- 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.


--- 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
--- 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
 =================================================================