--- psiconv/trunk/program/psiconv/gen_image.c	2001/06/30 13:36:39	118
+++ psiconv/trunk/program/psiconv/gen_image.c	2002/01/29 18:38:38	142
@@ -23,10 +23,14 @@
 #include <string.h>
 #include "psiconv.h"
 
-#if IMAGEMAGICK
+#ifdef IMAGEMAGICK
 #include "magick-aux.h"
 #include <magick/magick.h>
 
+#ifdef DMALLOC
+#include "dmalloc.h"
+#endif
+
 static void set_filename(char *dest,const char *type, const char *name)
 {
   int len;
@@ -76,7 +80,7 @@
 {
 #if IMAGEMAGICK
   psiconv_clipart_section section;
-  MagickInfo *mi;
+  const MagickInfo *mi;
   ImageInfo *image_info;
   Image *image = NULL;
   Image *last_image = NULL;
@@ -132,7 +136,7 @@
 
 #if IMAGEMAGICK
   psiconv_paint_data_section section;
-  MagickInfo *mi;
+  const MagickInfo *mi;
   ImageInfo *image_info;
   Image *image = NULL;
   Image *last_image = NULL;
@@ -217,11 +221,11 @@
 {
   struct psiconv_fileformat_s ff;
 #if IMAGEMAGICK
-  MagickInfo *mi;
+  const MagickInfo *mi;
   ff.output = psiconv_gen_image;
   for (mi = GetMagickFileList(); mi ; mi = mi->next) {
     if (mi->encoder) {
-      ff.name = strdup(mi->tag);
+      ff.name = strdup(mi->name);
       ff.description = strdup(mi->description);
       psiconv_list_add(fileformat_list,&ff);
     }