/[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 118 Revision 152
20#include "config.h" 20#include "config.h"
21 21
22#if IMAGEMAGICK 22#if IMAGEMAGICK
23 23
24#include "magick-aux.h" 24#include "magick-aux.h"
25#include <magick/magick.h> 25
26#include <magick/config.h> 26#endif
27
28#ifdef DMALLOC
29#include "dmalloc.h"
30#endif
31
32#if IMAGEMAGICK
27 33
28/* This used to be very ugly, but nowadays it is much better */ 34/* This used to be very ugly, but nowadays it is much better */
29 35
30MagickInfo * GetMagickFileList(void) 36const MagickInfo * GetMagickFileList(void)
31{ 37{
32 ExceptionInfo exc; 38 ExceptionInfo exc;
33 GetExceptionInfo(&exc); 39 GetExceptionInfo(&exc);
34 OpenModules(&exc); 40 OpenModules(&exc);
35 return GetMagickInfo(NULL,&exc); 41 return GetMagickInfo(NULL,&exc);

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

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