walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

WIP: manage the case of event_mgr is not provided to setup_decoder function

This commit is contained in:
Mickael Savinaud 2011-09-19 13:18:19 +00:00
parent 3953661078
commit b138aaae08
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -6,9 +6,8 @@ What's New for OpenJPEG
+ : added + : added
September 19, 2011 September 19, 2011
+ [mickael] WIP: manage the case of event_mgr is not provided to setup_decoder function
+ [mickael] WIP: insert elements from V2 framework into the trunk (add missing files). + [mickael] WIP: insert elements from V2 framework into the trunk (add missing files).
September 19, 2011
+ [mickael] Work In Progress: insert elements from V2 framework into the trunk. + [mickael] Work In Progress: insert elements from V2 framework into the trunk.
September 9, 2011 September 9, 2011

9
libopenjpeg/openjpeg.c
View File

@ -386,6 +386,15 @@ 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_codec_data.m_decompression.opj_setup_decoder(l_info->m_codec,parameters);
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; l_info->m_event_mgr = event_mgr;
return OPJ_TRUE; return OPJ_TRUE;
} }