/[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 142
… …
17 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 17 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
18*/ 18*/
19 19
20#include "config.h" 20#include "config.h"
21 21
22#if IMAGEMAGICK 22#ifdef IMAGEMAGICK
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#endif
29
30#ifdef DMALLOC
31#include "dmalloc.h"
32#endif
33
34#if IMAGEMAGICK
35
28/* This used to be very ugly, but nowadays it is much better */ 36/* This used to be very ugly, but nowadays it is much better */
29 37
30MagickInfo * GetMagickFileList(void) 38const MagickInfo * GetMagickFileList(void)
31{ 39{
32 ExceptionInfo exc; 40 ExceptionInfo exc;
33 GetExceptionInfo(&exc); 41 GetExceptionInfo(&exc);
34 OpenModules(&exc); 42 OpenModules(&exc);
35 return GetMagickInfo(NULL,&exc); 43 return GetMagickInfo(NULL,&exc);
Legend:
Removed from v.118  
changed lines
  Added in v.142
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26