--- psiconv/trunk/program/psiconv/magick-aux.c	2003/11/11 18:58:55	152
+++ psiconv/trunk/program/psiconv/magick-aux.c	2014/10/20 11:44:17	343
@@ -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
@@ -33,12 +33,84 @@
 
 /* This used to be very ugly, but nowadays it is much better */
 
-const MagickInfo * GetMagickFileList(void)
+#if IMAGEMAGICK_API == 1 || IMAGEMAGICK_API == 2
+const MagickInfo ** GetMagickFileList(void)
 {
+  int len,i;
+  const MagickInfo *ptr;
+  const MagickInfo *mi_ptr;
+  const MagickInfo **copy;
   ExceptionInfo exc;
   GetExceptionInfo(&exc);
   OpenModules(&exc);
-  return GetMagickInfo(NULL,&exc);
+
+  mi_ptr = GetMagickInfo(NULL,&exc);
+  for (len = 0, ptr=mi_ptr; ptr != NULL; len++, ptr = ptr->next);
+  copy = malloc((len+1) * sizeof(*copy));
+  for (i=0, ptr=mi_ptr; ptr != NULL; i++, ptr = ptr->next)
+    copy[i] = ptr;
+  copy[len] = NULL;
+  return copy;
+}
+
+#elif IMAGEMAGICK_API == 3
+
+const MagickInfo ** GetMagickFileList(void)
+{
+  MagickInfo **mi;
+  const MagickInfo **copy;
+  unsigned long len;
+  int i;
+  ExceptionInfo exc;
+  GetExceptionInfo(&exc);
+  OpenModules(&exc);
+  mi = GetMagickInfoList("*",&len);
+  copy = malloc((len+1) * sizeof(*copy));
+  for (i = 0; i < len; i++) {
+    copy[i] = mi[i];
+  }
+  copy[len] = NULL;
+  return copy;
+}
+
+#elif IMAGEMAGICK_API == 4
+
+const MagickInfo ** GetMagickFileList(void)
+{
+  MagickInfo **mi;
+  const MagickInfo **copy;
+  unsigned long len;
+  int i;
+  ExceptionInfo exc;
+  GetExceptionInfo(&exc);
+  OpenModules(&exc);
+  mi = GetMagickInfoList("*",&len,&exc);
+  copy = malloc((len+1) * sizeof(*copy));
+  for (i = 0; i < len; i++) {
+    copy[i] = mi[i];
+  }
+  copy[len] = NULL;
+  return copy;
 }
 
+#elif IMAGEMAGICK_API == 100
+/* GraphicsMagick library */
+const MagickInfo ** GetMagickFileList(void)
+{
+  int i,len;
+  MagickInfo **mi;
+  const MagickInfo **copy;
+  ExceptionInfo exception;
+  GetExceptionInfo(&exception);
+  mi = GetMagickInfoArray(&exception);
+  for (len = 0; mi[len]; len++);
+  copy = malloc((len+1) * sizeof(*copy));
+  for (i = 0; i <= len; i++) {
+    copy[i] = mi[i];
+  }
+  return copy;
+}
+
+#endif
+
 #endif /* IMAGEMAGICK */