diff options
| author | Jonathan Wright <jonathan.wright@arm.com> | 2020-08-05 11:42:22 +0100 |
|---|---|---|
| committer | Jonathan Wright <jonathan.wright@arm.com> | 2020-08-07 17:04:34 +0100 |
| commit | db870dfef8ab97950b4bdf22c66dd6c18326460b (patch) | |
| tree | 9862c1aa45d014815ec798992ecb43eff1bc8d42 /jconfigint.h | |
| parent | 341272d909285da90e44015ca41f956fd00b9dd8 (diff) | |
Update libjpeg-turbo to v2.0.5
Update Chromium's copy of libjpeg-turbo to the latest stable upstream
release (v2.0.5) and reapply our local changes documented in
README.chromium. This update addresses three CVEs - CVE-2018-19664,
CVE-2018-20330, CVE-2018-20330 - that do not affect Chromium. The
fixes do, however, satisfy UBSan - allowing Chromium's libjpeg-turbo
to be used in AOSP.
Cherry-pick one additional change[1] from upstream to prevent AArch64
Windows builds from failing.
[1] https://github.com/libjpeg-turbo/libjpeg-turbo/commit/6ee5d5f568fda1a7c6a49dd8995f2d89866ee42d
Bug: 922430
Bug: https://issuetracker.google.com/135180511
Change-Id: I146fe82f7a016ce393eb0d37aebe0b7c2492a9da
Diffstat (limited to 'jconfigint.h')
| -rw-r--r-- | jconfigint.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/jconfigint.h b/jconfigint.h index fc6ed05..10bcac7 100644 --- a/jconfigint.h +++ b/jconfigint.h @@ -15,11 +15,18 @@ #endif #endif +/* How to obtain thread-local storage */ +#if defined(_MSC_VER) && (defined(_WIN32) || defined(_WIN64)) +#define THREAD_LOCAL __declspec(thread) +#else +#define THREAD_LOCAL __thread +#endif + /* Define to the full name of this package. */ #define PACKAGE_NAME "libjpeg-turbo" /* Version number of package */ -#define VERSION "2.0.1" +#define VERSION "2.0.5" /* The size of `size_t', as computed by sizeof. */ #if __WORDSIZE==64 || defined(_WIN64) |