diff options
| author | Jun Fang <jun_fang@foxitsoftware.com> | 2015-12-21 00:16:21 +0800 |
|---|---|---|
| committer | Jun Fang <jun_fang@foxitsoftware.com> | 2015-12-21 00:16:21 +0800 |
| commit | e13aa30ebc64800b7e208e338ec5d520de2d2ebd (patch) | |
| tree | 067b5c86c59ff6576006e111ffaba5735d554fbb /third_party/libopenjpeg20 | |
| parent | 4880d1a168729d42be736293fb93b514802e4f12 (diff) | |
| download | pdfium-e13aa30ebc64800b7e208e338ec5d520de2d2ebd.tar.xz | |
Merge to XFA: Fix wrong rendering on greyscale images with index colorspace
BUG=514514
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1536223002 .
Merge branch 'xfa' of https://pdfium.googlesource.com/pdfium into xfa
Merge to XFA: Correct return values in CPDF_HintTables::CheckPage()
BUG=pdfium:329
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1529173005 .
Review URL: https://codereview.chromium.org/1539163002 .
Diffstat (limited to 'third_party/libopenjpeg20')
| -rw-r--r-- | third_party/libopenjpeg20/0007-jp2_read_cmap.patch | 13 | ||||
| -rw-r--r-- | third_party/libopenjpeg20/README.pdfium | 1 | ||||
| -rw-r--r-- | third_party/libopenjpeg20/jp2.c | 2 |
3 files changed, 15 insertions, 1 deletions
diff --git a/third_party/libopenjpeg20/0007-jp2_read_cmap.patch b/third_party/libopenjpeg20/0007-jp2_read_cmap.patch new file mode 100644 index 0000000000..30f9e4b2d7 --- /dev/null +++ b/third_party/libopenjpeg20/0007-jp2_read_cmap.patch @@ -0,0 +1,13 @@ +diff --git a/third_party/libopenjpeg20/jp2.c b/third_party/libopenjpeg20/jp2.c +index 6e910a9..f3baca5 100644 +--- a/third_party/libopenjpeg20/jp2.c ++++ b/third_party/libopenjpeg20/jp2.c +@@ -1194,7 +1194,7 @@ static OPJ_BOOL opj_jp2_read_cmap( opj_jp2_t * jp2, + + + for(i = 0; i < nr_channels; ++i) { +- opj_read_bytes(p_cmap_header_data, &l_value, 2); /* CMP^i */ ++ opj_read_bytes_BE(p_cmap_header_data, &l_value, 2); /* CMP^i */ + p_cmap_header_data +=2; + cmap[i].cmp = (OPJ_UINT16) l_value; + diff --git a/third_party/libopenjpeg20/README.pdfium b/third_party/libopenjpeg20/README.pdfium index e3d61e891c..4d5585713b 100644 --- a/third_party/libopenjpeg20/README.pdfium +++ b/third_party/libopenjpeg20/README.pdfium @@ -16,4 +16,5 @@ Local Modifications: 0004-j2k_read_mcc.patch: Move incrementing of l_tcp->m_nb_mcc_records to the right place. 0005-jp2_apply_pclr.patch: Fix out of bounds access. 0006-tcd_init_tile.patch: Fix a dividing zero bug in opj_tcd_init_tile(). +0007-jp2_read_cmap.patch: Fix wrong rendering on greyscale images with index colorspace. TODO(thestig): List all the other patches. diff --git a/third_party/libopenjpeg20/jp2.c b/third_party/libopenjpeg20/jp2.c index 6e910a911a..f3baca53bd 100644 --- a/third_party/libopenjpeg20/jp2.c +++ b/third_party/libopenjpeg20/jp2.c @@ -1194,7 +1194,7 @@ static OPJ_BOOL opj_jp2_read_cmap( opj_jp2_t * jp2, for(i = 0; i < nr_channels; ++i) { - opj_read_bytes(p_cmap_header_data, &l_value, 2); /* CMP^i */ + opj_read_bytes_BE(p_cmap_header_data, &l_value, 2); /* CMP^i */ p_cmap_header_data +=2; cmap[i].cmp = (OPJ_UINT16) l_value; |