diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-11-16 08:29:43 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-11-16 08:29:43 +0000 |
| commit | fcf9fa36515132d0a75bfcfb58cf9439dcbe6240 (patch) | |
| tree | 07c3b6711d60db8039604c4effc04a0d20ec29ca /src/lib/openjp2/event.c | |
| parent | 583df79be9502bc4ff3ac7181d902675aabc6716 (diff) | |
[trunk] add opj_ prefix to some internal define and use the new opj type instead of int and float in some files
Diffstat (limited to 'src/lib/openjp2/event.c')
| -rw-r--r-- | src/lib/openjp2/event.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/openjp2/event.c b/src/lib/openjp2/event.c index d23907dd..6c53515b 100644 --- a/src/lib/openjp2/event.c +++ b/src/lib/openjp2/event.c @@ -78,8 +78,8 @@ static void opj_default_callback (const char *msg, void *client_data) /* ----------------------------------------------------------------------- */ -OPJ_BOOL opj_event_msg(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_BOOL opj_event_msg(opj_event_mgr_t* p_event_mgr, OPJ_INT32 event_type, const char *fmt, ...) { +#define OPJ_MSG_SIZE 512 /* 512 bytes should be more than enough for a short message */ opj_msg_callback msg_handler = 00; void * l_data = 00; @@ -110,12 +110,12 @@ OPJ_BOOL opj_event_msg(opj_event_mgr_t* p_event_mgr, int event_type, const char if ((fmt != 00) && (p_event_mgr != 00)) { va_list arg; size_t str_length/*, i, j*/; /* UniPG */ - char message[MSG_SIZE]; - memset(message, 0, MSG_SIZE); + char message[OPJ_MSG_SIZE]; + memset(message, 0, OPJ_MSG_SIZE); /* initialize the optional parameter list */ va_start(arg, fmt); /* check the length of the format string */ - str_length = (strlen(fmt) > MSG_SIZE) ? MSG_SIZE : strlen(fmt); + str_length = (strlen(fmt) > OPJ_MSG_SIZE) ? OPJ_MSG_SIZE : strlen(fmt); (void)str_length; /* parse the format string and put the result in 'message' */ vsprintf(message, fmt, arg); /* UniPG */ |