Changeset 11620 for ImageMagick/trunk

Timestamp:

07/13/08 11:38:18 (3 months ago)

Author:

cristy

Message:

 

Files:

• ImageMagick/trunk/magick/image.c (modified) (7 diffs)

ImageMagick/trunk/magick/image.c

@@ -3426 +3426 @@
 
   ExceptionInfo
-    sans_exception;
+    *sans_exception;
 
   Image
@@ -3525 +3525 @@
 #endif
   image_info->affirm=MagickFalse;
+  sans_exception=AcquireExceptionInfo();
   if (*extension != '\0')
     {
@@ -3580 +3581 @@
         i++;
       }
-      magick_info=GetMagickInfo(magic,&sans_exception);
+      magick_info=GetMagickInfo(magic,sans_exception);
       if ((magick_info != (const MagickInfo *) NULL) &&
           (magick_info->format_type != UndefinedFormatType))
@@ -3612 +3613 @@
         }
     }
-  GetExceptionInfo(&sans_exception);
-  magick_info=GetMagickInfo(magic,&sans_exception);
+  magick_info=GetMagickInfo(magic,sans_exception);
+  sans_exception=DestroyExceptionInfo(sans_exception);
   if ((magick_info == (const MagickInfo *) NULL) ||
       (GetMagickEndianSupport(magick_info) == MagickFalse))
     image_info->endian=UndefinedEndian;
-  (void) DestroyExceptionInfo(&sans_exception);
   GetPathComponent(image_info->filename,CanonicalPath,filename);
   (void) CopyMagickString(image_info->filename,filename,MaxTextExtent);
@@ -3683 +3683 @@
     Check magic.xml configuration file.
   */
-  GetExceptionInfo(&sans_exception);
-  magic_info=GetMagicInfo(magick,(size_t) count,&sans_exception);
+  sans_exception=AcquireExceptionInfo();
+  magic_info=GetMagicInfo(magick,(size_t) count,sans_exception);
   if ((magic_info != (const MagicInfo *) NULL) &&
       (GetMagicName(magic_info) != (char *) NULL))
@@ -3690 +3690 @@
       (void) CopyMagickString(image_info->magick,GetMagicName(magic_info),
         MaxTextExtent);
-      magick_info=GetMagickInfo(image_info->magick,&sans_exception);
+      magick_info=GetMagickInfo(image_info->magick,sans_exception);
       if ((magick_info == (const MagickInfo *) NULL) ||
           (GetMagickEndianSupport(magick_info) == MagickFalse))
         image_info->endian=UndefinedEndian;
-      (void) DestroyExceptionInfo(&sans_exception);
+      sans_exception=DestroyExceptionInfo(sans_exception);
       return(MagickTrue);
     }
@@ -3700 +3700 @@
   if (p != (const char *) NULL)
     (void) CopyMagickString(image_info->magick,p,MaxTextExtent);
-  magick_info=GetMagickInfo(image_info->magick,&sans_exception);
+  magick_info=GetMagickInfo(image_info->magick,sans_exception);
   if ((magick_info == (const MagickInfo *) NULL) ||
       (GetMagickEndianSupport(magick_info) == MagickFalse))
     image_info->endian=UndefinedEndian;
-  (void) DestroyExceptionInfo(&sans_exception);
+  sans_exception=DestroyExceptionInfo(sans_exception);
   return(MagickTrue);
 }