summaryrefslogtreecommitdiff
path: root/third_party/libopenjpeg20/0007-jp2_read_cmap.patch
diff options
context:
space:
mode:
authorNicolas Pena <npm@chromium.org>2017-09-01 13:25:16 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-09-05 14:10:37 +0000
commit088ca03f25fe1f6d75c0ff3b71e0ad3d018a5e0c (patch)
tree27f55db27d9112910d9219efa58474a0c2bd9b52 /third_party/libopenjpeg20/0007-jp2_read_cmap.patch
parent740bcd892d22136873b2b123b94e51bf6e77b8f9 (diff)
downloadpdfium-088ca03f25fe1f6d75c0ff3b71e0ad3d018a5e0c.tar.xz
Upgrade OpenJPEG to 2.2.0
This CL upgrades OpenJPEG by copying the files from 2.2.0 and then applying patches. Patch files that are no longer relevant are deleted. The relevant ones are applied manually due to changes in formatting in OpenJPEG. Patch 34 is added to account for opj_malloc changes in PDFium. Bug: chromium:718731 Change-Id: I3d316893eab5e235c9f71222a6818b8ae0c98383 Reviewed-on: https://pdfium-review.googlesource.com/12770 Commit-Queue: dsinclair <dsinclair@chromium.org> Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'third_party/libopenjpeg20/0007-jp2_read_cmap.patch')
-rw-r--r--third_party/libopenjpeg20/0007-jp2_read_cmap.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/third_party/libopenjpeg20/0007-jp2_read_cmap.patch b/third_party/libopenjpeg20/0007-jp2_read_cmap.patch
index 30f9e4b2d7..4cc434099f 100644
--- a/third_party/libopenjpeg20/0007-jp2_read_cmap.patch
+++ b/third_party/libopenjpeg20/0007-jp2_read_cmap.patch
@@ -1,13 +1,13 @@
diff --git a/third_party/libopenjpeg20/jp2.c b/third_party/libopenjpeg20/jp2.c
-index 6e910a9..f3baca5 100644
+index 3ace09654..7ef7c9139 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,
+@@ -1296,7 +1296,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;
+ 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;