X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libopenjpeg%2Fevent.c;h=2a7006559c9e5bde82df70715158182f340ef1bc;hb=67d04dd9ba5fdf9124b34e56cba0ea07a8abe196;hp=7deb023b9bb70fba69b0bd8c11cf8dc45a33e6dd;hpb=51513c4e6b65e086d71414a1e94430ad6726f957;p=openjpeg.git

diff --git a/libopenjpeg/event.c b/libopenjpeg/event.c
index 7deb023b..2a700655 100644
--- a/libopenjpeg/event.c
+++ b/libopenjpeg/event.c
@@ -169,20 +169,25 @@ opj_bool opj_event_msg_v2(opj_event_mgr_t* event_mgr, int event_type, const char
 }
 
 /* ----------------------------------------------------------------------- */
-void OPJ_CALLCONV opj_set_default_event_handler(opj_event_mgr_t * p_manager, opj_bool verbose)
+void OPJ_CALLCONV opj_initialize_default_event_handler(opj_event_mgr_t * p_event, opj_bool verbose)
 {
-	p_manager->client_data = NULL;
-	p_manager->error_handler = opj_error_default_callback;
+	if (! p_event){
+		fprintf(stderr, "[ERROR] Event structure provided to the opj_set_default_event_handler is equal to null pointer.\n");
+		return;
+	}
+
+	p_event->client_data = NULL;
+	p_event->error_handler = opj_error_default_callback;
 
 	if (verbose) {
-		p_manager->info_handler = opj_info_default_callback;
-		p_manager->warning_handler = opj_warning_default_callback;
+		p_event->info_handler = opj_info_default_callback;
+		p_event->warning_handler = opj_warning_default_callback;
 	}
 	else {
 		/* FIXME (MSD) This message should be remove when the documentation will be updated */
 		fprintf(stdout, "[INFO] Verbose mode = OFF => no other info/warning output.\n");
-		p_manager->info_handler = opj_default_callback ;
-		p_manager->warning_handler = opj_default_callback ;
+		p_event->info_handler = opj_default_callback ;
+		p_event->warning_handler = opj_default_callback ;
 	}
 }