core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/openjpeg.c - Issue 589243004: Update openjpeg

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

Unified Diff: core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/openjpeg.c

Issue 589243004: Update openjpeg (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: Merge security fixes from openjpeg r2883 Created 6 years, 3 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:

Index: core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/openjpeg.c

diff --git a/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/openjpeg.c b/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/openjpeg.c

index 89bb75a552630ab832486989d806f82217a93a6b..05027de47daa2bb839f704ee7268e84d60b8ea67 100644

--- a/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/openjpeg.c

+++ b/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/openjpeg.c

@@ -574,7 +574,7 @@ opj_codec_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT p_format)

l_codec->m_codec_data.m_compression.opj_destroy = (void (*) (void *)) opj_j2k_destroy;

- l_codec->m_codec_data.m_compression.opj_setup_encoder = (void (*) ( void *,

+ l_codec->m_codec_data.m_compression.opj_setup_encoder = (OPJ_BOOL (*) ( void *,

opj_cparameters_t *,

struct opj_image *,

struct opj_event_mgr * )) opj_j2k_setup_encoder;

@@ -611,7 +611,7 @@ opj_codec_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT p_format)

l_codec->m_codec_data.m_compression.opj_destroy = (void (*) (void *)) opj_jp2_destroy;

- l_codec->m_codec_data.m_compression.opj_setup_encoder = (void (*) ( void *,

+ l_codec->m_codec_data.m_compression.opj_setup_encoder = (OPJ_BOOL (*) ( void *,

opj_cparameters_t *,

struct opj_image *,

struct opj_event_mgr * )) opj_jp2_setup_encoder;