--- psiconv/trunk/program/psiconv/magick-aux.c	2002/01/22 21:22:55	138
+++ psiconv/trunk/program/psiconv/magick-aux.c	2005/11/15 15:52:34	270
@@ -1,6 +1,6 @@
 /*
     magick-aux.c - Part of psiconv, a PSION 5 file formats converter
-    Copyright (c) 2000  Frodo Looijaard <frodol@dds.nl>
+    Copyright (c) 2000-2005  Frodo Looijaard <frodo@frodo.looijaard.name>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -22,11 +22,18 @@
 #if IMAGEMAGICK
 
 #include "magick-aux.h"
-#include <magick/magick.h>
-#include <magick/config.h>
+
+#endif
+
+#ifdef DMALLOC
+#include "dmalloc.h"
+#endif
+
+#if IMAGEMAGICK
 
 /* This used to be very ugly, but nowadays it is much better */
 
+#if IMAGEMAGICK_API == 1 || IMAGEMAGICK_API == 2
 const MagickInfo * GetMagickFileList(void)
 {
   ExceptionInfo exc;
@@ -35,4 +42,39 @@
   return GetMagickInfo(NULL,&exc);
 }
 
+#elif IMAGEMAGICK_API == 3
+
+const MagickInfo * GetMagickFileList(void)
+{
+  MagickInfo **mi;
+  unsigned long nr;
+  int i;
+  ExceptionInfo exc;
+  GetExceptionInfo(&exc);
+  OpenModules(&exc);
+  mi = GetMagickInfoList("*",&nr);
+  for (i = 0; i < nr-1; i++) {
+    mi[i]->next = mi[i+1];
+  }
+  return *mi;
+}
+
+#elif IMAGEMAGICK_API == 4
+
+const MagickInfo * GetMagickFileList(void)
+{
+  MagickInfo **mi;
+  unsigned long nr;
+  int i;
+  ExceptionInfo exc;
+  GetExceptionInfo(&exc);
+  OpenModules(&exc);
+  mi = GetMagickInfoList("*",&nr,&exc);
+  for (i = 0; i < nr-1; i++) {
+    mi[i]->next = mi[i+1];
+  }
+  return *mi;
+}
+#endif
+
 #endif /* IMAGEMAGICK */