Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(160)

Side by Side Diff: jversion.h

Issue 1953443002: Update to libjpeg_turbo 1.4.90 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « jutils.c ('k') | libjpeg.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * jversion.h 2 * jversion.h
3 * 3 *
4 * This file was part of the Independent JPEG Group's software: 4 * This file was part of the Independent JPEG Group's software:
5 * Copyright (C) 1991-2012, Thomas G. Lane, Guido Vollbeding. 5 * Copyright (C) 1991-2012, Thomas G. Lane, Guido Vollbeding.
6 * Modifications: 6 * libjpeg-turbo Modifications:
7 * Copyright (C) 2010, 2012-2014, D. R. Commander. 7 * Copyright (C) 2010, 2012-2016, D. R. Commander.
8 * For conditions of distribution and use, see the accompanying README file. 8 * For conditions of distribution and use, see the accompanying README.ijg
9 * file.
9 * 10 *
10 * This file contains software version identification. 11 * This file contains software version identification.
11 */ 12 */
12 13
13 14
14 #if JPEG_LIB_VERSION >= 80 15 #if JPEG_LIB_VERSION >= 80
15 16
16 #define JVERSION» "8d 15-Jan-2012" 17 #define JVERSION "8d 15-Jan-2012"
17 18
18 #elif JPEG_LIB_VERSION >= 70 19 #elif JPEG_LIB_VERSION >= 70
19 20
20 #define JVERSION» "7 27-Jun-2009" 21 #define JVERSION "7 27-Jun-2009"
21 22
22 #else 23 #else
23 24
24 #define JVERSION» "6b 27-Mar-1998" 25 #define JVERSION "6b 27-Mar-1998"
25 26
26 #endif 27 #endif
27 28
28 #define JCOPYRIGHT» "Copyright (C) 1991-2012 Thomas G. Lane, Guido Vollbedin g\n" \ 29 /*
29 » » » "Copyright (C) 1999-2006 MIYASAKA Masaru\n" \ 30 * NOTE: It is our convention to place the authors in the following order:
30 » » » "Copyright (C) 2009 Pierre Ossman for Cendio AB\n" \ 31 * - libjpeg-turbo authors (2009-) in descending order of the date of their
31 » » » "Copyright (C) 2009-2014 D. R. Commander\n" \ 32 * most recent contribution to the project, then in ascending order of the
32 » » » "Copyright (C) 2009-2011 Nokia Corporation and/or its su bsidiary(-ies)" 33 * date of their first contribution to the project
34 * - Upstream authors in descending order of the date of the first inclusion of
35 * their code
36 */
37
38 #define JCOPYRIGHT "Copyright (C) 2009-2016 D. R. Commander\n" \
39 "Copyright (C) 2011-2016 Siarhei Siamashka\n" \
40 "Copyright (C) 2015-2016 Matthieu Darbois\n" \
41 "Copyright (C) 2015 Google, Inc.\n" \
42 "Copyright (C) 2013-2014 MIPS Technologies, Inc.\n" \
43 "Copyright (C) 2013 Linaro Limited\n" \
44 "Copyright (C) 2009-2011 Nokia Corporation and/or its su bsidiary(-ies)\n" \
45 "Copyright (C) 2009 Pierre Ossman for Cendio AB\n" \
46 "Copyright (C) 1999-2006 MIYASAKA Masaru\n" \
47 "Copyright (C) 1991-2016 Thomas G. Lane, Guido Vollbedin g" \
48
49 #define JCOPYRIGHT_SHORT "Copyright (C) 1991-2016 The libjpeg-turbo Project and many others"
OLDNEW
« no previous file with comments | « jutils.c ('k') | libjpeg.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698