diff --git a/src/lib/openjp2/event.h b/src/lib/openjp2/event.h index f80067ad..39d980d6 100644 --- a/src/lib/openjp2/event.h +++ b/src/lib/openjp2/event.h @@ -40,7 +40,6 @@ used for
  • Debugging messages */ -#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 */ diff --git a/src/lib/openjp2/openjpeg.h b/src/lib/openjp2/openjpeg.h index 1e23480a..44fb8492 100644 --- a/src/lib/openjp2/openjpeg.h +++ b/src/lib/openjp2/openjpeg.h @@ -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 - -*/ -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