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/0000-use-colorspace.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/0000-use-colorspace.patch')
| -rw-r--r-- | third_party/libopenjpeg20/0000-use-colorspace.patch | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/third_party/libopenjpeg20/0000-use-colorspace.patch b/third_party/libopenjpeg20/0000-use-colorspace.patch index b40692ce13..4d89efffbf 100644 --- a/third_party/libopenjpeg20/0000-use-colorspace.patch +++ b/third_party/libopenjpeg20/0000-use-colorspace.patch @@ -1,27 +1,28 @@ diff --git a/third_party/libopenjpeg20/jp2.c b/third_party/libopenjpeg20/jp2.c -index 8bf60f6..47f83a1 100644 +index f3ccb9974..882f1b649 100644 --- a/third_party/libopenjpeg20/jp2.c +++ b/third_party/libopenjpeg20/jp2.c -@@ -1508,7 +1508,7 @@ OPJ_BOOL opj_jp2_decode(opj_jp2_t *jp2, - /* Part 1, I.5.3.4: Either both or none : */ - if( !jp2->color.jp2_pclr->cmap) - opj_jp2_free_pclr(&(jp2->color)); -- else -+ else if (p_image->pdfium_use_colorspace) - opj_jp2_apply_pclr(p_image, &(jp2->color)); - } - +@@ -1624,7 +1624,7 @@ OPJ_BOOL opj_jp2_decode(opj_jp2_t *jp2, + /* Part 1, I.5.3.4: Either both or none : */ + if (!jp2->color.jp2_pclr->cmap) { + opj_jp2_free_pclr(&(jp2->color)); +- } else { ++ } else if (p_image->pdfium_use_colorspace) { + if (!opj_jp2_apply_pclr(p_image, &(jp2->color), p_manager)) { + return OPJ_FALSE; + } diff --git a/third_party/libopenjpeg20/openjpeg.h b/third_party/libopenjpeg20/openjpeg.h -index c07e9c8..e571672 100644 +index d571c516e..e8dbe4ff7 100644 --- a/third_party/libopenjpeg20/openjpeg.h +++ b/third_party/libopenjpeg20/openjpeg.h -@@ -677,6 +677,9 @@ typedef struct opj_image { - OPJ_BYTE *icc_profile_buf; - /** size of ICC profile */ - OPJ_UINT32 icc_profile_len; +@@ -682,6 +682,10 @@ typedef struct opj_image { + OPJ_BYTE *icc_profile_buf; + /** size of ICC profile */ + OPJ_UINT32 icc_profile_len; ++ + -+ /** Whether to apply PCLR or not */ -+ OPJ_BOOL pdfium_use_colorspace; ++ /** Whether to apply PCLR or not */ ++ OPJ_BOOL pdfium_use_colorspace; } opj_image_t; |