/[public]/psiconv/trunk/program/psiconv/magick-aux.c
ViewVC logotype

Diff of /psiconv/trunk/program/psiconv/magick-aux.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 58 Revision 118
23 23
24#include "magick-aux.h" 24#include "magick-aux.h"
25#include <magick/magick.h> 25#include <magick/magick.h>
26#include <magick/config.h> 26#include <magick/config.h>
27 27
28/* This is so ugly, but it is the only way to make ImageMagick 5 behave 28/* This used to be very ugly, but nowadays it is much better */
29 * properly. It really needs a better interface.
30 * OpenModules makes sure all needed modules are loaded. But it may not
31 * be called until some things are initialized, hence the extra
32 * GetMagickInfo call. Ugh.
33 */
34
35extern void OpenModules(void);
36 29
37MagickInfo * GetMagickFileList(void) 30MagickInfo * GetMagickFileList(void)
38{ 31{
39 GetMagickInfo(NULL); 32 ExceptionInfo exc;
40#if defined(HasLTDL) 33 GetExceptionInfo(&exc);
41 OpenModules(); 34 OpenModules(&exc);
42#endif
43 return GetMagickInfo(NULL); 35 return GetMagickInfo(NULL,&exc);
44} 36}
45 37
46#endif /* IMAGEMAGICK */ 38#endif /* IMAGEMAGICK */

Legend:
Removed from v.58  
changed lines
  Added in v.118

frodo@frodo.looijaard.name
ViewVC Help
Powered by ViewVC 1.1.26