| Index: jversion.h
|
| diff --git a/jversion.h b/jversion.h
|
| index c37651b06df053d181a49bfadfed50925d6699e0..6ce663d82acf196a3bab06c427e9c7fb7f6310e4 100644
|
| --- a/jversion.h
|
| +++ b/jversion.h
|
| @@ -3,9 +3,10 @@
|
| *
|
| * This file was part of the Independent JPEG Group's software:
|
| * Copyright (C) 1991-2012, Thomas G. Lane, Guido Vollbeding.
|
| - * Modifications:
|
| - * Copyright (C) 2010, 2012-2014, D. R. Commander.
|
| - * For conditions of distribution and use, see the accompanying README file.
|
| + * libjpeg-turbo Modifications:
|
| + * Copyright (C) 2010, 2012-2016, D. R. Commander.
|
| + * For conditions of distribution and use, see the accompanying README.ijg
|
| + * file.
|
| *
|
| * This file contains software version identification.
|
| */
|
| @@ -13,20 +14,36 @@
|
|
|
| #if JPEG_LIB_VERSION >= 80
|
|
|
| -#define JVERSION "8d 15-Jan-2012"
|
| +#define JVERSION "8d 15-Jan-2012"
|
|
|
| #elif JPEG_LIB_VERSION >= 70
|
|
|
| -#define JVERSION "7 27-Jun-2009"
|
| +#define JVERSION "7 27-Jun-2009"
|
|
|
| #else
|
|
|
| -#define JVERSION "6b 27-Mar-1998"
|
| +#define JVERSION "6b 27-Mar-1998"
|
|
|
| #endif
|
|
|
| -#define JCOPYRIGHT "Copyright (C) 1991-2012 Thomas G. Lane, Guido Vollbeding\n" \
|
| - "Copyright (C) 1999-2006 MIYASAKA Masaru\n" \
|
| - "Copyright (C) 2009 Pierre Ossman for Cendio AB\n" \
|
| - "Copyright (C) 2009-2014 D. R. Commander\n" \
|
| - "Copyright (C) 2009-2011 Nokia Corporation and/or its subsidiary(-ies)"
|
| +/*
|
| + * NOTE: It is our convention to place the authors in the following order:
|
| + * - libjpeg-turbo authors (2009-) in descending order of the date of their
|
| + * most recent contribution to the project, then in ascending order of the
|
| + * date of their first contribution to the project
|
| + * - Upstream authors in descending order of the date of the first inclusion of
|
| + * their code
|
| + */
|
| +
|
| +#define JCOPYRIGHT "Copyright (C) 2009-2016 D. R. Commander\n" \
|
| + "Copyright (C) 2011-2016 Siarhei Siamashka\n" \
|
| + "Copyright (C) 2015-2016 Matthieu Darbois\n" \
|
| + "Copyright (C) 2015 Google, Inc.\n" \
|
| + "Copyright (C) 2013-2014 MIPS Technologies, Inc.\n" \
|
| + "Copyright (C) 2013 Linaro Limited\n" \
|
| + "Copyright (C) 2009-2011 Nokia Corporation and/or its subsidiary(-ies)\n" \
|
| + "Copyright (C) 2009 Pierre Ossman for Cendio AB\n" \
|
| + "Copyright (C) 1999-2006 MIYASAKA Masaru\n" \
|
| + "Copyright (C) 1991-2016 Thomas G. Lane, Guido Vollbeding" \
|
| +
|
| +#define JCOPYRIGHT_SHORT "Copyright (C) 1991-2016 The libjpeg-turbo Project and many others"
|
|
|