Format copyright headers more consistently
The IJG convention is to format copyright notices as:
Copyright (C) YYYY, Owner.
We try to maintain this convention for any code that is part of the
libjpeg API library (with the exception of preserving the copyright
notices from Cendio's code verbatim, since those predate
libjpeg-turbo.)
Note that the phrase "All Rights Reserved" is no longer necessary, since
all Buenos Aires Convention signatories signed onto the Berne Convention
in 2000. However, our convention is to retain this phrase for any files
that have a self-contained copyright header but to leave it off of any
files that refer to another file for conditions of distribution and use.
For instance, all of the non-SIMD files in the libjpeg API library refer
to README.ijg, and the copyright message in that file contains "All
Rights Reserved", so it is unnecessary to add it to the individual
files.
The TurboJPEG code retains my preferred formatting convention for
copyright notices, which is based on that of VirtualGL (where the
TurboJPEG API originated.)
diff --git a/jccolor.c b/jccolor.c
index a93498a..b973d10 100644
--- a/jccolor.c
+++ b/jccolor.c
@@ -5,8 +5,8 @@
* Copyright (C) 1991-1996, Thomas G. Lane.
* libjpeg-turbo Modifications:
* Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
- * Copyright (C) 2009-2012, 2015 D. R. Commander.
- * Copyright (C) 2014, MIPS Technologies, Inc., California
+ * Copyright (C) 2009-2012, 2015, D. R. Commander.
+ * Copyright (C) 2014, MIPS Technologies, Inc., California.
* For conditions of distribution and use, see the accompanying README.ijg
* file.
*
diff --git a/jchuff.c b/jchuff.c
index 58acd70..fffaace 100644
--- a/jchuff.c
+++ b/jchuff.c
@@ -4,8 +4,8 @@
* This file was part of the Independent JPEG Group's software:
* Copyright (C) 1991-1997, Thomas G. Lane.
* libjpeg-turbo Modifications:
- * Copyright (C) 2009-2011, 2014-2016 D. R. Commander.
- * Copyright (C) 2015 Matthieu Darbois.
+ * Copyright (C) 2009-2011, 2014-2016, D. R. Commander.
+ * Copyright (C) 2015, Matthieu Darbois.
* For conditions of distribution and use, see the accompanying README.ijg
* file.
*
diff --git a/jcsample.c b/jcsample.c
index 879bd51..c4b4991 100644
--- a/jcsample.c
+++ b/jcsample.c
@@ -5,7 +5,7 @@
* Copyright (C) 1991-1996, Thomas G. Lane.
* libjpeg-turbo Modifications:
* Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
- * Copyright (C) 2014, MIPS Technologies, Inc., California
+ * Copyright (C) 2014, MIPS Technologies, Inc., California.
* Copyright (C) 2015, D. R. Commander.
* For conditions of distribution and use, see the accompanying README.ijg
* file.
diff --git a/jddctmgr.c b/jddctmgr.c
index bdf7c53..3a5ba7e 100644
--- a/jddctmgr.c
+++ b/jddctmgr.c
@@ -7,7 +7,7 @@
* libjpeg-turbo Modifications:
* Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
* Copyright (C) 2010, 2015, D. R. Commander.
- * Copyright (C) 2013, MIPS Technologies, Inc., California
+ * Copyright (C) 2013, MIPS Technologies, Inc., California.
* For conditions of distribution and use, see the accompanying README.ijg
* file.
*
diff --git a/jdsample.c b/jdsample.c
index 39b3725..91e29df 100644
--- a/jdsample.c
+++ b/jdsample.c
@@ -6,7 +6,7 @@
* libjpeg-turbo Modifications:
* Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
* Copyright (C) 2010, 2015-2016, D. R. Commander.
- * Copyright (C) 2014, MIPS Technologies, Inc., California
+ * Copyright (C) 2014, MIPS Technologies, Inc., California.
* Copyright (C) 2015, Google, Inc.
* For conditions of distribution and use, see the accompanying README.ijg
* file.
diff --git a/jfdctfst.c b/jfdctfst.c
index 82b2515..5cd83a7 100644
--- a/jfdctfst.c
+++ b/jfdctfst.c
@@ -4,7 +4,7 @@
* This file was part of the Independent JPEG Group's software:
* Copyright (C) 1994-1996, Thomas G. Lane.
* libjpeg-turbo Modifications:
- * Copyright (C) 2015, D. R. Commander
+ * Copyright (C) 2015, D. R. Commander.
* For conditions of distribution and use, see the accompanying README.ijg
* file.
*
diff --git a/jfdctint.c b/jfdctint.c
index 73e0b59..169bb94 100644
--- a/jfdctint.c
+++ b/jfdctint.c
@@ -4,7 +4,7 @@
* This file was part of the Independent JPEG Group's software.
* Copyright (C) 1991-1996, Thomas G. Lane.
* libjpeg-turbo Modifications:
- * Copyright (C) 2015, D. R. Commander
+ * Copyright (C) 2015, D. R. Commander.
* For conditions of distribution and use, see the accompanying README.ijg
* file.
*
diff --git a/jidctint.c b/jidctint.c
index a2d03fc..3ac6caf 100644
--- a/jidctint.c
+++ b/jidctint.c
@@ -5,7 +5,7 @@
* Copyright (C) 1991-1998, Thomas G. Lane.
* Modification developed 2002-2009 by Guido Vollbeding.
* libjpeg-turbo Modifications:
- * Copyright (C) 2015, D. R. Commander
+ * Copyright (C) 2015, D. R. Commander.
* For conditions of distribution and use, see the accompanying README.ijg
* file.
*
diff --git a/jidctred.c b/jidctred.c
index 2d5b546..7a81803 100644
--- a/jidctred.c
+++ b/jidctred.c
@@ -4,7 +4,7 @@
* This file was part of the Independent JPEG Group's software.
* Copyright (C) 1994-1998, Thomas G. Lane.
* libjpeg-turbo Modifications:
- * Copyright (C) 2015, D. R. Commander
+ * Copyright (C) 2015, D. R. Commander.
* For conditions of distribution and use, see the accompanying README.ijg
* file.
*
diff --git a/jpegcomp.h b/jpegcomp.h
index c39275b..ade0d1e 100644
--- a/jpegcomp.h
+++ b/jpegcomp.h
@@ -1,7 +1,7 @@
/*
* jpegcomp.h
*
- * Copyright (C) 2010, D. R. Commander
+ * Copyright (C) 2010, D. R. Commander.
* For conditions of distribution and use, see the accompanying README.ijg
* file.
*
diff --git a/jpegint.h b/jpegint.h
index c3b4320..f0adbf5 100644
--- a/jpegint.h
+++ b/jpegint.h
@@ -5,7 +5,7 @@
* Copyright (C) 1991-1997, Thomas G. Lane.
* Modified 1997-2009 by Guido Vollbeding.
* libjpeg-turbo Modifications:
- * Copyright (C) 2015-2016, D. R. Commander
+ * Copyright (C) 2015-2016, D. R. Commander.
* Copyright (C) 2015, Google, Inc.
* For conditions of distribution and use, see the accompanying README.ijg
* file.
diff --git a/jsimd.h b/jsimd.h
index f2e2484..3aa0779 100644
--- a/jsimd.h
+++ b/jsimd.h
@@ -2,8 +2,8 @@
* jsimd.h
*
* Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
- * Copyright 2011, 2014 D. R. Commander
- * Copyright 2015 Matthieu Darbois
+ * Copyright (C) 2011, 2014, D. R. Commander.
+ * Copyright (C) 2015, Matthieu Darbois.
*
* Based on the x86 SIMD extension for IJG JPEG library,
* Copyright (C) 1999-2006, MIYASAKA Masaru.
diff --git a/jsimd_none.c b/jsimd_none.c
index 90dc965..f29030c 100644
--- a/jsimd_none.c
+++ b/jsimd_none.c
@@ -2,8 +2,8 @@
* jsimd_none.c
*
* Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
- * Copyright 2009-2011, 2014 D. R. Commander
- * Copyright 2015 Matthieu Darbois
+ * Copyright (C) 2009-2011, 2014, D. R. Commander.
+ * Copyright (C) 2015, Matthieu Darbois.
*
* Based on the x86 SIMD extension for IJG JPEG library,
* Copyright (C) 1999-2006, MIYASAKA Masaru.
diff --git a/md5/md5hl.c b/md5/md5hl.c
index d2b7ca4..983ea76 100644
--- a/md5/md5hl.c
+++ b/md5/md5hl.c
@@ -5,7 +5,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
* libjpeg-turbo Modifications:
- * Copyright (C) 2016, D. R. Commander
+ * Copyright (C) 2016, D. R. Commander.
* Modifications are under the same license as the original code (see above)
* ----------------------------------------------------------------------------
*/
diff --git a/simd/jccolext-altivec.c b/simd/jccolext-altivec.c
index 403aa96..849825e 100644
--- a/simd/jccolext-altivec.c
+++ b/simd/jccolext-altivec.c
@@ -1,9 +1,9 @@
/*
* AltiVec optimizations for libjpeg-turbo
*
- * Copyright (C) 2014-2015, D. R. Commander.
- * Copyright (C) 2014, Jay Foad.
- * All rights reserved.
+ * Copyright (C) 2014-2015, D. R. Commander. All Rights Reserved.
+ * Copyright (C) 2014, Jay Foad. All Rights Reserved.
+ *
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
diff --git a/simd/jccolext-mmx.asm b/simd/jccolext-mmx.asm
index d3d47a5..96a0372 100644
--- a/simd/jccolext-mmx.asm
+++ b/simd/jccolext-mmx.asm
@@ -3,8 +3,7 @@
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jccolext-sse2-64.asm b/simd/jccolext-sse2-64.asm
index 7ad4343..8e4642d 100644
--- a/simd/jccolext-sse2-64.asm
+++ b/simd/jccolext-sse2-64.asm
@@ -1,9 +1,10 @@
;
; jccolext.asm - colorspace conversion (64-bit SSE2)
;
-; x86 SIMD extension for IJG JPEG library
-; Copyright (C) 1999-2006, MIYASAKA Masaru.
; Copyright (C) 2009, D. R. Commander.
+;
+; Based on the x86 SIMD extension for IJG JPEG library
+; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
; This file should be assembled with NASM (Netwide Assembler),
diff --git a/simd/jccolor-altivec.c b/simd/jccolor-altivec.c
index 04b8708..ec47332 100644
--- a/simd/jccolor-altivec.c
+++ b/simd/jccolor-altivec.c
@@ -1,8 +1,8 @@
/*
* AltiVec optimizations for libjpeg-turbo
*
- * Copyright (C) 2014, D. R. Commander.
- * All rights reserved.
+ * Copyright (C) 2014, D. R. Commander. All Rights Reserved.
+ *
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
diff --git a/simd/jccolor-mmx.asm b/simd/jccolor-mmx.asm
index c5d3764..c4e6d88 100644
--- a/simd/jccolor-mmx.asm
+++ b/simd/jccolor-mmx.asm
@@ -2,10 +2,9 @@
; jccolor.asm - colorspace conversion (MMX)
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright 2009 D. R. Commander
+; Copyright (C) 2009, D. R. Commander.
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jccolor-sse2-64.asm b/simd/jccolor-sse2-64.asm
index 55c7e12..bd2188b 100644
--- a/simd/jccolor-sse2-64.asm
+++ b/simd/jccolor-sse2-64.asm
@@ -1,9 +1,10 @@
;
; jccolor.asm - colorspace conversion (64-bit SSE2)
;
-; x86 SIMD extension for IJG JPEG library
-; Copyright (C) 1999-2006, MIYASAKA Masaru.
; Copyright (C) 2009, D. R. Commander.
+;
+; Based on the x86 SIMD extension for IJG JPEG library
+; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
; This file should be assembled with NASM (Netwide Assembler),
diff --git a/simd/jccolor-sse2.asm b/simd/jccolor-sse2.asm
index 890e2a3..13124d1 100644
--- a/simd/jccolor-sse2.asm
+++ b/simd/jccolor-sse2.asm
@@ -1,9 +1,10 @@
;
; jccolor.asm - colorspace conversion (SSE2)
;
-; x86 SIMD extension for IJG JPEG library
-; Copyright (C) 1999-2006, MIYASAKA Masaru.
; Copyright (C) 2009, D. R. Commander.
+;
+; Based on the x86 SIMD extension for IJG JPEG library
+; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
; This file should be assembled with NASM (Netwide Assembler),
diff --git a/simd/jcgray-altivec.c b/simd/jcgray-altivec.c
index b52fade..684df5e 100644
--- a/simd/jcgray-altivec.c
+++ b/simd/jcgray-altivec.c
@@ -1,8 +1,8 @@
/*
* AltiVec optimizations for libjpeg-turbo
*
- * Copyright (C) 2014, D. R. Commander.
- * All rights reserved.
+ * Copyright (C) 2014, D. R. Commander. All Rights Reserved.
+ *
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
diff --git a/simd/jcgray-mmx.asm b/simd/jcgray-mmx.asm
index b2708ad..0819b6c 100644
--- a/simd/jcgray-mmx.asm
+++ b/simd/jcgray-mmx.asm
@@ -2,10 +2,9 @@
; jcgray.asm - grayscale colorspace conversion (MMX)
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright 2011 D. R. Commander
+; Copyright (C) 2011, D. R. Commander.
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jcgray-sse2-64.asm b/simd/jcgray-sse2-64.asm
index dfc0577..bafd302 100644
--- a/simd/jcgray-sse2-64.asm
+++ b/simd/jcgray-sse2-64.asm
@@ -1,9 +1,10 @@
;
; jcgray.asm - grayscale colorspace conversion (64-bit SSE2)
;
-; x86 SIMD extension for IJG JPEG library
-; Copyright (C) 1999-2006, MIYASAKA Masaru.
; Copyright (C) 2011, D. R. Commander.
+;
+; Based on the x86 SIMD extension for IJG JPEG library
+; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
; This file should be assembled with NASM (Netwide Assembler),
diff --git a/simd/jcgray-sse2.asm b/simd/jcgray-sse2.asm
index 5fa7273..5b0b466 100644
--- a/simd/jcgray-sse2.asm
+++ b/simd/jcgray-sse2.asm
@@ -1,9 +1,10 @@
;
; jcgray.asm - grayscale colorspace conversion (SSE2)
;
-; x86 SIMD extension for IJG JPEG library
-; Copyright (C) 1999-2006, MIYASAKA Masaru.
; Copyright (C) 2011, D. R. Commander.
+;
+; Based on the x86 SIMD extension for IJG JPEG library
+; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
; This file should be assembled with NASM (Netwide Assembler),
diff --git a/simd/jcgryext-altivec.c b/simd/jcgryext-altivec.c
index c171615..7f8232b 100644
--- a/simd/jcgryext-altivec.c
+++ b/simd/jcgryext-altivec.c
@@ -1,9 +1,9 @@
/*
* AltiVec optimizations for libjpeg-turbo
*
- * Copyright (C) 2014-2015, D. R. Commander.
- * Copyright (C) 2014, Jay Foad.
- * All rights reserved.
+ * Copyright (C) 2014-2015, D. R. Commander. All Rights Reserved.
+ * Copyright (C) 2014, Jay Foad. All Rights Reserved.
+ *
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
diff --git a/simd/jcgryext-mmx.asm b/simd/jcgryext-mmx.asm
index 13b9600..1c1b8d8 100644
--- a/simd/jcgryext-mmx.asm
+++ b/simd/jcgryext-mmx.asm
@@ -2,10 +2,9 @@
; jcgryext.asm - grayscale colorspace conversion (MMX)
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright 2011 D. R. Commander
+; Copyright (C) 2011, D. R. Commander.
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jcgryext-sse2-64.asm b/simd/jcgryext-sse2-64.asm
index 82c0fc8..541355a 100644
--- a/simd/jcgryext-sse2-64.asm
+++ b/simd/jcgryext-sse2-64.asm
@@ -1,9 +1,10 @@
;
; jcgryext.asm - grayscale colorspace conversion (64-bit SSE2)
;
-; x86 SIMD extension for IJG JPEG library
-; Copyright (C) 1999-2006, MIYASAKA Masaru.
; Copyright (C) 2011, D. R. Commander.
+;
+; Based on the x86 SIMD extension for IJG JPEG library
+; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
; This file should be assembled with NASM (Netwide Assembler),
diff --git a/simd/jcgryext-sse2.asm b/simd/jcgryext-sse2.asm
index 1097b29..cd16dd1 100644
--- a/simd/jcgryext-sse2.asm
+++ b/simd/jcgryext-sse2.asm
@@ -1,9 +1,10 @@
;
; jcgryext.asm - grayscale colorspace conversion (SSE2)
;
-; x86 SIMD extension for IJG JPEG library
-; Copyright (C) 1999-2006, MIYASAKA Masaru.
; Copyright (C) 2011, D. R. Commander.
+;
+; Based on the x86 SIMD extension for IJG JPEG library
+; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
; This file should be assembled with NASM (Netwide Assembler),
diff --git a/simd/jchuff-sse2-64.asm b/simd/jchuff-sse2-64.asm
index 84eaeeb..b1144d1 100644
--- a/simd/jchuff-sse2-64.asm
+++ b/simd/jchuff-sse2-64.asm
@@ -1,11 +1,10 @@
;
; jchuff-sse2-64.asm - Huffman entropy encoding (64-bit SSE2)
;
-; Copyright 2009-2011, 2014-2016 D. R. Commander.
-; Copyright 2015 Matthieu Darbois
+; Copyright (C) 2009-2011, 2014-2016, D. R. Commander.
+; Copyright (C) 2015, Matthieu Darbois.
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jchuff-sse2.asm b/simd/jchuff-sse2.asm
index 1d82273..36d1f2d 100644
--- a/simd/jchuff-sse2.asm
+++ b/simd/jchuff-sse2.asm
@@ -1,11 +1,10 @@
;
; jchuff-sse2.asm - Huffman entropy encoding (SSE2)
;
-; Copyright 2009-2011, 2014-2016 D. R. Commander.
-; Copyright 2015 Matthieu Darbois
+; Copyright (C) 2009-2011, 2014-2016, D. R. Commander.
+; Copyright (C) 2015, Matthieu Darbois.
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jcolsamp.inc b/simd/jcolsamp.inc
index 79751b7..3be446e 100644
--- a/simd/jcolsamp.inc
+++ b/simd/jcolsamp.inc
@@ -3,8 +3,7 @@
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jcsample-altivec.c b/simd/jcsample-altivec.c
index 603492d..11609d9 100644
--- a/simd/jcsample-altivec.c
+++ b/simd/jcsample-altivec.c
@@ -1,8 +1,8 @@
/*
* AltiVec optimizations for libjpeg-turbo
*
- * Copyright (C) 2015, D. R. Commander.
- * All rights reserved.
+ * Copyright (C) 2015, D. R. Commander. All Rights Reserved.
+ *
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
diff --git a/simd/jcsample-mmx.asm b/simd/jcsample-mmx.asm
index 6881a56..6cd544e 100644
--- a/simd/jcsample-mmx.asm
+++ b/simd/jcsample-mmx.asm
@@ -3,8 +3,7 @@
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jcsample-sse2-64.asm b/simd/jcsample-sse2-64.asm
index 7693285..40ee15f 100644
--- a/simd/jcsample-sse2-64.asm
+++ b/simd/jcsample-sse2-64.asm
@@ -2,10 +2,9 @@
; jcsample.asm - downsampling (64-bit SSE2)
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright 2009 D. R. Commander
+; Copyright (C) 2009, D. R. Commander.
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jcsample-sse2.asm b/simd/jcsample-sse2.asm
index 11202db..83c9d15 100644
--- a/simd/jcsample-sse2.asm
+++ b/simd/jcsample-sse2.asm
@@ -3,8 +3,7 @@
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jdcolext-altivec.c b/simd/jdcolext-altivec.c
index 1ae91b9..fb121ce 100644
--- a/simd/jdcolext-altivec.c
+++ b/simd/jdcolext-altivec.c
@@ -1,8 +1,8 @@
/*
* AltiVec optimizations for libjpeg-turbo
*
- * Copyright (C) 2015, D. R. Commander.
- * All rights reserved.
+ * Copyright (C) 2015, D. R. Commander. All Rights Reserved.
+ *
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
diff --git a/simd/jdcolext-mmx.asm b/simd/jdcolext-mmx.asm
index de1f00f..21e34f6 100644
--- a/simd/jdcolext-mmx.asm
+++ b/simd/jdcolext-mmx.asm
@@ -3,8 +3,7 @@
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jdcolext-sse2-64.asm b/simd/jdcolext-sse2-64.asm
index d356e65..4634066 100644
--- a/simd/jdcolext-sse2-64.asm
+++ b/simd/jdcolext-sse2-64.asm
@@ -2,10 +2,9 @@
; jdcolext.asm - colorspace conversion (64-bit SSE2)
;
; Copyright 2009, 2012 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright 2009, 2012 D. R. Commander
+; Copyright (C) 2009, 2012, D. R. Commander.
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jdcolext-sse2.asm b/simd/jdcolext-sse2.asm
index 54ae4db..682aef3 100644
--- a/simd/jdcolext-sse2.asm
+++ b/simd/jdcolext-sse2.asm
@@ -2,10 +2,9 @@
; jdcolext.asm - colorspace conversion (SSE2)
;
; Copyright 2009, 2012 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright 2012 D. R. Commander
+; Copyright (C) 2012, D. R. Commander.
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jdcolor-altivec.c b/simd/jdcolor-altivec.c
index e0892d8..0dc4c42 100644
--- a/simd/jdcolor-altivec.c
+++ b/simd/jdcolor-altivec.c
@@ -1,8 +1,8 @@
/*
* AltiVec optimizations for libjpeg-turbo
*
- * Copyright (C) 2015, D. R. Commander.
- * All rights reserved.
+ * Copyright (C) 2015, D. R. Commander. All Rights Reserved.
+ *
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
diff --git a/simd/jdcolor-mmx.asm b/simd/jdcolor-mmx.asm
index 6730e48..4e58031 100644
--- a/simd/jdcolor-mmx.asm
+++ b/simd/jdcolor-mmx.asm
@@ -2,10 +2,9 @@
; jdcolor.asm - colorspace conversion (MMX)
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright 2009 D. R. Commander
+; Copyright (C) 2009, D. R. Commander.
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jdcolor-sse2-64.asm b/simd/jdcolor-sse2-64.asm
index e9277f1..d2bf210 100644
--- a/simd/jdcolor-sse2-64.asm
+++ b/simd/jdcolor-sse2-64.asm
@@ -2,10 +2,9 @@
; jdcolor.asm - colorspace conversion (64-bit SSE2)
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright 2009 D. R. Commander
+; Copyright (C) 2009, D. R. Commander.
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jdcolor-sse2.asm b/simd/jdcolor-sse2.asm
index c122cc7..7ff5d05 100644
--- a/simd/jdcolor-sse2.asm
+++ b/simd/jdcolor-sse2.asm
@@ -2,10 +2,9 @@
; jdcolor.asm - colorspace conversion (SSE2)
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright 2009 D. R. Commander
+; Copyright (C) 2009, D. R. Commander.
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jdct.inc b/simd/jdct.inc
index ad5890c..b976107 100644
--- a/simd/jdct.inc
+++ b/simd/jdct.inc
@@ -3,8 +3,7 @@
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jdmerge-altivec.c b/simd/jdmerge-altivec.c
index cc8d3d9..6a35f20 100644
--- a/simd/jdmerge-altivec.c
+++ b/simd/jdmerge-altivec.c
@@ -1,8 +1,8 @@
/*
* AltiVec optimizations for libjpeg-turbo
*
- * Copyright (C) 2015, D. R. Commander.
- * All rights reserved.
+ * Copyright (C) 2015, D. R. Commander. All Rights Reserved.
+ *
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
diff --git a/simd/jdmerge-mmx.asm b/simd/jdmerge-mmx.asm
index 2daa7fa..ee58bff 100644
--- a/simd/jdmerge-mmx.asm
+++ b/simd/jdmerge-mmx.asm
@@ -2,10 +2,9 @@
; jdmerge.asm - merged upsampling/color conversion (MMX)
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright 2009 D. R. Commander
+; Copyright (C) 2009, D. R. Commander.
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jdmerge-sse2-64.asm b/simd/jdmerge-sse2-64.asm
index 8f953c7..244bd40 100644
--- a/simd/jdmerge-sse2-64.asm
+++ b/simd/jdmerge-sse2-64.asm
@@ -2,10 +2,9 @@
; jdmerge.asm - merged upsampling/color conversion (64-bit SSE2)
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright 2009 D. R. Commander
+; Copyright (C) 2009, D. R. Commander.
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jdmerge-sse2.asm b/simd/jdmerge-sse2.asm
index d22e828..236de5a 100644
--- a/simd/jdmerge-sse2.asm
+++ b/simd/jdmerge-sse2.asm
@@ -2,10 +2,9 @@
; jdmerge.asm - merged upsampling/color conversion (SSE2)
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright 2009 D. R. Commander
+; Copyright (C) 2009, D. R. Commander.
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jdmrgext-altivec.c b/simd/jdmrgext-altivec.c
index 3b6950d..55205bb 100644
--- a/simd/jdmrgext-altivec.c
+++ b/simd/jdmrgext-altivec.c
@@ -1,8 +1,8 @@
/*
* AltiVec optimizations for libjpeg-turbo
*
- * Copyright (C) 2015, D. R. Commander.
- * All rights reserved.
+ * Copyright (C) 2015, D. R. Commander. All Rights Reserved.
+ *
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
diff --git a/simd/jdmrgext-mmx.asm b/simd/jdmrgext-mmx.asm
index a92e934..63f45cf 100644
--- a/simd/jdmrgext-mmx.asm
+++ b/simd/jdmrgext-mmx.asm
@@ -3,8 +3,7 @@
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jdmrgext-sse2-64.asm b/simd/jdmrgext-sse2-64.asm
index 989d7f1..ad74c5f 100644
--- a/simd/jdmrgext-sse2-64.asm
+++ b/simd/jdmrgext-sse2-64.asm
@@ -2,10 +2,9 @@
; jdmrgext.asm - merged upsampling/color conversion (64-bit SSE2)
;
; Copyright 2009, 2012 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright 2009, 2012 D. R. Commander
+; Copyright (C) 2009, 2012, D. R. Commander.
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jdmrgext-sse2.asm b/simd/jdmrgext-sse2.asm
index c47916f..b50f698 100644
--- a/simd/jdmrgext-sse2.asm
+++ b/simd/jdmrgext-sse2.asm
@@ -2,10 +2,9 @@
; jdmrgext.asm - merged upsampling/color conversion (SSE2)
;
; Copyright 2009, 2012 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright 2012 D. R. Commander
+; Copyright (C) 2012, D. R. Commander.
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jdsample-altivec.c b/simd/jdsample-altivec.c
index 63d6d8c..b40ce55 100644
--- a/simd/jdsample-altivec.c
+++ b/simd/jdsample-altivec.c
@@ -1,8 +1,8 @@
/*
* AltiVec optimizations for libjpeg-turbo
*
- * Copyright (C) 2015, D. R. Commander.
- * All rights reserved.
+ * Copyright (C) 2015, D. R. Commander. All Rights Reserved.
+ *
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
diff --git a/simd/jdsample-mmx.asm b/simd/jdsample-mmx.asm
index c9e2b8b..5e4fa7a 100644
--- a/simd/jdsample-mmx.asm
+++ b/simd/jdsample-mmx.asm
@@ -3,8 +3,7 @@
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jdsample-sse2-64.asm b/simd/jdsample-sse2-64.asm
index 3aec69f..1faaed6 100644
--- a/simd/jdsample-sse2-64.asm
+++ b/simd/jdsample-sse2-64.asm
@@ -2,10 +2,9 @@
; jdsample.asm - upsampling (64-bit SSE2)
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright 2009 D. R. Commander
+; Copyright (C) 2009, D. R. Commander.
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jdsample-sse2.asm b/simd/jdsample-sse2.asm
index f75e594..1d0059e 100644
--- a/simd/jdsample-sse2.asm
+++ b/simd/jdsample-sse2.asm
@@ -3,8 +3,7 @@
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jfdctflt-3dn.asm b/simd/jfdctflt-3dn.asm
index 133fe4d..2191618 100644
--- a/simd/jfdctflt-3dn.asm
+++ b/simd/jfdctflt-3dn.asm
@@ -3,8 +3,7 @@
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jfdctflt-sse-64.asm b/simd/jfdctflt-sse-64.asm
index 02d5463..4b64ea4 100644
--- a/simd/jfdctflt-sse-64.asm
+++ b/simd/jfdctflt-sse-64.asm
@@ -2,10 +2,9 @@
; jfdctflt.asm - floating-point FDCT (64-bit SSE)
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright 2009 D. R. Commander
+; Copyright (C) 2009, D. R. Commander.
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jfdctflt-sse.asm b/simd/jfdctflt-sse.asm
index c2f61c8..e7ede26 100644
--- a/simd/jfdctflt-sse.asm
+++ b/simd/jfdctflt-sse.asm
@@ -3,8 +3,7 @@
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jfdctfst-altivec.c b/simd/jfdctfst-altivec.c
index c4cc26e..04157f7 100644
--- a/simd/jfdctfst-altivec.c
+++ b/simd/jfdctfst-altivec.c
@@ -1,8 +1,8 @@
/*
* AltiVec optimizations for libjpeg-turbo
*
- * Copyright (C) 2014, D. R. Commander.
- * All rights reserved.
+ * Copyright (C) 2014, D. R. Commander. All Rights Reserved.
+ *
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
diff --git a/simd/jfdctfst-mmx.asm b/simd/jfdctfst-mmx.asm
index 41ba00e..eb2eb9c 100644
--- a/simd/jfdctfst-mmx.asm
+++ b/simd/jfdctfst-mmx.asm
@@ -3,8 +3,7 @@
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jfdctfst-sse2-64.asm b/simd/jfdctfst-sse2-64.asm
index f9b1551..4c96685 100644
--- a/simd/jfdctfst-sse2-64.asm
+++ b/simd/jfdctfst-sse2-64.asm
@@ -2,10 +2,9 @@
; jfdctfst.asm - fast integer FDCT (64-bit SSE2)
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright 2009 D. R. Commander
+; Copyright (C) 2009, D. R. Commander.
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jfdctfst-sse2.asm b/simd/jfdctfst-sse2.asm
index ebbadad..54856a2 100644
--- a/simd/jfdctfst-sse2.asm
+++ b/simd/jfdctfst-sse2.asm
@@ -3,8 +3,7 @@
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jfdctint-altivec.c b/simd/jfdctint-altivec.c
index c13850a..e6e8a56 100644
--- a/simd/jfdctint-altivec.c
+++ b/simd/jfdctint-altivec.c
@@ -1,8 +1,8 @@
/*
* AltiVec optimizations for libjpeg-turbo
*
- * Copyright (C) 2014, D. R. Commander.
- * All rights reserved.
+ * Copyright (C) 2014, D. R. Commander. All Rights Reserved.
+ *
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
diff --git a/simd/jfdctint-mmx.asm b/simd/jfdctint-mmx.asm
index 47f6041..9142ad8 100644
--- a/simd/jfdctint-mmx.asm
+++ b/simd/jfdctint-mmx.asm
@@ -3,8 +3,7 @@
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jfdctint-sse2-64.asm b/simd/jfdctint-sse2-64.asm
index c23fcfb..9a0ca0f 100644
--- a/simd/jfdctint-sse2-64.asm
+++ b/simd/jfdctint-sse2-64.asm
@@ -2,10 +2,9 @@
; jfdctint.asm - accurate integer FDCT (64-bit SSE2)
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright 2009 D. R. Commander
+; Copyright (C) 2009, D. R. Commander.
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jfdctint-sse2.asm b/simd/jfdctint-sse2.asm
index 6b42ce5..db9d0bb 100644
--- a/simd/jfdctint-sse2.asm
+++ b/simd/jfdctint-sse2.asm
@@ -3,8 +3,7 @@
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jidctflt-3dn.asm b/simd/jidctflt-3dn.asm
index 24bd105..99356f2 100644
--- a/simd/jidctflt-3dn.asm
+++ b/simd/jidctflt-3dn.asm
@@ -3,8 +3,7 @@
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jidctflt-sse.asm b/simd/jidctflt-sse.asm
index 9605b73..4d4af2f 100644
--- a/simd/jidctflt-sse.asm
+++ b/simd/jidctflt-sse.asm
@@ -3,8 +3,7 @@
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jidctflt-sse2-64.asm b/simd/jidctflt-sse2-64.asm
index 3f53501..bdda05d 100644
--- a/simd/jidctflt-sse2-64.asm
+++ b/simd/jidctflt-sse2-64.asm
@@ -2,10 +2,9 @@
; jidctflt.asm - floating-point IDCT (64-bit SSE & SSE2)
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright 2009 D. R. Commander
+; Copyright (C) 2009, D. R. Commander.
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jidctflt-sse2.asm b/simd/jidctflt-sse2.asm
index be899b3..a15a9c1 100644
--- a/simd/jidctflt-sse2.asm
+++ b/simd/jidctflt-sse2.asm
@@ -3,8 +3,7 @@
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jidctfst-altivec.c b/simd/jidctfst-altivec.c
index 67cbe84..ec30c39 100644
--- a/simd/jidctfst-altivec.c
+++ b/simd/jidctfst-altivec.c
@@ -1,8 +1,8 @@
/*
* AltiVec optimizations for libjpeg-turbo
*
- * Copyright (C) 2014-2015, D. R. Commander.
- * All rights reserved.
+ * Copyright (C) 2014-2015, D. R. Commander. All Rights Reserved.
+ *
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
diff --git a/simd/jidctfst-mmx.asm b/simd/jidctfst-mmx.asm
index 0e3963d..6e95bfb 100644
--- a/simd/jidctfst-mmx.asm
+++ b/simd/jidctfst-mmx.asm
@@ -3,8 +3,7 @@
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jidctfst-sse2-64.asm b/simd/jidctfst-sse2-64.asm
index da4ecf2..4884642 100644
--- a/simd/jidctfst-sse2-64.asm
+++ b/simd/jidctfst-sse2-64.asm
@@ -2,10 +2,9 @@
; jidctfst.asm - fast integer IDCT (64-bit SSE2)
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright 2009 D. R. Commander
+; Copyright (C) 2009, D. R. Commander.
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jidctfst-sse2.asm b/simd/jidctfst-sse2.asm
index 065842c..f591e55 100644
--- a/simd/jidctfst-sse2.asm
+++ b/simd/jidctfst-sse2.asm
@@ -3,8 +3,7 @@
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jidctint-altivec.c b/simd/jidctint-altivec.c
index 5f1a5df..935f35d 100644
--- a/simd/jidctint-altivec.c
+++ b/simd/jidctint-altivec.c
@@ -1,8 +1,8 @@
/*
* AltiVec optimizations for libjpeg-turbo
*
- * Copyright (C) 2014-2015, D. R. Commander.
- * All rights reserved.
+ * Copyright (C) 2014-2015, D. R. Commander. All Rights Reserved.
+ *
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
diff --git a/simd/jidctint-mmx.asm b/simd/jidctint-mmx.asm
index fda3b63..5bd1981 100644
--- a/simd/jidctint-mmx.asm
+++ b/simd/jidctint-mmx.asm
@@ -3,8 +3,7 @@
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jidctint-sse2-64.asm b/simd/jidctint-sse2-64.asm
index bfec499..afe1d6a 100644
--- a/simd/jidctint-sse2-64.asm
+++ b/simd/jidctint-sse2-64.asm
@@ -2,10 +2,9 @@
; jidctint.asm - accurate integer IDCT (64-bit SSE2)
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright 2009 D. R. Commander
+; Copyright (C) 2009, D. R. Commander.
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jidctint-sse2.asm b/simd/jidctint-sse2.asm
index 1960bcd..6c7e7d9 100644
--- a/simd/jidctint-sse2.asm
+++ b/simd/jidctint-sse2.asm
@@ -3,8 +3,7 @@
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jidctred-mmx.asm b/simd/jidctred-mmx.asm
index 21e17fc..ba054e3 100644
--- a/simd/jidctred-mmx.asm
+++ b/simd/jidctred-mmx.asm
@@ -3,8 +3,7 @@
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jidctred-sse2-64.asm b/simd/jidctred-sse2-64.asm
index d1b1874..a54bbe2 100644
--- a/simd/jidctred-sse2-64.asm
+++ b/simd/jidctred-sse2-64.asm
@@ -2,10 +2,9 @@
; jidctred.asm - reduced-size IDCT (64-bit SSE2)
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright 2009 D. R. Commander
+; Copyright (C) 2009, D. R. Commander.
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jidctred-sse2.asm b/simd/jidctred-sse2.asm
index e48c0c5..232d983 100644
--- a/simd/jidctred-sse2.asm
+++ b/simd/jidctred-sse2.asm
@@ -3,8 +3,7 @@
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jquant-3dn.asm b/simd/jquant-3dn.asm
index 6b7c11c..0b4164b 100644
--- a/simd/jquant-3dn.asm
+++ b/simd/jquant-3dn.asm
@@ -3,8 +3,7 @@
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jquant-mmx.asm b/simd/jquant-mmx.asm
index dbfecee..aed6071 100644
--- a/simd/jquant-mmx.asm
+++ b/simd/jquant-mmx.asm
@@ -3,8 +3,7 @@
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jquant-sse.asm b/simd/jquant-sse.asm
index 796723a..1baf88f 100644
--- a/simd/jquant-sse.asm
+++ b/simd/jquant-sse.asm
@@ -3,8 +3,7 @@
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jquantf-sse2-64.asm b/simd/jquantf-sse2-64.asm
index 8af256c..ef5c1f9 100644
--- a/simd/jquantf-sse2-64.asm
+++ b/simd/jquantf-sse2-64.asm
@@ -2,10 +2,9 @@
; jquantf.asm - sample data conversion and quantization (64-bit SSE & SSE2)
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright 2009 D. R. Commander
+; Copyright (C) 2009, D. R. Commander.
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jquantf-sse2.asm b/simd/jquantf-sse2.asm
index a8d4cd3..1cbc267 100644
--- a/simd/jquantf-sse2.asm
+++ b/simd/jquantf-sse2.asm
@@ -3,8 +3,7 @@
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jquanti-altivec.c b/simd/jquanti-altivec.c
index b3adab9..25cc296 100644
--- a/simd/jquanti-altivec.c
+++ b/simd/jquanti-altivec.c
@@ -1,8 +1,8 @@
/*
* AltiVec optimizations for libjpeg-turbo
*
- * Copyright (C) 2014-2015, D. R. Commander.
- * All rights reserved.
+ * Copyright (C) 2014-2015, D. R. Commander. All Rights Reserved.
+ *
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
diff --git a/simd/jquanti-sse2-64.asm b/simd/jquanti-sse2-64.asm
index 9b3f4ee..66c4e51 100644
--- a/simd/jquanti-sse2-64.asm
+++ b/simd/jquanti-sse2-64.asm
@@ -2,10 +2,9 @@
; jquanti.asm - sample data conversion and quantization (64-bit SSE2)
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright 2009 D. R. Commander
+; Copyright (C) 2009, D. R. Commander.
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jquanti-sse2.asm b/simd/jquanti-sse2.asm
index 4299c33..aea8604 100644
--- a/simd/jquanti-sse2.asm
+++ b/simd/jquanti-sse2.asm
@@ -3,8 +3,7 @@
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jsimd.h b/simd/jsimd.h
index a39fafa..dc6ec43 100644
--- a/simd/jsimd.h
+++ b/simd/jsimd.h
@@ -2,10 +2,10 @@
* simd/jsimd.h
*
* Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
- * Copyright (C) 2011, 2014-2016 D. R. Commander
- * Copyright (C) 2013-2014, MIPS Technologies, Inc., California
- * Copyright (C) 2014 Linaro Limited
- * Copyright (C) 2015-2016 Matthieu Darbois
+ * Copyright (C) 2011, 2014-2016, D. R. Commander.
+ * Copyright (C) 2013-2014, MIPS Technologies, Inc., California.
+ * Copyright (C) 2014, Linaro Limited.
+ * Copyright (C) 2015-2016, Matthieu Darbois.
*
* Based on the x86 SIMD extension for IJG JPEG library,
* Copyright (C) 1999-2006, MIYASAKA Masaru.
diff --git a/simd/jsimd_altivec.h b/simd/jsimd_altivec.h
index 2660219..62dbc5c 100644
--- a/simd/jsimd_altivec.h
+++ b/simd/jsimd_altivec.h
@@ -1,8 +1,8 @@
/*
* AltiVec optimizations for libjpeg-turbo
*
- * Copyright (C) 2014-2015, D. R. Commander.
- * All rights reserved.
+ * Copyright (C) 2014-2015, D. R. Commander. All Rights Reserved.
+ *
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
diff --git a/simd/jsimd_arm.c b/simd/jsimd_arm.c
index ea621da..754806d 100644
--- a/simd/jsimd_arm.c
+++ b/simd/jsimd_arm.c
@@ -2,8 +2,8 @@
* jsimd_arm.c
*
* Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
- * Copyright 2009-2011, 2013-2014, 2016 D. R. Commander
- * Copyright 2015-2016 Matthieu Darbois
+ * Copyright (C) 2009-2011, 2013-2014, 2016, D. R. Commander.
+ * Copyright (C) 2015-2016, Matthieu Darbois.
*
* Based on the x86 SIMD extension for IJG JPEG library,
* Copyright (C) 1999-2006, MIYASAKA Masaru.
diff --git a/simd/jsimd_arm64.c b/simd/jsimd_arm64.c
index 62dbc45..7def8f9 100644
--- a/simd/jsimd_arm64.c
+++ b/simd/jsimd_arm64.c
@@ -2,8 +2,8 @@
* jsimd_arm64.c
*
* Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
- * Copyright 2009-2011, 2013-2014, 2016 D. R. Commander
- * Copyright 2015-2016 Matthieu Darbois
+ * Copyright (C) 2009-2011, 2013-2014, 2016, D. R. Commander.
+ * Copyright (C) 2015-2016, Matthieu Darbois.
*
* Based on the x86 SIMD extension for IJG JPEG library,
* Copyright (C) 1999-2006, MIYASAKA Masaru.
diff --git a/simd/jsimd_arm64_neon.S b/simd/jsimd_arm64_neon.S
index d236314..74d6c76 100644
--- a/simd/jsimd_arm64_neon.S
+++ b/simd/jsimd_arm64_neon.S
@@ -1,10 +1,10 @@
/*
* ARMv8 NEON optimizations for libjpeg-turbo
*
- * Copyright (C) 2009-2011 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
+ * Copyright (C) 2009-2011, Nokia Corporation and/or its subsidiary(-ies).
+ * All Rights Reserved.
* Author: Siarhei Siamashka <siarhei.siamashka@nokia.com>
- * Copyright (C) 2013-2014, Linaro Limited
+ * Copyright (C) 2013-2014, Linaro Limited. All Rights Reserved.
* Author: Ragesh Radhakrishnan <ragesh.r@linaro.org>
* Copyright (C) 2014-2016, D. R. Commander. All Rights Reserved.
* Copyright (C) 2015-2016, Matthieu Darbois. All Rights Reserved.
diff --git a/simd/jsimd_arm_neon.S b/simd/jsimd_arm_neon.S
index 568768f..cd26127 100644
--- a/simd/jsimd_arm_neon.S
+++ b/simd/jsimd_arm_neon.S
@@ -1,13 +1,13 @@
/*
* ARMv7 NEON optimizations for libjpeg-turbo
*
- * Copyright (C) 2009-2011 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
+ * Copyright (C) 2009-2011, Nokia Corporation and/or its subsidiary(-ies).
+ * All Rights Reserved.
* Author: Siarhei Siamashka <siarhei.siamashka@nokia.com>
- * Copyright (C) 2014 Siarhei Siamashka. All Rights Reserved.
- * Copyright (C) 2014 Linaro Limited. All Rights Reserved.
- * Copyright (C) 2015 D. R. Commander. All Rights Reserved.
- * Copyright (C) 2015-2016 Matthieu Darbois. All Rights Reserved.
+ * Copyright (C) 2014, Siarhei Siamashka. All Rights Reserved.
+ * Copyright (C) 2014, Linaro Limited. All Rights Reserved.
+ * Copyright (C) 2015, D. R. Commander. All Rights Reserved.
+ * Copyright (C) 2015-2016, Matthieu Darbois. All Rights Reserved.
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
diff --git a/simd/jsimd_i386.c b/simd/jsimd_i386.c
index aef1ad4..6da8bd8 100644
--- a/simd/jsimd_i386.c
+++ b/simd/jsimd_i386.c
@@ -2,8 +2,8 @@
* jsimd_i386.c
*
* Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
- * Copyright 2009-2011, 2013-2014, 2016 D. R. Commander
- * Copyright 2015 Matthieu Darbois
+ * Copyright (C) 2009-2011, 2013-2014, 2016, D. R. Commander.
+ * Copyright (C) 2015, Matthieu Darbois.
*
* Based on the x86 SIMD extension for IJG JPEG library,
* Copyright (C) 1999-2006, MIYASAKA Masaru.
diff --git a/simd/jsimd_mips.c b/simd/jsimd_mips.c
index bdd9912..358bbb8 100644
--- a/simd/jsimd_mips.c
+++ b/simd/jsimd_mips.c
@@ -2,9 +2,9 @@
* jsimd_mips.c
*
* Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
- * Copyright 2009-2011, 2014 D. R. Commander
- * Copyright (C) 2013-2014, MIPS Technologies, Inc., California
- * Copyright 2015 Matthieu Darbois
+ * Copyright (C) 2009-2011, 2014, D. R. Commander.
+ * Copyright (C) 2013-2014, MIPS Technologies, Inc., California.
+ * Copyright (C) 2015, Matthieu Darbois.
*
* Based on the x86 SIMD extension for IJG JPEG library,
* Copyright (C) 1999-2006, MIYASAKA Masaru.
diff --git a/simd/jsimd_mips_dspr2.S b/simd/jsimd_mips_dspr2.S
index 0eed1ce..c8c286c 100644
--- a/simd/jsimd_mips_dspr2.S
+++ b/simd/jsimd_mips_dspr2.S
@@ -2,7 +2,7 @@
* MIPS DSPr2 optimizations for libjpeg-turbo
*
* Copyright (C) 2013-2014, MIPS Technologies, Inc., California.
- * All rights reserved.
+ * All Rights Reserved.
* Authors: Teodora Novkovic (teodora.novkovic@imgtec.com)
* Darko Laus (darko.laus@imgtec.com)
* Copyright (C) 2015, D. R. Commander. All Rights Reserved.
diff --git a/simd/jsimd_mips_dspr2_asm.h b/simd/jsimd_mips_dspr2_asm.h
index 50ec31b..64f9880 100644
--- a/simd/jsimd_mips_dspr2_asm.h
+++ b/simd/jsimd_mips_dspr2_asm.h
@@ -2,7 +2,7 @@
* MIPS DSPr2 optimizations for libjpeg-turbo
*
* Copyright (C) 2013, MIPS Technologies, Inc., California.
- * All rights reserved.
+ * All Rights Reserved.
* Authors: Teodora Novkovic (teodora.novkovic@imgtec.com)
* Darko Laus (darko.laus@imgtec.com)
* This software is provided 'as-is', without any express or implied
diff --git a/simd/jsimd_powerpc.c b/simd/jsimd_powerpc.c
index afbaa82..9edd50a 100644
--- a/simd/jsimd_powerpc.c
+++ b/simd/jsimd_powerpc.c
@@ -2,8 +2,8 @@
* jsimd_powerpc.c
*
* Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
- * Copyright 2009-2011, 2014-2015 D. R. Commander
- * Copyright 2015 Matthieu Darbois
+ * Copyright (C) 2009-2011, 2014-2015, D. R. Commander.
+ * Copyright (C) 2015, Matthieu Darbois.
*
* Based on the x86 SIMD extension for IJG JPEG library,
* Copyright (C) 1999-2006, MIYASAKA Masaru.
diff --git a/simd/jsimd_x86_64.c b/simd/jsimd_x86_64.c
index fa33bea..a62bcdb 100644
--- a/simd/jsimd_x86_64.c
+++ b/simd/jsimd_x86_64.c
@@ -2,8 +2,8 @@
* jsimd_x86_64.c
*
* Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
- * Copyright 2009-2011, 2014, 2016 D. R. Commander
- * Copyright 2015 Matthieu Darbois
+ * Copyright (C) 2009-2011, 2014, 2016, D. R. Commander.
+ * Copyright (C) 2015, Matthieu Darbois.
*
* Based on the x86 SIMD extension for IJG JPEG library,
* Copyright (C) 1999-2006, MIYASAKA Masaru.
diff --git a/simd/jsimdcpu.asm b/simd/jsimdcpu.asm
index c42c4ad..599083b 100644
--- a/simd/jsimdcpu.asm
+++ b/simd/jsimdcpu.asm
@@ -3,8 +3,7 @@
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
;
-; Based on
-; x86 SIMD extension for IJG JPEG library
+; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc
;
diff --git a/simd/jsimdext.inc b/simd/jsimdext.inc
index e1442de..f28db60 100644
--- a/simd/jsimdext.inc
+++ b/simd/jsimdext.inc
@@ -2,10 +2,9 @@
; jsimdext.inc - common declarations
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
-; Copyright 2010 D. R. Commander
+; Copyright (C) 2010, D. R. Commander.
;
-; Based on
-; x86 SIMD extension for IJG JPEG library - version 1.02
+; Based on the x86 SIMD extension for IJG JPEG library - version 1.02
;
; Copyright (C) 1999-2006, MIYASAKA Masaru.
;
diff --git a/wrjpgcom.c b/wrjpgcom.c
index cd67afd..c970757 100644
--- a/wrjpgcom.c
+++ b/wrjpgcom.c
@@ -4,7 +4,7 @@
* This file was part of the Independent JPEG Group's software:
* Copyright (C) 1994-1997, Thomas G. Lane.
* libjpeg-turbo Modifications:
- * Copyright (C) 2014, D. R. Commander
+ * Copyright (C) 2014, D. R. Commander.
* For conditions of distribution and use, see the accompanying README.ijg
* file.
*
