diff options
| author | Nicolas Pena <npm@chromium.org> | 2017-09-01 13:25:16 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-05 14:10:37 +0000 |
| commit | 088ca03f25fe1f6d75c0ff3b71e0ad3d018a5e0c (patch) | |
| tree | 27f55db27d9112910d9219efa58474a0c2bd9b52 /third_party/libopenjpeg20/0023-opj_j2k_read_mct_records.patch | |
| parent | 740bcd892d22136873b2b123b94e51bf6e77b8f9 (diff) | |
| download | pdfium-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/0023-opj_j2k_read_mct_records.patch')
| -rw-r--r-- | third_party/libopenjpeg20/0023-opj_j2k_read_mct_records.patch | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/third_party/libopenjpeg20/0023-opj_j2k_read_mct_records.patch b/third_party/libopenjpeg20/0023-opj_j2k_read_mct_records.patch index 6775f4f3dc..c8415ae4ee 100644 --- a/third_party/libopenjpeg20/0023-opj_j2k_read_mct_records.patch +++ b/third_party/libopenjpeg20/0023-opj_j2k_read_mct_records.patch @@ -1,30 +1,31 @@ diff --git a/third_party/libopenjpeg20/j2k.c b/third_party/libopenjpeg20/j2k.c -index 6346c2190..45187e8e6 100644 +index ed449684f..c5f9dd53e 100644 --- a/third_party/libopenjpeg20/j2k.c +++ b/third_party/libopenjpeg20/j2k.c -@@ -5129,6 +5129,7 @@ static OPJ_BOOL opj_j2k_read_mct ( opj_j2k_t *p_j2k, - OPJ_UINT32 l_tmp; - OPJ_UINT32 l_indix; - opj_mct_data_t * l_mct_data; -+ OPJ_BOOL new_mct = OPJ_FALSE; +@@ -5553,6 +5553,7 @@ static OPJ_BOOL opj_j2k_read_mct(opj_j2k_t *p_j2k, + OPJ_UINT32 l_tmp; + OPJ_UINT32 l_indix; + opj_mct_data_t * l_mct_data; ++ OPJ_BOOL new_mct = OPJ_FALSE; - /* preconditions */ - assert(p_header_data != 00); -@@ -5191,7 +5192,7 @@ static OPJ_BOOL opj_j2k_read_mct ( opj_j2k_t *p_j2k, - } - - l_mct_data = l_tcp->m_mct_records + l_tcp->m_nb_mct_records; -- ++l_tcp->m_nb_mct_records; -+ new_mct = OPJ_TRUE; + /* preconditions */ + assert(p_header_data != 00); +@@ -5640,7 +5641,7 @@ static OPJ_BOOL opj_j2k_read_mct(opj_j2k_t *p_j2k, } - if (l_mct_data->m_data) { -@@ -5221,6 +5222,9 @@ static OPJ_BOOL opj_j2k_read_mct ( opj_j2k_t *p_j2k, + l_mct_data = l_tcp->m_mct_records + l_tcp->m_nb_mct_records; +- ++l_tcp->m_nb_mct_records; ++ new_mct = OPJ_TRUE; + } + + if (l_mct_data->m_data) { +@@ -5672,6 +5673,9 @@ static OPJ_BOOL opj_j2k_read_mct(opj_j2k_t *p_j2k, - l_mct_data->m_data_size = p_header_size; + l_mct_data->m_data_size = p_header_size; -+ if (new_mct) { -+ ++l_tcp->m_nb_mct_records; -+ } - return OPJ_TRUE; ++ if (new_mct) { ++ ++l_tcp->m_nb_mct_records; ++ } + return OPJ_TRUE; } + |