From 088ca03f25fe1f6d75c0ff3b71e0ad3d018a5e0c Mon Sep 17 00:00:00 2001 From: Nicolas Pena Date: Fri, 1 Sep 2017 13:25:16 -0400 Subject: 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 Reviewed-by: dsinclair --- .../libopenjpeg20/0021-tcd_init_tile_negative.patch | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 third_party/libopenjpeg20/0021-tcd_init_tile_negative.patch (limited to 'third_party/libopenjpeg20/0021-tcd_init_tile_negative.patch') diff --git a/third_party/libopenjpeg20/0021-tcd_init_tile_negative.patch b/third_party/libopenjpeg20/0021-tcd_init_tile_negative.patch deleted file mode 100644 index 33694f81fc..0000000000 --- a/third_party/libopenjpeg20/0021-tcd_init_tile_negative.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/third_party/libopenjpeg20/tcd.c b/third_party/libopenjpeg20/tcd.c -index 9270efe..06eee4e 100644 ---- a/third_party/libopenjpeg20/tcd.c -+++ b/third_party/libopenjpeg20/tcd.c -@@ -706,9 +706,16 @@ static INLINE OPJ_BOOL opj_tcd_init_tile(opj_tcd_t *p_tcd, OPJ_UINT32 p_tile_no, - l_tx0 = l_cp->tx0 + p * l_cp->tdx; /* can't be greater than l_image->x1 so won't overflow */ - l_tile->x0 = (OPJ_INT32)opj_uint_max(l_tx0, l_image->x0); - l_tile->x1 = (OPJ_INT32)opj_uint_min(opj_uint_adds(l_tx0, l_cp->tdx), l_image->x1); -+ if (l_tile->x0 < 0 || l_tile->x1 < 0) { -+ return OPJ_FALSE; -+ } -+ - l_ty0 = l_cp->ty0 + q * l_cp->tdy; /* can't be greater than l_image->y1 so won't overflow */ - l_tile->y0 = (OPJ_INT32)opj_uint_max(l_ty0, l_image->y0); - l_tile->y1 = (OPJ_INT32)opj_uint_min(opj_uint_adds(l_ty0, l_cp->tdy), l_image->y1); -+ if (l_tile->y0 < 0 || l_tile->y1 < 0) { -+ return OPJ_FALSE; -+ } - - /* testcase 1888.pdf.asan.35.988 */ - if (l_tccp->numresolutions == 0) { -- cgit v1.2.3