summaryrefslogtreecommitdiff
path: root/jdmainct.h
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 /jdmainct.h
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 'jdmainct.h')
-rw-r--r--jdmainct.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/jdmainct.h b/jdmainct.h
index 3090301..37b201c 100644
--- a/jdmainct.h
+++ b/jdmainct.h
@@ -44,12 +44,12 @@ typedef my_main_controller *my_main_ptr;
LOCAL(void)
-set_wraparound_pointers (j_decompress_ptr cinfo)
+set_wraparound_pointers(j_decompress_ptr cinfo)
/* Set up the "wraparound" pointers at top and bottom of the pointer lists.
* This changes the pointer list state from top-of-image to the normal state.
*/
{
- my_main_ptr main_ptr = (my_main_ptr) cinfo->main;
+ my_main_ptr main_ptr = (my_main_ptr)cinfo->main;
int ci, i, rgroup;
int M = cinfo->_min_DCT_scaled_size;
jpeg_component_info *compptr;
@@ -62,10 +62,10 @@ set_wraparound_pointers (j_decompress_ptr cinfo)
xbuf0 = main_ptr->xbuffer[0][ci];
xbuf1 = main_ptr->xbuffer[1][ci];
for (i = 0; i < rgroup; i++) {
- xbuf0[i - rgroup] = xbuf0[rgroup*(M+1) + i];
- xbuf1[i - rgroup] = xbuf1[rgroup*(M+1) + i];
- xbuf0[rgroup*(M+2) + i] = xbuf0[i];
- xbuf1[rgroup*(M+2) + i] = xbuf1[i];
+ xbuf0[i - rgroup] = xbuf0[rgroup * (M + 1) + i];
+ xbuf1[i - rgroup] = xbuf1[rgroup * (M + 1) + i];
+ xbuf0[rgroup * (M + 2) + i] = xbuf0[i];
+ xbuf1[rgroup * (M + 2) + i] = xbuf1[i];
}
}
}