third_party/libopenjpeg20/0000-use-colorspace.patch - Issue 1416783002: Merge to M46: upgrade openjpeg to commit# cf352af

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: third_party/libopenjpeg20/0000-use-colorspace.patch

Issue 1416783002: Merge to M46: upgrade openjpeg to commit# cf352af (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@2490

Patch Set: Fix pdfium:168 since we are already half way there Created 5 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

OLD	NEW
(Empty)
	1 diff --git a/third_party/libopenjpeg20/jp2.c b/third_party/libopenjpeg20/jp2.c

	2 index 8bf60f6..47f83a1 100644

	3 --- a/third_party/libopenjpeg20/jp2.c

	4 +++ b/third_party/libopenjpeg20/jp2.c

	5 @@ -1508,7 +1508,7 @@ OPJ_BOOL opj_jp2_decode(opj_jp2_t *jp2,

	6 /* Part 1, I.5.3.4: Either both or none : */

	7 if( !jp2->color.jp2_pclr->cmap)

	8 opj_jp2_free_pclr(&(jp2->color));

	9 - else

	10 + else if (p_image->pdfium_use_colorspace)

	11 opj_jp2_apply_pclr(p_image, &(jp2->color));

	12 }

	13

	14 diff --git a/third_party/libopenjpeg20/openjpeg.h b/third_party/libopenjpeg20/op enjpeg.h

	15 index c07e9c8..e571672 100644

	16 --- a/third_party/libopenjpeg20/openjpeg.h

	17 +++ b/third_party/libopenjpeg20/openjpeg.h

	18 @@ -677,6 +677,9 @@ typedef struct opj_image {

	19 OPJ_BYTE *icc_profile_buf;

	20 /** size of ICC profile */

	21 OPJ_UINT32 icc_profile_len;

	22 +

	23 + /** Whether to apply PCLR or not */

	24 + OPJ_BOOL pdfium_use_colorspace;

	25 } opj_image_t;

	26

	27

OLD	NEW