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

WIP: fix build compilation error with windows platform about event_mgr management

This commit is contained in:
Mickael Savinaud 2011-09-22 08:39:59 +00:00
parent 5d0b813cec
commit 51513c4e6b
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -5,6 +5,9 @@ What's New for OpenJPEG
! : changed ! : changed
+ : added + : added
September 22, 2011
* [mickael] WIP: fix build compilation error with windows platform about event_mgr management.
September 21, 2011 September 21, 2011
+ [mickael] WIP: clean the j2k_dump application and the lib regards to the event management + [mickael] WIP: clean the j2k_dump application and the lib regards to the event management
+ [mickael] Enhance the support of endianess with cmake and inside the code (credit to Winfried) + [mickael] Enhance the support of endianess with cmake and inside the code (credit to Winfried)

2
libopenjpeg/event.c
View File

@ -169,7 +169,7 @@ opj_bool opj_event_msg_v2(opj_event_mgr_t* event_mgr, int event_type, const char
} }
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
void opj_set_default_event_handler(opj_event_mgr_t * p_manager, opj_bool verbose) void OPJ_CALLCONV opj_set_default_event_handler(opj_event_mgr_t * p_manager, opj_bool verbose)
{ {
p_manager->client_data = NULL; p_manager->client_data = NULL;
p_manager->error_handler = opj_error_default_callback; p_manager->error_handler = opj_error_default_callback;

11
libopenjpeg/event.h
View File

@ -48,19 +48,10 @@ Write formatted data to a string and send the string to a user callback.
@param event_type Event type or callback to use to send the message @param event_type Event type or callback to use to send the message
@param fmt Format-control string (plus optional arguments) @param fmt Format-control string (plus optional arguments)
@return Returns true if successful, returns false otherwise @return Returns true if successful, returns false otherwise
* FIXME Change by its v2 version this function after ended the merge (perhaps remove to the exported function) * FIXME Change by its v2 version this function after ended the merge
*/ */
opj_bool opj_event_msg(opj_common_ptr cinfo, int event_type, const char *fmt, ...); opj_bool opj_event_msg(opj_common_ptr cinfo, int event_type, const char *fmt, ...);
/**
* Set the default event handler. This function set the output of message event to be stderr for warning and error output
* and stdout for info output. It is optional, you can set your own event handler or provide a null structure to the
* opj_setup_decoder function. In this last case no output will be displayed.
*
* @param p_manager a opj_event_mgr structure which will be pass to the codec.
*/
void opj_set_default_event_handler(opj_event_mgr_t * p_manager, opj_bool verbose);
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
/*@}*/ /*@}*/

4
libopenjpeg/openjpeg.h
View File

@ -1179,6 +1179,10 @@ OPJ_API opj_stream_t* OPJ_CALLCONV opj_stream_create_file_stream (FILE * p_file,
========================================================== ==========================================================
*/ */
/**
* FIXME DOC
* FIXME Need to adapt this function to the V2 framework
*/
OPJ_API opj_event_mgr_t* OPJ_CALLCONV opj_set_event_mgr(opj_common_ptr cinfo, opj_event_mgr_t *event_mgr, void *context); OPJ_API opj_event_mgr_t* OPJ_CALLCONV opj_set_event_mgr(opj_common_ptr cinfo, opj_event_mgr_t *event_mgr, void *context);
/** /**