diff options
| author | Chris Blume <cblume@chromium.org> | 2019-03-01 01:09:50 -0800 |
|---|---|---|
| committer | Chris Blume <cblume@chromium.org> | 2019-03-01 01:09:50 -0800 |
| commit | cca8c4dec783a048da6933c86028556622d7c355 (patch) | |
| tree | 8a7ff526cd8cbe3bf1bfaa4ec1c29fe3268ed51b /jconfigint.h | |
| parent | 61a2bbaa9aec89cb2c882d87ace6aba9aee49bb9 (diff) | |
Update libjpeg-turbo to v2.0.1
In order to apply some performance updates from ARM, we need to update
libjpeg-turbo. These performance updates have yielded a 50% speedup on
some devices.
This CL updates our copy of libjpeg-turbo to v2.0.1 and re-applies our
local patches. This patch also deletes some extra files which were not
being used locally.
Update our local patch that was applied to fix http://crbug.com/398235
(https://codereview.appspot.com/229430043/). The original patch
incorrectly removed "& 0xFF" which limited an array index to within
that array's bounds (effectively reverting
https://github.com/libjpeg-turbo/libjpeg-turbo/commit/fa1d18385d904d530b4aec83ab7757a33397de6e).
Restore the mask, making the array access safe and fixing a graphical
glitch which would otherwise be introduced by this change.
Bug:922430
Change-Id: I3860fdb424deecf7a17818ed09a640e632e71f8d
Diffstat (limited to 'jconfigint.h')
| -rw-r--r-- | jconfigint.h | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/jconfigint.h b/jconfigint.h index 99bfd4f..fc6ed05 100644 --- a/jconfigint.h +++ b/jconfigint.h @@ -1,7 +1,9 @@ -/* jconfigint.h. Generated from jconfigint.h.in by configure. */ /* libjpeg-turbo build number */ #define BUILD "" +/* Compiler's inline keyword */ +#undef inline + /* How to obtain function inlining. */ #ifndef INLINE #if defined(__GNUC__) @@ -17,7 +19,7 @@ #define PACKAGE_NAME "libjpeg-turbo" /* Version number of package */ -#define VERSION "1.4.90" +#define VERSION "2.0.1" /* The size of `size_t', as computed by sizeof. */ #if __WORDSIZE==64 || defined(_WIN64) @@ -25,3 +27,21 @@ #else #define SIZEOF_SIZE_T 4 #endif + +/* Define if your compiler has __builtin_ctzl() and sizeof(unsigned long) == sizeof(size_t). */ +#if defined(__GNUC__) +#define HAVE_BUILTIN_CTZL +#endif + +/* Define to 1 if you have the <intrin.h> header file. */ +#if defined(_MSC_VER) +#define HAVE_INTRIN_H 1 +#endif + +#if defined(_MSC_VER) && defined(HAVE_INTRIN_H) +#if (SIZEOF_SIZE_T == 8) +#define HAVEBITSCANFORWARD64 +#elif (SIZEOF_SIZE_T == 4) +#define HAVEBITSCANFORWARD +#endif +#endif |