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>

1 files changed, 2 insertions, 19 deletions

diff --git a/third_party/libopenjpeg20/README.pdfium b/third_party/libopenjpeg20/README.pdfium
index a90f28b0f1..143ca0fab3 100644
--- a/third_party/libopenjpeg20/README.pdfium
+++ b/third_party/libopenjpeg20/README.pdfium
@@ -1,6 +1,6 @@
 Name: OpenJPEG
 URL: http://www.openjpeg.org/
-Version: 0fa5a17c98c4b8f9ee2286f4f0a50cf52a5fccb0
+Version: 2.2.0 (also update in opj_config*)
 Security Critical: yes
 License: 2-clause BSD
 
@@ -10,37 +10,20 @@ JPEG 2000 library.
 Local Modifications:
 
 0000-use-colorspace.patch: Makes it possible to not call opj_jp2_apply_pclr().
-0001-image-data.patch: Fix a crasher in opj_j2k_update_image_data().
-0002-packet-iterator.patch: Fix integer overflow in opj_pi_create_decode().
 0003-dwt-decode.patch: Check array bounds for opj_dwt_decode_1() and friends.
-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 divide by zero bug in opj_tcd_init_tile().
 0007-jp2_read_cmap.patch: Fix wrong rendering on greyscale images with index colorspace.
-0008-jp2_check_color.patch: Replace an assertion with returning false.
 0009-opj_pi_next.patch: Fix potential bad precno value in opj_pi_next* functions.
-0010-pi_update_decode_poc.patch: Set proper upper bound for an array in opj_pi_update_decode_poc().
 0011-j2k_update_image_data.patch: Prevent bad signed -> unsigned casting.
 0012-mct_sse.patch: Don't use SSE intrinsics in 32-bit builds.
-0013-attrib_fix.patch: Don't needlessly redefine __attribute__, https://github.com/uclouvain/openjpeg/issues/727
 0014-opj_jp2_read_ihdr_leak.patch: Memory leak in opj_jp2_read_ihdr().
 0015-read_SPCod_SPCoc_overflow.patch: Prevent a buffer overflow in opj_j2k_read_SPCod_SPCoc.
 0016-read_SQcd_SQcc_overflow.patch: Prevent a buffer overflow in opj_j2k_read_SQcd_SQcc.
-0017-tcd_init_tile.patch: Prevent integer overflows during calculation of |l_nb_precinct_size|.
-0018-tcd_get_decoded_tile_size.patch: Fix an integer overflow in opj_tcd_get_decoded_tile_size.
 0019-tcd_init_tile.patch: Prevent integer overflows during calculation of |l_nb_code_blocks_size|.
-0020-opj_aligned_malloc.patch: Prevent overflows when using opj_aligned_malloc().
-0021-tcd_init_tile_negative.patch: Prevent negative x, y values in opj_tcd_init_tile.
 0022-jp2_apply_pclr_overflow.patch: Prevent integer overflow in opj_jp2_apply_pclr.
 0023-opj_j2k_read_mct_records.patch: Fix opj_j2k_read to prevent heap-use-after-free.
-0024-l_marker_size_check.patch: Return error before overflow in opj_j2k_read_header_procedure.
 0025-opj_j2k_add_mct_null_data.patch: Check m_data != null before trying to read from it.
 0026-use_opj_uint_ceildiv.patch: Remove (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)a, (OPJ_INT32) b).
-0027-undefined-shift-opj_t1_decode_cblk.patch: upstream fix for a ubsan bug.
-0028-upstream-check-size-in-opj_j2k_read_siz.patch: upstream patch in j2k.c.
-0029-avoid-division-by-0: fix some /0 and %0 in pi.c (caused by bad shifts).
-0030-undefined-shift-opj_get_all_encoding_parameters.patch: fix undefined shift in pi.c method.
-0031-undefined-shift-opj_bio_read.patch: fix undefined shift in bio.c method.
-0032-undefined-shift-opj_j2k_read_siz.patch: fix undefined shift in j2k.c method.
 0033-undefined-shift-opj_t1_dec_clnpass.patch: fix undefined shifts originated from opj_t1_decode_cblk.
-TODO(thestig): List all the other patches.
+0034-opj_malloc.patch: PDFium changes in opj_malloc.