third_party/libjpeg/google.jdmarker.patch - Issue 31603002: Merge 228354 "Better handle SOS CSi values and order"

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: third_party/libjpeg/google.jdmarker.patch

Issue 31603002: Merge 228354 "Better handle SOS CSi values and order" (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1599/src/

Patch Set: Created 7 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

OLD	NEW
1 diff --git a/third_party/libjpeg/jdmarker.c b/third_party/libjpeg/jdmarker.c	1 diff --git a/third_party/libjpeg/jdmarker.c b/third_party/libjpeg/jdmarker.c

2 index f4cca8c..c9325af 100644	2 index f4cca8c..c9325af 100644

3 --- a/third_party/libjpeg/jdmarker.c	3 --- a/third_party/libjpeg/jdmarker.c

4 +++ b/third_party/libjpeg/jdmarker.c	4 +++ b/third_party/libjpeg/jdmarker.c

5 @@ -342,6 +342,12 @@ get_sos (j_decompress_ptr cinfo)	5 @@ -342,6 +342,12 @@ get_sos (j_decompress_ptr cinfo)

6	6

7 TRACEMS3(cinfo, 1, JTRC_SOS_COMPONENT, cc,	7 TRACEMS3(cinfo, 1, JTRC_SOS_COMPONENT, cc,

8 compptr->dc_tbl_no, compptr->ac_tbl_no);	8 compptr->dc_tbl_no, compptr->ac_tbl_no);

9 +	9 +

10 + /* This CSi (cc) should differ from the previous CSi */	10 + /* This CSi (cc) should differ from the previous CSi */

11 + for (ci = 0; ci < i; ci++) {	11 + for (ci = 0; ci < i; ci++) {

12 + if (cinfo->cur_comp_info[ci] == compptr)	12 + if (cinfo->cur_comp_info[ci] == compptr)

13 + ERREXIT1(cinfo, JERR_BAD_COMPONENT_ID, cc);	13 + ERREXIT1(cinfo, JERR_BAD_COMPONENT_ID, cc);

14 + }	14 + }

15 }	15 }

16	16

17 /* Collect the additional scan parameters Ss, Se, Ah/Al. */	17 /* Collect the additional scan parameters Ss, Se, Ah/Al. */

OLD	NEW

« no previous file with comments | « third_party/libjpeg/README.chromium ('k') | third_party/libjpeg/jdmarker.c » ('j') | no next file with comments »