From b138aaae08d81965d0451465426d057aed3cbbfc Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Mon, 19 Sep 2011 13:18:19 +0000 Subject: WIP: manage the case of event_mgr is not provided to setup_decoder function --- libopenjpeg/openjpeg.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'libopenjpeg') diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c index 9c5db9e1..da3fe0d2 100644 --- a/libopenjpeg/openjpeg.c +++ b/libopenjpeg/openjpeg.c @@ -386,7 +386,16 @@ opj_bool OPJ_CALLCONV opj_setup_decoder_v2(opj_codec_t *p_info, opj_dparameters_ } l_info->m_codec_data.m_decompression.opj_setup_decoder(l_info->m_codec,parameters); - l_info->m_event_mgr = event_mgr; + + if (event_mgr == NULL) + { + l_info->m_event_mgr->error_handler = opj_default_callback ; + l_info->m_event_mgr->warning_handler = opj_default_callback ; + l_info->m_event_mgr->info_handler = opj_default_callback ; + l_info->m_event_mgr->client_data = stderr; + } + else + l_info->m_event_mgr = event_mgr; return OPJ_TRUE; } return OPJ_FALSE; -- cgit v1.2.3