generic-library/openjpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[trunk] begin to clean the old V1 style message event management

Browse Source
This commit is contained in:
Mickael Savinaud
2012-08-09 14:00:31 +00:00
parent 9ed88f6a8d
commit 4397b675cb
4 changed files with 26 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
libopenjpeg/event.c
View File

@@ -62,16 +62,11 @@ _itoa(int i, char *a, int r) {
#endif
/* ----------------------------------------------------------------------- */
opj_event_mgr_t* OPJ_CALLCONV opj_set_event_mgr(opj_common_ptr cinfo, opj_event_mgr_t *event_mgr, void *context) {
if(cinfo) {
opj_event_mgr_t *previous = cinfo->event_mgr;
cinfo->event_mgr = event_mgr;
cinfo->client_data = context;
return previous;
}
return NULL;
}
/**
* Default callback function.
* Do nothing.
*/
static void opj_default_callback (const char *msg, void *client_data){};
/* ----------------------------------------------------------------------- */
opj_bool opj_event_msg(opj_common_ptr cinfo, int event_type, const char *fmt, ...) {
@@ -171,3 +166,14 @@ opj_bool opj_event_msg_v2(opj_event_mgr_t* p_event_mgr, int event_type, const ch
return OPJ_TRUE;
}
void opj_set_default_event_handler(opj_event_mgr_t * p_manager)
{
p_manager->m_error_data = 00;
p_manager->m_warning_data = 00;
p_manager->m_info_data = 00;
p_manager->error_handler = opj_default_callback;
p_manager->info_handler = opj_default_callback;
p_manager->warning_handler = opj_default_callback;
}