Generic aligned malloc implementation.

[openjpeg.git] / src / lib / openjp2 / event.h

diff --git a/src/lib/openjp2/event.h b/src/lib/openjp2/event.h
index 98543b5d50303750fc7f1719beb30191b70ce896..fa8604ed0b7dc3bead0a432f1a9720c3028e7c8b 100644 (file)
--- a/src/lib/openjp2/event.h
+++ b/src/lib/openjp2/event.h
@@ -1,5 +1,12 @@
 /*
+ * The copyright in this software is being made available under the 2-clauses 
+ * BSD License, included below. This software may be subject to other third 
+ * party and contributor rights, including patent rights, and no such rights
+ * are granted under this license.
+ *
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * Copyright (c) 2008, 2011-2012, Centre National d'Etudes Spatiales (CNES), FR 
+ * Copyright (c) 2012, CS Systemes d'Information, France
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -40,7 +47,6 @@ used for
 <li>Debugging messages
 </ul>
 */
-#if 0
 typedef struct opj_event_mgr 
 {
        /** Data to call the event manager upon */
@@ -56,7 +62,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 */
@@ -68,15 +74,7 @@ typedef struct opj_event_mgr
 /** @name Exported functions (see also openjpeg.h) */
 /*@{*/
 /* ----------------------------------------------------------------------- */
-/**
-Write formatted data to a string and send the string to a user callback. 
-@param cinfo Codec context info
-@param event_type Event type or callback to use to send the message
-@param fmt Format-control string (plus optional arguments)
-@return Returns true if successful, returns false otherwise
-* 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, ...);
+
 
 /* ----------------------------------------------------------------------- */
 
@@ -89,13 +87,19 @@ opj_bool opj_event_msg(opj_common_ptr cinfo, int event_type, const char *fmt, ..
  *
  * @return Returns true if successful, returns false otherwise
  */
-OPJ_API opj_bool OPJ_CALLCONV opj_event_msg_v2(opj_event_mgr_t* event_mgr, int event_type, const char *fmt, ...);
+OPJ_BOOL opj_event_msg(opj_event_mgr_t* event_mgr, OPJ_INT32 event_type, const char *fmt, ...);
 /* ----------------------------------------------------------------------- */
 
 /**
  * Set the event manager with the default callback function for the 3 levels.
  */
-OPJ_API void OPJ_CALLCONV opj_set_default_event_handler(opj_event_mgr_t * p_manager);
+void opj_set_default_event_handler(opj_event_mgr_t * p_manager);
+
+/*
+#ifdef __GNUC__
+#pragma GCC poison printf fprintf
+#endif
+*/
 
 /*@}*/