diff options
author | Leon Scroggins III <scroggo@google.com> | 2018-07-16 10:43:45 -0400 |
---|---|---|
committer | Leon Scroggins <scroggo@google.com> | 2018-08-28 13:49:52 +0000 |
commit | 3993b37fb9b483af215e7e3712e5087d7f35b9c7 (patch) | |
tree | a279b3c434699ae6969c7c36068cf79b86cf0d21 /tjutil.h | |
parent | f5c8ca7bb600d1e5488f65c6d5447b19b18d899c (diff) |
Update libjpeg-turbo to 2.0.0
Bug: 78329453
Update to upstream at https://github.com/libjpeg-turbo/libjpeg-turbo/tree/2.0.0
This includes a fix for a bug that could result in an infinite loop.
ChangeLog.md contains detailed changes about the upstream library. Changes
I made are below:
- Remove files that are no longer in upstream, and include all current
files from upstream.
- Update various references to the version.
Android.bp:
- Update to build new files/files in new locations.
- Run bpfmt
README.android:
- Remove cherry-pick references, as they are no longer needed.
- Remove modification in jsimdext.inc, which no longer appears to be
necessary.
README.version:
- Use the github URL, as it is now the official upstream build
- Replace msarett as OWNER, as he no longer works on this project
- Update the version
Change-Id: Ie6cfee5a8f820f28656bbb305f500e75e7ce7915
Diffstat (limited to 'tjutil.h')
-rw-r--r-- | tjutil.h | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -27,21 +27,21 @@ */ #ifdef _WIN32 - #ifndef __MINGW32__ - #include <stdio.h> - #define snprintf(str, n, format, ...) \ - _snprintf_s(str, n, _TRUNCATE, format, __VA_ARGS__) - #endif - #define strcasecmp stricmp - #define strncasecmp strnicmp +#ifndef __MINGW32__ +#include <stdio.h> +#define snprintf(str, n, format, ...) \ + _snprintf_s(str, n, _TRUNCATE, format, __VA_ARGS__) +#endif +#define strcasecmp stricmp +#define strncasecmp strnicmp #endif #ifndef min - #define min(a,b) ((a)<(b)?(a):(b)) +#define min(a, b) ((a) < (b) ? (a) : (b)) #endif #ifndef max - #define max(a,b) ((a)>(b)?(a):(b)) +#define max(a, b) ((a) > (b) ? (a) : (b)) #endif -extern double gettime(void); +extern double getTime(void); |