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

[trunk] move opj_event_mgr struct from openjpeg. h to event.h

This commit is contained in:
Mickael Savinaud 2012-10-29 22:02:02 +00:00
parent e0161e03db
commit a6a141d326
2 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lib/openjp2/event.h
View File

@ -40,7 +40,6 @@ used for
<li>Debugging messages
</ul>
*/
#if 0
typedef struct opj_event_mgr
{
/** Data to call the event manager upon */
@ -56,7 +55,7 @@ typedef struct opj_event_mgr
/** Debug message callback if available, NULL otherwise */
opj_msg_callback info_handler;
} opj_event_mgr_t;
#endif
#define EVT_ERROR 1 /**< Error event type */
#define EVT_WARNING 2 /**< Warning event type */

27
src/lib/openjp2/openjpeg.h
View File

@ -226,33 +226,6 @@ typedef enum LIMIT_DECODING {
* */
typedef void (*opj_msg_callback) (const char *msg, void *client_data);
/** SHOULD BE MOVE IN EVENT.H when we remove old functions TODO MSD
Message handler object
used for
<ul>
<li>Error messages
<li>Warning messages
<li>Debugging messages
</ul>
*/
typedef struct opj_event_mgr
{
/** Data to call the event manager upon */
void * m_error_data;
/** Data to call the event manager upon */
void * m_warning_data;
/** Data to call the event manager upon */
void * m_info_data;
/** Error message callback if available, NULL otherwise */
opj_msg_callback error_handler;
/** Warning message callback if available, NULL otherwise */
opj_msg_callback warning_handler;
/** Debug message callback if available, NULL otherwise */
opj_msg_callback info_handler;
} opj_event_mgr_t;
/*
==========================================================
codec typedef definitions