[trunk] move opj_event_mgr struct from openjpeg. h to event.h
This commit is contained in:
parent
e0161e03db
commit
a6a141d326
|
@ -40,7 +40,6 @@ used for
|
||||||
<li>Debugging messages
|
<li>Debugging messages
|
||||||
</ul>
|
</ul>
|
||||||
*/
|
*/
|
||||||
#if 0
|
|
||||||
typedef struct opj_event_mgr
|
typedef struct opj_event_mgr
|
||||||
{
|
{
|
||||||
/** Data to call the event manager upon */
|
/** Data to call the event manager upon */
|
||||||
|
@ -56,7 +55,7 @@ typedef struct opj_event_mgr
|
||||||
/** Debug message callback if available, NULL otherwise */
|
/** Debug message callback if available, NULL otherwise */
|
||||||
opj_msg_callback info_handler;
|
opj_msg_callback info_handler;
|
||||||
} opj_event_mgr_t;
|
} opj_event_mgr_t;
|
||||||
#endif
|
|
||||||
|
|
||||||
#define EVT_ERROR 1 /**< Error event type */
|
#define EVT_ERROR 1 /**< Error event type */
|
||||||
#define EVT_WARNING 2 /**< Warning event type */
|
#define EVT_WARNING 2 /**< Warning event type */
|
||||||
|
|
|
@ -226,33 +226,6 @@ typedef enum LIMIT_DECODING {
|
||||||
* */
|
* */
|
||||||
typedef void (*opj_msg_callback) (const char *msg, void *client_data);
|
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
|
codec typedef definitions
|
||||||
|
|
Loading…
Reference in New Issue