diff options
author | Jun Fang <jun_fang@foxitsoftware.com> | 2015-10-13 15:28:55 +0800 |
---|---|---|
committer | Jun Fang <jun_fang@foxitsoftware.com> | 2015-10-13 00:49:26 -0700 |
commit | e865ed12c4a476a4c74bf1ae97d3a6fa8ca06f0a (patch) | |
tree | 9b2bad54f5afe41a627b0848347c3442f3c33635 /third_party/libopenjpeg20/0000-use-colorspace.patch | |
parent | a8a39e25af3c19bb91434fdf367cffa0e1536934 (diff) | |
download | pdfium-e865ed12c4a476a4c74bf1ae97d3a6fa8ca06f0a.tar.xz |
upgrade openjpeg to commit# cf352af
BUG=457480,497355
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1338973005 .
Diffstat (limited to 'third_party/libopenjpeg20/0000-use-colorspace.patch')
-rw-r--r-- | third_party/libopenjpeg20/0000-use-colorspace.patch | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/third_party/libopenjpeg20/0000-use-colorspace.patch b/third_party/libopenjpeg20/0000-use-colorspace.patch index 92f83a2291..b40692ce13 100644 --- a/third_party/libopenjpeg20/0000-use-colorspace.patch +++ b/third_party/libopenjpeg20/0000-use-colorspace.patch @@ -1,25 +1,27 @@ -diff -u a/jp2.c b/jp2.c ---- a/jp2.c -+++ b/jp2.c -@@ -1429,7 +1429,7 @@ - /* 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)); - } +diff --git a/third_party/libopenjpeg20/jp2.c b/third_party/libopenjpeg20/jp2.c +index 8bf60f6..47f83a1 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)); + } -diff -u a/openjpeg.h b/openjpeg.h ---- a/openjpeg.h -+++ b/openjpeg.h -@@ -677,6 +677,9 @@ +diff --git a/third_party/libopenjpeg20/openjpeg.h b/third_party/libopenjpeg20/openjpeg.h +index c07e9c8..e571672 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; + -+ /** 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; |