diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-12-11 21:33:03 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-12-13 12:34:07 +0100 |
| commit | f2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch) | |
| tree | 0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/third_party/libjpeg | |
| parent | 5362912cdb5eea702b68ebe23702468d17c3017a (diff) | |
| download | qtwebengine-chromium-f2a33ff9cbc6d19943f1c7fbddd1f23d23975577.tar.gz | |
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/third_party/libjpeg')
| -rw-r--r-- | chromium/third_party/libjpeg/README.chromium | 3 | ||||
| -rw-r--r-- | chromium/third_party/libjpeg/google.jdmarker.patch | 17 | ||||
| -rw-r--r-- | chromium/third_party/libjpeg/jdmarker.c | 6 |
3 files changed, 26 insertions, 0 deletions
diff --git a/chromium/third_party/libjpeg/README.chromium b/chromium/third_party/libjpeg/README.chromium index 70ef475f452..6b1aecc94a1 100644 --- a/chromium/third_party/libjpeg/README.chromium +++ b/chromium/third_party/libjpeg/README.chromium @@ -20,3 +20,6 @@ along with all of the frontend files for doing utility programs. We added a new file jpeglibmangler.h and included it from jpeglib.h that changes the names of all externally visible functions to chromium_ijg_* so that we can avoid conflicts that arise when system libraries attempt to use our libjpeg. + +Also patch in google.jdmarker.patch to better handle multiple SOS CSi values and +their ordering. diff --git a/chromium/third_party/libjpeg/google.jdmarker.patch b/chromium/third_party/libjpeg/google.jdmarker.patch new file mode 100644 index 00000000000..0a0c073df47 --- /dev/null +++ b/chromium/third_party/libjpeg/google.jdmarker.patch @@ -0,0 +1,17 @@ +diff --git a/third_party/libjpeg/jdmarker.c b/third_party/libjpeg/jdmarker.c +index f4cca8c..c9325af 100644 +--- a/third_party/libjpeg/jdmarker.c ++++ b/third_party/libjpeg/jdmarker.c +@@ -342,6 +342,12 @@ get_sos (j_decompress_ptr cinfo) + + TRACEMS3(cinfo, 1, JTRC_SOS_COMPONENT, cc, + compptr->dc_tbl_no, compptr->ac_tbl_no); ++ ++ /* This CSi (cc) should differ from the previous CSi */ ++ for (ci = 0; ci < i; ci++) { ++ if (cinfo->cur_comp_info[ci] == compptr) ++ ERREXIT1(cinfo, JERR_BAD_COMPONENT_ID, cc); ++ } + } + + /* Collect the additional scan parameters Ss, Se, Ah/Al. */ diff --git a/chromium/third_party/libjpeg/jdmarker.c b/chromium/third_party/libjpeg/jdmarker.c index f4cca8cc835..c9325af233b 100644 --- a/chromium/third_party/libjpeg/jdmarker.c +++ b/chromium/third_party/libjpeg/jdmarker.c @@ -342,6 +342,12 @@ get_sos (j_decompress_ptr cinfo) TRACEMS3(cinfo, 1, JTRC_SOS_COMPONENT, cc, compptr->dc_tbl_no, compptr->ac_tbl_no); + + /* This CSi (cc) should differ from the previous CSi */ + for (ci = 0; ci < i; ci++) { + if (cinfo->cur_comp_info[ci] == compptr) + ERREXIT1(cinfo, JERR_BAD_COMPONENT_ID, cc); + } } /* Collect the additional scan parameters Ss, Se, Ah/Al. */ |