--- psiconv/trunk/program/psiconv/gen_image.c	2001/06/17 18:47:33	117
+++ psiconv/trunk/program/psiconv/gen_image.c	2001/06/30 13:36:39	118
@@ -62,7 +62,7 @@
 
   image = ConstituteImage(sec->xsize,sec->ysize,"RGB",FloatPixel,pixel,&exc);
   if (! image) {
-    MagickError(exc.severity,exc.message,exc.qualifier);
+    MagickError(exc.severity,exc.reason,exc.description);
   }
   free(pixel);
 
@@ -76,7 +76,7 @@
 {
 #if IMAGEMAGICK
   psiconv_clipart_section section;
-  MagickInfo *mi = GetMagickInfo(dest);
+  MagickInfo *mi;
   ImageInfo *image_info;
   Image *image = NULL;
   Image *last_image = NULL;
@@ -84,6 +84,10 @@
   ExceptionInfo exc;
   int i;
   unsigned int status;
+
+  GetExceptionInfo(&exc);
+  if (!(mi = GetMagickInfo(dest,&exc)))
+    return -1;
   
   if ((psiconv_list_length(f->sections) < 1) || 
       ((psiconv_list_length(f->sections)) > 1 && ! (mi->adjoin)))
@@ -102,7 +106,6 @@
     last_image = this_image;
   }
 
-  GetExceptionInfo(&exc);
   image_info = CloneImageInfo(NULL);
   set_filename(image->filename,dest,filename);
   if (image->next)
@@ -129,7 +132,7 @@
 
 #if IMAGEMAGICK
   psiconv_paint_data_section section;
-  MagickInfo *mi = GetMagickInfo(dest);
+  MagickInfo *mi;
   ImageInfo *image_info;
   Image *image = NULL;
   Image *last_image = NULL;
@@ -138,6 +141,10 @@
   int i;
   unsigned int status;
 
+  GetExceptionInfo(&exc);
+  if (!(mi = GetMagickInfo(dest,&exc)))
+    return -1;
+
   if ((psiconv_list_length(f->sections) < 1) || 
       ((psiconv_list_length(f->sections)) > 1 && ! (mi->adjoin)))
 #endif
@@ -156,7 +163,6 @@
     last_image = this_image;
   }
 
-  GetExceptionInfo(&exc);
   image_info = CloneImageInfo(NULL);
   set_filename(image->filename,dest,filename);
   if (image->next)