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 /jcstest.c | |
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 'jcstest.c')
-rw-r--r-- | jcstest.c | 24 |
1 files changed, 12 insertions, 12 deletions
@@ -35,10 +35,10 @@ #include <setjmp.h> #ifndef JCS_EXTENSIONS -#define JCS_EXT_RGB 6 +#define JCS_EXT_RGB 6 #endif #if !defined(JCS_EXTENSIONS) || !defined(JCS_ALPHA_EXTENSIONS) -#define JCS_EXT_RGBA 12 +#define JCS_EXT_RGBA 12 #endif static char lasterror[JMSG_LENGTH_MAX] = "No error"; @@ -51,13 +51,13 @@ typedef struct _error_mgr { static void my_error_exit(j_common_ptr cinfo) { error_mgr *myerr = (error_mgr *)cinfo->err; - (*cinfo->err->output_message)(cinfo); + (*cinfo->err->output_message) (cinfo); longjmp(myerr->jb, 1); } static void my_output_message(j_common_ptr cinfo) { - (*cinfo->err->format_message)(cinfo, lasterror); + (*cinfo->err->format_message) (cinfo, lasterror); } int main(void) @@ -67,11 +67,11 @@ int main(void) error_mgr jerr; printf("libjpeg-turbo colorspace extensions:\n"); - #if JCS_EXTENSIONS +#if JCS_EXTENSIONS printf(" Present at compile time\n"); - #else +#else printf(" Not present at compile time\n"); - #endif +#endif cinfo.err = jpeg_std_error(&jerr.pub); jerr.pub.error_exit = my_error_exit; @@ -90,7 +90,7 @@ int main(void) jpeg_default_colorspace(&cinfo); jcs_valid = 1; - done: +done: if (jcs_valid) printf(" Working properly\n"); else @@ -98,11 +98,11 @@ int main(void) lasterror); printf("libjpeg-turbo alpha colorspace extensions:\n"); - #if JCS_ALPHA_EXTENSIONS +#if JCS_ALPHA_EXTENSIONS printf(" Present at compile time\n"); - #else +#else printf(" Not present at compile time\n"); - #endif +#endif if (setjmp(jerr.jb)) { /* this will execute if libjpeg has an error */ @@ -114,7 +114,7 @@ int main(void) jpeg_default_colorspace(&cinfo); jcs_alpha_valid = 1; - done2: +done2: if (jcs_alpha_valid) printf(" Working properly\n"); else |