1 | /* |
1 | /* |
2 | magick-aux.c - Part of psiconv, a PSION 5 file formats converter |
2 | magick-aux.c - Part of psiconv, a PSION 5 file formats converter |
3 | Copyright (c) 2000 Frodo Looijaard <frodol@dds.nl> |
3 | Copyright (c) 2000-2004 Frodo Looijaard <frodol@dds.nl> |
4 | |
4 | |
5 | This program is free software; you can redistribute it and/or modify |
5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by |
6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or |
7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. |
8 | (at your option) any later version. |
… | |
… | |
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 | |
30 | MagickInfo * GetMagickFileList(void) |
36 | const 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); |