Fix wrong rendering on greyscale images with index colorspace
BUG=514514
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1536223002 .
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 0000000..30f9e4b
--- /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 e3d61e8..4d55857 100644
--- a/third_party/libopenjpeg20/README.pdfium
+++ b/third_party/libopenjpeg20/README.pdfium
@@ -16,4 +16,5 @@
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 6e910a9..f3baca5 100644
--- a/third_party/libopenjpeg20/jp2.c
+++ b/third_party/libopenjpeg20/jp2.c
@@ -1194,7 +1194,7 @@
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;
