--- psiconv/trunk/program/psiconv/gen_image.c	2002/01/22 21:22:55	138
+++ psiconv/trunk/program/psiconv/gen_image.c	2002/05/10 15:55:55	147
@@ -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;
@@ -200,7 +204,9 @@
 }
 
 static int psiconv_gen_image(const char * filename, const psiconv_file file, 
-                             const char *dest)
+                             const char *dest,
+			     const psiconv_encoding encoding_type)
+     /* Here the encoding_type is a dummy */
 {
   if (file->type == psiconv_mbm_file) 
     psiconv_gen_image_mbm(filename,(psiconv_mbm_f) file->file,dest);