--- psiconv/trunk/program/psiconv/magick-aux.c	2000/12/10 16:49:40	58
+++ psiconv/trunk/program/psiconv/magick-aux.c	2001/06/30 13:36:39	118
@@ -25,22 +25,14 @@
 #include <magick/magick.h>
 #include <magick/config.h>
 
-/* This is so ugly, but it is the only way to make ImageMagick 5 behave
- * properly. It really needs a better interface.
- * OpenModules makes sure all needed modules are loaded. But it may not
- * be called until some things are initialized, hence the extra
- * GetMagickInfo call. Ugh.
- */
-
-extern void OpenModules(void);
+/* This used to be very ugly, but nowadays it is much better */
 
 MagickInfo * GetMagickFileList(void)
 {
-  GetMagickInfo(NULL);
-#if defined(HasLTDL) 
-  OpenModules();
-#endif
-  return GetMagickInfo(NULL);
+  ExceptionInfo exc;
+  GetExceptionInfo(&exc);
+  OpenModules(&exc);
+  return GetMagickInfo(NULL,&exc);
 }
 
 #endif /* IMAGEMAGICK */