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 a93498ab083dda28e274e66e5576f9e538422aa5..b973d101d6c2b2157f6cd864d6c3d281f23888f3 100644 (file)
--- 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 58acd705b25f05657f2ba7db049864251c36ee83..fffaacebce5b9b7df6400d63fdbab167a3a5c18e 100644 (file)
--- 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 879bd515cda72d81be03ad0f94b1ce484a9933ac..c4b49914877c90ef34d2dcc822a39ce6cd1ecb12 100644 (file)
--- 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 bdf7c53389c0401e02b3b3166c0ff628714d28ef..3a5ba7e893a73bb2906479f4562f8918c87a1a41 100644 (file)
--- 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 39b372509463618039950e9cb0b06946d6a4c57b..91e29dfb2494516d74371c18e11ac8c2b67c5fa5 100644 (file)
--- 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 82b2515a272a09313a772d4f69a2e240c66b1506..5cd83a7b8eb8b10a143cb0f4200521534eb91201 100644 (file)
--- 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 73e0b59032c90a1da7e2b8f9bfc0fd9593019587..169bb942ceb8f33cf3707ded11e162974ad04c42 100644 (file)
--- 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 a2d03fca20c772af1bf3bf8d3b6c59e7a2a09e07..3ac6caf692e992e52833ff8a5482ee57c0dcd56a 100644 (file)
--- 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 2d5b5466ac7c8a6e7493dec65ecddf8c70ccf339..7a81803b8d595d97b724f04bf4d3bf74d89b87bf 100644 (file)
--- 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 c39275b2785951e0753b4403b8cf9d8a4afde7fe..ade0d1edcda3d769995497048378467fded4cde1 100644 (file)
--- 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 c3b4320fd0656275a8480824890a4b64785f5810..f0adbf53def1748dbcd7a7387613ee21239e17c4 100644 (file)
--- 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 f2e2484688c4697eaabfb48079d1e48c3e979afa..3aa0779b8a557050eb4ae6dd5940138bcd81eeda 100644 (file)
--- 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 90dc9651623f470cd279814cbc88f239ef829219..f29030cfa7ce5c413faa18d7a4eb3ae281a14163 100644 (file)
--- 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 d2b7ca456b629c31a55d0653d173a2d0c17934eb..983ea76f44bc0977c583c4685e7dddd6a2e5f7b2 100644 (file)
--- 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 403aa964ba05a111f65c2d33833367e3e9051a59..849825eb06b475584a8b119ec2d7d8233d0796f3 100644 (file)
--- 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 d3d47a56c8c04974bd6ea69c5d260f54fd2fb8bf..96a0372b1b3abe48038964c92c8150966c255394 100644 (file)
--- 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 7ad434381f94aca3b744f65246961fe5900235b0..8e4642d3bc27a93c6a8c51513a497225cb09ce62 100644 (file)
--- 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 04b8708d39ed8f3c21e8257d5678a26a37e6d8bb..ec473320e52fe680c52f4bbb8fed8bc95f24f218 100644 (file)
--- 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 c5d376443d72ab8504bfdc2eef28407ccb7cf441..c4e6d88be3769a609cd57e2aadaa6ff1656fa058 100644 (file)
--- 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 55c7e12ec2f3b6cef86bdcee94482e504e9a6c3c..bd2188b4c07703266e6ca8040a59613c186f7c71 100644 (file)
--- 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 890e2a3b74631ae81f2d9868716f34a8e00be068..13124d13d746b1f241a865015278d648eadbb99b 100644 (file)
--- 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 b52fade0d395599439e55d79800abfbd1c394035..684df5ef1efcacfa7e950d829d74d7bb44fa3542 100644 (file)
--- 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 b2708ad4de6e327dc94cb989685edafc4df531a1..0819b6ca01416f2d29bd246d4655bfff460e99b5 100644 (file)
--- 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 dfc0577678c6feaf2ff08c5f7ab11d02e5294ad5..bafd302aa5ce4f25a6e474e0c998522b8355bae5 100644 (file)
--- 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 5fa72736af15ad77fc6b2f6cd5d0926589e60607..5b0b4669531f3f1ce40c4ce554a2458d67aacf06 100644 (file)
--- 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 c171615da1dd7c2a81a5e2f1bcf4b0815583a446..7f8232bb24bedf96071b30d06f934d1fb4748411 100644 (file)
--- 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 13b9600883babf539a31ac118b991bf88f51ce4e..1c1b8d8bc458cb08eda87c9b64bd0759e194301e 100644 (file)
--- 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 82c0fc8126295df200de201c22aadaf0c2cd7419..541355af8682bce4d7d1bf9ec9117474233b5414 100644 (file)
--- 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 1097b29dff66a1fb043b746ad4e4c3c45e95d1cc..cd16dd1928827d95bc52a8decd23c731aaa7bc8e 100644 (file)
--- 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 84eaeebf097964b2675110c8bc944a1df416f596..b1144d1cddef3195f92986f0edcddd6f4433cb77 100644 (file)
--- 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 1d82273f289dde531f3c5da45f6ac73b2e32cb3a..36d1f2db665d95d59956bf6839491aa2a8ffcfae 100644 (file)
--- 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 79751b7c72828bd37679bbcee7e1d7c031d18e6a..3be446e847217a7e1358d5f3e2f35bbe2f69578c 100644 (file)
--- 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 603492dbb3c999d959377f38ddba09028b2f69ea..11609d9dabc151990d8b425483fa54346cd2c68b 100644 (file)
--- 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 6881a56d70a703722bc49a8f674074b24ec3d75d..6cd544e74d5cd4ed0e774211b1b807ed848bf1bc 100644 (file)
--- 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 7693285c90089a14226340d50445c84cb591f4a9..40ee15fcbb55114651ad7bca5a6c586ad3452030 100644 (file)
--- 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 11202dbf68d916ef01abb4d758788c2338e01d24..83c9d152a7a7b628b84cd75e63459d63bbe13801 100644 (file)
--- 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 1ae91b9c0e513084ab68407763d00a903c08e542..fb121ce745462a22b6099fedacc2380f34e8c3eb 100644 (file)
--- 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 de1f00f1590c435bdc1b80f660b64384ca833e3a..21e34f6786911734583ec6cb063083e0a56ec954 100644 (file)
--- 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 d356e6594a9443c06dc44a8aec3f8b1a84f336c2..4634066c45c5cbdefd8c24579e9b5ce188d2aec1 100644 (file)
--- 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 54ae4db53175b2fd22433da2570ed866bb96f863..682aef35fce50b400a8455981a6cab738fa36bff 100644 (file)
--- 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 e0892d80a489a60791fdcc250d2c3cd40840e23e..0dc4c427c238c156bfcd12ca4bbb0b23c740a448 100644 (file)
--- 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 6730e48592c771bb194b882c7736eaebc6e614e9..4e58031dd005b06350cf49cdb2c905095b891d33 100644 (file)
--- 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 e9277f1d2b6a059c3315c3e05fa02652445f3064..d2bf21000774798ff0f9df1491ac37a7e9c02906 100644 (file)
--- 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 c122cc7533c923b4893c821d9fb17395ba206c4f..7ff5d05d0ce81c27ef858e6c231bac5888dd5bfd 100644 (file)
--- 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 ad5890c6c90db91207b6472c13e4a4afeefe0b06..b9761071e991f5f66f6ff27d787a63354f0ee2a3 100644 (file)
--- 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 cc8d3d91ffd1092388c682c30a8a3bdb917720cd..6a35f2019c088d02abadd3d2f5645ac465a1d932 100644 (file)
--- 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 2daa7fafb2dbd15924ef05e60c3ee6a63bbe5bf3..ee58bff1c66c1ec0ee7584b52578979a717ad84d 100644 (file)
--- 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 8f953c71edef1b8def2a92beece4ceaa8cd22f62..244bd40234c6c55ce94fde1660656e2e6e2c9245 100644 (file)
--- 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 d22e828151e9cf848195265579c96443bb2bfdf5..236de5a385b36e2b671b9f1c6aa66d1e99e2efaf 100644 (file)
--- 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 3b6950d60ab01da5e44cc6e8748b97a99b772481..55205bb1f95008c972cb7840c8328a93744a0c0d 100644 (file)
--- 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 a92e9341c58e7b82b9229c6bd250f73cbe802bf5..63f45cf373db45fb825d86f6ba978a6ce48b9b0c 100644 (file)
--- 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 989d7f17c24e4bae1c4102d8ec8889fe5a390faf..ad74c5ff4de773dd4e231379f50bf11c63975f11 100644 (file)
--- 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 c47916f64bcdb1db2c05a16259db1ae2844ff6b9..b50f698b49844649cc354cbf7b7807005e6c689a 100644 (file)
--- 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 63d6d8ca1f47205ea35c7422ee6451f7c254bb2c..b40ce55c895ccc906a5678a4110b7988c2c0095f 100644 (file)
--- 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 c9e2b8bafdfd45e8a257483136fd530d94197890..5e4fa7ae226d36e46b3ddf859a4f0df2b247435a 100644 (file)
--- 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 3aec69f4529c22563392973d79f792aecf3be500..1faaed648ab9bb3a2b1f8d0bbc2121b746403b6c 100644 (file)
--- 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 f75e59449f1d9c41554f7539ae9c2d0316bf6311..1d0059e8037946c8eb05d3db0ad75bd648e51dec 100644 (file)
--- 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 133fe4dfd4f8c0cb95dfc938045acdc726329034..219161819a4ff109add0d86942efcae02e5e4e34 100644 (file)
--- 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 02d54635276f3303bf168820ee3277731f6b7c3a..4b64ea4bb53bcd92c204160d2b7076488fdc9709 100644 (file)
--- 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 c2f61c83bc360916a770058a44268d4893937582..e7ede26c0c12a0fa48600ca9a4922a635b8e567b 100644 (file)
--- 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 c4cc26e7148f3d90e9241683ffd23fe49a836ea7..04157f77eaadb5f5a69a2a68e2dfbd2e51a1fed3 100644 (file)
--- 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 41ba00e1966e31f58b8932d73c1b0df4cd30ec9c..eb2eb9c50d9721dbff9d0d7e02be94a7e7246425 100644 (file)
--- 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 f9b155126c7aa1dec5cc0e63e882ff08d1a409d3..4c966854276dd056e186adad71a24ea27c331d4e 100644 (file)
--- 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 ebbadadf5cb2f4ae972c313535a85f442e922825..54856a2363b211a0a220453240911bc29bbe32ad 100644 (file)
--- 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 c13850a83f5ce9313d17c29a9a24dc6c17ffd1ac..e6e8a5687ef17198059d42c91b8e7f9e6ba2680d 100644 (file)
--- 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 47f6041bb6bb82a1bc6c43d2089833d06961da15..9142ad8816e1e3bfd3cbaf7baeb0319cb7c6d4d1 100644 (file)
--- 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 c23fcfb9b4047b7d0ced7e5499e3322e4311dafe..9a0ca0fd28df61d21b926c224e1639e73f227507 100644 (file)
--- 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 6b42ce5cb61d081ae76d644f91dff7fa60cd28be..db9d0bbe449c4d592db52de2c1b373d4adad06ac 100644 (file)
--- 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 24bd10599a3826627a26e934e2b6ba17b1492660..99356f20a4b7d41384d467df0a73a267c87e1827 100644 (file)
--- 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 9605b7302df2268c9e73183eb9d5a304c306889c..4d4af2fffc643647cb51c9b272e06ec16aad537c 100644 (file)
--- 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 3f5350105a72ae67d7e96245326df18fba2b9c68..bdda05d97c5ce4a91605e95d8f2f95c2b911345e 100644 (file)
--- 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 be899b3d9c37eb5bc51d2ba84fd64286e9907e91..a15a9c1111281e1325d4f34e7ddeaca22f1bf7d1 100644 (file)
--- 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 67cbe842be0995c57e0dbe7598bb5193e0b0842d..ec30c3995ba7165c70bdba84ec73260d49f5834b 100644 (file)
--- 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 0e3963db00e2b1ce6f4cb6728f2cab1a1885ab54..6e95bfbcafa7cc8610ead6edcc01fa346b9e545f 100644 (file)
--- 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 da4ecf2fe294ff585dd80a46929d0b872d852420..48846426d231b3d460481fec9abc730cb788170f 100644 (file)
--- 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 065842c641f99aff10a2bbc16b2d4d6e2cd7c259..f591e55f0fe90e2dbb0b5d451cd9377a7fcc5fc3 100644 (file)
--- 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 5f1a5dfca0189c0f0c067a2e87dabd017ed6fb15..935f35d1eb8d6ca0d0a617542eb4627492a423a5 100644 (file)
--- 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 fda3b63e71004c993694fb4d9381855c0f5d2361..5bd198120bddaba6984f9588401089d7080ee5a8 100644 (file)
--- 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 bfec4994e82d140f10d986b18d706f5ada7a09df..afe1d6a73b624f9a7be868c01238c8276ed93217 100644 (file)
--- 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 1960bcd5cdb2d5097b60bf71b0afa44cdd1d4365..6c7e7d9b4fa18d9a99b5f2af500cb957a9070c21 100644 (file)
--- 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 21e17fcec197db98a109a0c2e166e27f4d440797..ba054e31a0d19b76b1efddc2410bf59d11f9ed0c 100644 (file)
--- 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 d1b18742989e98667531ae42305146e2ea55aa62..a54bbe24e033da746409cc2ba61dd698aa0cd14e 100644 (file)
--- 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 e48c0c5b515c1f2e11581d651353762d230fbcdb..232d9838d6f2d7bfcf41608b583f6941555b1981 100644 (file)
--- 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 6b7c11c8c044b3bdf864b7c740c40553daf91232..0b4164b261aaefc2f44b6a679cd7c2c7c34a3314 100644 (file)
--- 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 dbfeceec776615c4aa52bffb754e768cb289c55d..aed6071bfcc0a4e8e165c3624cf2980ff2c357d7 100644 (file)
--- 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 796723ac3092c299323a9de1b7f4a40d2ebb93fb..1baf88f2575c68e9f91fb188131e00925e107254 100644 (file)
--- 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 8af256c412ae93ed8cb104eace0f0fdf674d8828..ef5c1f959efbe75b0a62925f815c97092c4f1b00 100644 (file)
--- 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 a8d4cd39152f2c82c1e20313017002e01c86b711..1cbc26740095789d8afbfbd14ebc6e9c94d9ffe3 100644 (file)
--- 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 b3adab9ac2984d0b4c37ebe95646e83db7e73e19..25cc296f7a0ffb23c0acbd495e2a00421d68224c 100644 (file)
--- 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 9b3f4eeea1a4008f576936a7ec5041c715ae0419..66c4e5190796f4c9a1916af1008337fec190d5d8 100644 (file)
--- 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 4299c333527c2fb2d6bd599385c95cebc58181a4..aea8604e2200ab70fe325f4d214e4fd67169b1d1 100644 (file)
--- 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 a39fafa751c6bb0305d765bd8440060c7c65c404..dc6ec430db965455aa24e5d3e3eab37010de1820 100644 (file)
--- 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 2660219250fc26de8f73293d76a273c6ce7e1fe9..62dbc5cdf0767719288a15da147ae33f74dcd958 100644 (file)
--- 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 ea621da89874d1b84762e50f69604f718ffd4bed..754806dc190e304a9f9f829e5a174f5d74befbcc 100644 (file)
--- 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 62dbc450c4e147a22ea99cbda7f66f76ddbbb4ee..7def8f92aa1982abdf2740e05a1c695e23f39e5e 100644 (file)
--- 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 d236314e2530017af8ecb928d225c4f68795bda7..74d6c76e8d08bd6226fdd40eb0d58d309b0281f1 100644 (file)
--- 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 568768f7b8a8415e11234a8196e8a66e6ad92fdd..cd2612724aa995787f713ebfb773d63dcc6d8216 100644 (file)
--- 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 aef1ad4c36458f85ada71f7dff6ec9790c399b33..6da8bd8913c4fcddd71940d72a440f56b3a936f9 100644 (file)
--- 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 bdd991298d059b80a8004bf9bb2ae623ababd428..358bbb839531c02b6143becf05912b7051c3b467 100644 (file)
--- 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 0eed1ce2ea657df4814b3f19a71fc15c790436c8..c8c286cb3eccb992acca7f8f10ea13c77b9e2798 100644 (file)
--- 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 50ec31bfbb65927f2b6916fd63cee7b2179015be..64f9880482d31d41ca359c3170fef63753f586f8 100644 (file)
--- 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 afbaa821b65a33eec585dc30c61491384bc216dc..9edd50a19fa146e87de0141e3c4e0a204f00bcd4 100644 (file)
--- 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 fa33bea0dc8d71dc54d48f0ee6c1a8edfd0cd226..a62bcdb0eedf936a3f63cf89f01b0a15a6ffc2be 100644 (file)
--- 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 c42c4ad62956f559f0d69606ba5fa6dfde8b22d9..599083b18227a2752b744f71eb7882e2f23685c9 100644 (file)
--- 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 e1442de16fbf6eeab3fb0d49ce43d6b16568faed..f28db60b573a16afa1090e01aabb8da12f7f4fd6 100644 (file)
--- 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 cd67afd39a49bdef8d69acebc445c18f286ee4fb..c970757568659cb2f7f8f0a71460d0e12840acd6 100644 (file)
--- 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.
  *