(no commit message)

[imagemagick] / magick / log.h

diff --git a/magick/log.h b/magick/log.h
index 14bf30e182dc18251eb9ec12ad8de9f41d020fe2..94de877b18221063959a799e2655352483e5c605 100644 (file)
--- a/magick/log.h
+++ b/magick/log.h
@@ -1,5 +1,5 @@
 /*
-  Copyright 1999-2010 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.
@@ -26,7 +26,7 @@ extern "C" {
 #include "magick/exception.h"
 
 #if !defined(GetMagickModule)
-# define GetMagickModule()  __FILE__,__func__,(size_t) __LINE__
+# define GetMagickModule()  __FILE__,__func__,(unsigned long) __LINE__
 #endif
 
 #define MagickLogFilename  "log.xml"
@@ -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;
 
@@ -75,12 +76,11 @@ extern MagickExport MagickBooleanType
   IsEventLogging(void),
   ListLogInfo(FILE *,ExceptionInfo *),
   LogComponentGenesis(void),
-  LogMagickEvent(const LogEventType,const char *,const char *,
-    const size_t,const char *,...) 
+  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 size_t,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),