summaryrefslogtreecommitdiff
path: root/src/lib/openjp2/event.c
diff options
context:
space:
mode:
authorMathieu Malaterre <mathieu.malaterre@gmail.com>2012-10-25 07:39:59 +0000
committerMathieu Malaterre <mathieu.malaterre@gmail.com>2012-10-25 07:39:59 +0000
commitf3d7d2f7b1b0cf41c10c48eaecdab6707780e7f1 (patch)
tree8549b6bde309d055f69ae05f79903159d8196a96 /src/lib/openjp2/event.c
parent0358983ee649c8ff8cdf690ec6724559bb8f2b00 (diff)
[trunk] Rework r2077
r2077 did expose too much of the detail implementation of OpenJPEG. Rework dependencies in between JPIP file level details and JPIP client/server arch. Move JPIP file level functionalities back into OpenJP2 as was the case in openjpeg 1.5.x. Use new cio func.
Diffstat (limited to 'src/lib/openjp2/event.c')
-rw-r--r--src/lib/openjp2/event.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/openjp2/event.c b/src/lib/openjp2/event.c
index cfc68c19..fa505619 100644
--- a/src/lib/openjp2/event.c
+++ b/src/lib/openjp2/event.c
@@ -117,7 +117,7 @@ opj_bool opj_event_msg(opj_common_ptr cinfo, int event_type, const char *fmt, ..
}
/* ----------------------------------------------------------------------- */
-opj_bool OPJ_CALLCONV opj_event_msg_v2(opj_event_mgr_t* p_event_mgr, int event_type, const char *fmt, ...) {
+opj_bool opj_event_msg_v2(opj_event_mgr_t* p_event_mgr, int event_type, const char *fmt, ...) {
#define MSG_SIZE 512 /* 512 bytes should be more than enough for a short message */
opj_msg_callback msg_handler = 00;
void * l_data = 00;
@@ -167,7 +167,7 @@ opj_bool OPJ_CALLCONV opj_event_msg_v2(opj_event_mgr_t* p_event_mgr, int event_t
return OPJ_TRUE;
}
-void OPJ_CALLCONV opj_set_default_event_handler(opj_event_mgr_t * p_manager)
+void opj_set_default_event_handler(opj_event_mgr_t * p_manager)
{
p_manager->m_error_data = 00;
p_manager->m_warning_data = 00;