diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2011-09-19 13:18:19 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2011-09-19 13:18:19 +0000 |
| commit | b138aaae08d81965d0451465426d057aed3cbbfc (patch) | |
| tree | f8bd87d5bb53a1be6364679e94707bd04872bb1a /libopenjpeg | |
| parent | 395366107898f3f157adafcbc6dac5328add9844 (diff) | |
WIP: manage the case of event_mgr is not provided to setup_decoder function
Diffstat (limited to 'libopenjpeg')
| -rw-r--r-- | libopenjpeg/openjpeg.c | 11 |
1 files changed, 10 insertions, 1 deletions
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; |