summaryrefslogtreecommitdiff
path: root/jerror.c
diff options
context:
space:
mode:
authorLeon Scroggins III <scroggo@google.com>2018-07-16 10:43:45 -0400
committerLeon Scroggins <scroggo@google.com>2018-08-28 13:49:52 +0000
commit3993b37fb9b483af215e7e3712e5087d7f35b9c7 (patch)
treea279b3c434699ae6969c7c36068cf79b86cf0d21 /jerror.c
parentf5c8ca7bb600d1e5488f65c6d5447b19b18d899c (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 'jerror.c')
-rw-r--r--jerror.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/jerror.c b/jerror.c
index c31acd9..936c4f5 100644
--- a/jerror.c
+++ b/jerror.c
@@ -44,7 +44,7 @@
* want to refer to it directly.
*/
-#define JMESSAGE(code,string) string ,
+#define JMESSAGE(code, string) string,
const char * const jpeg_std_message_table[] = {
#include "jerror.h"
@@ -66,7 +66,7 @@ const char * const jpeg_std_message_table[] = {
*/
METHODDEF(void)
-error_exit (j_common_ptr cinfo)
+error_exit(j_common_ptr cinfo)
{
/* Always display the message */
(*cinfo->err->output_message) (cinfo);
@@ -94,7 +94,7 @@ error_exit (j_common_ptr cinfo)
*/
METHODDEF(void)
-output_message (j_common_ptr cinfo)
+output_message(j_common_ptr cinfo)
{
char buffer[JMSG_LENGTH_MAX];
@@ -124,7 +124,7 @@ output_message (j_common_ptr cinfo)
*/
METHODDEF(void)
-emit_message (j_common_ptr cinfo, int msg_level)
+emit_message(j_common_ptr cinfo, int msg_level)
{
struct jpeg_error_mgr *err = cinfo->err;
@@ -153,7 +153,7 @@ emit_message (j_common_ptr cinfo, int msg_level)
*/
METHODDEF(void)
-format_message (j_common_ptr cinfo, char *buffer)
+format_message(j_common_ptr cinfo, char *buffer)
{
struct jpeg_error_mgr *err = cinfo->err;
int msg_code = err->msg_code;
@@ -208,7 +208,7 @@ format_message (j_common_ptr cinfo, char *buffer)
*/
METHODDEF(void)
-reset_error_mgr (j_common_ptr cinfo)
+reset_error_mgr(j_common_ptr cinfo)
{
cinfo->err->num_warnings = 0;
/* trace_level is not reset since it is an application-supplied parameter */
@@ -227,7 +227,7 @@ reset_error_mgr (j_common_ptr cinfo)
*/
GLOBAL(struct jpeg_error_mgr *)
-jpeg_std_error (struct jpeg_error_mgr *err)
+jpeg_std_error(struct jpeg_error_mgr *err)
{
err->error_exit = error_exit;
err->emit_message = emit_message;
@@ -241,7 +241,7 @@ jpeg_std_error (struct jpeg_error_mgr *err)
/* Initialize message table pointers */
err->jpeg_message_table = jpeg_std_message_table;
- err->last_jpeg_message = (int) JMSG_LASTMSGCODE - 1;
+ err->last_jpeg_message = (int)JMSG_LASTMSGCODE - 1;
err->addon_message_table = NULL;
err->first_addon_message = 0; /* for safety */