(no commit message)

[imagemagick] / magick / log.h

diff --git a/magick/log.h b/magick/log.h
index 87705eeab349aff68681629d18d56e7ce5dfc2da..94de877b18221063959a799e2655352483e5c605 100644 (file)
--- a/magick/log.h
+++ b/magick/log.h
@@ -1,5 +1,5 @@
 /*
-  Copyright 1999-2009 ImageMagick Studio LLC, a non-profit organization
+  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
   dedicated to making software imaging solutions freely available.
   
   You may not use this file except in compliance with the License.
@@ -44,14 +44,15 @@ typedef enum
   DeprecateEvent = 0x00040,
   DrawEvent = 0x00080,
   ExceptionEvent = 0x00100,
-  LocaleEvent = 0x00200,
-  ModuleEvent = 0x00400,
-  PolicyEvent = 0x00800,
-  ResourceEvent = 0x01000,
-  TransformEvent = 0x02000,
-  UserEvent = 0x04000,
-  WandEvent = 0x08000,
-  X11Event = 0x10000,
+  ImageEvent = 0x00200,
+  LocaleEvent = 0x00400,
+  ModuleEvent = 0x00800,
+  PolicyEvent = 0x01000,
+  ResourceEvent = 0x02000,
+  TransformEvent = 0x04000,
+  UserEvent = 0x09000,
+  WandEvent = 0x10000,
+  X11Event = 0x20000,
   AllEvents = 0x7fffffff
 } LogEventType;
 
@@ -59,14 +60,14 @@ typedef struct _LogInfo
   LogInfo;
 
 extern MagickExport char
-  **GetLogList(const char *,unsigned long *,ExceptionInfo *);
+  **GetLogList(const char *,size_t *,ExceptionInfo *);
 
 extern MagickExport const char
   *GetLogName(void),
   *SetLogName(const char *);
                                                                                 
 extern MagickExport const LogInfo
-  **GetLogInfoList(const char *,unsigned long *,ExceptionInfo *);
+  **GetLogInfoList(const char *,size_t *,ExceptionInfo *);
 
 extern MagickExport LogEventType
   SetLogEventMask(const char *);
@@ -74,16 +75,16 @@ extern MagickExport LogEventType
 extern MagickExport MagickBooleanType
   IsEventLogging(void),
   ListLogInfo(FILE *,ExceptionInfo *),
-  LogMagickEvent(const LogEventType,const char *,const char *,
-    const unsigned long,const char *,...) 
+  LogComponentGenesis(void),
+  LogMagickEvent(const LogEventType,const char *,const char *,const size_t,
+    const char *,...) 
     magick_attribute((format (printf,5,6))),
-  LogMagickEventList(const LogEventType,const char *,const char *,
-    const unsigned long,const char *,va_list)
-    magick_attribute((format (printf,5,0)));
+  LogMagickEventList(const LogEventType,const char *,const char *,const size_t,
+    const char *,va_list) magick_attribute((format (printf,5,0)));
 
 extern MagickExport void
   CloseMagickLog(void),
-  DestroyLogList(void),
+  LogComponentTerminus(void),
   SetLogFormat(const char *);
 
 #if defined(__cplusplus) || defined(c_plusplus)