… | |
… | |
22 | #include "gen.h" |
22 | #include "gen.h" |
23 | #include <string.h> |
23 | #include <string.h> |
24 | #include "psiconv.h" |
24 | #include "psiconv.h" |
25 | |
25 | |
26 | #if IMAGEMAGICK |
26 | #if IMAGEMAGICK |
|
|
27 | #include "magick-aux.h" |
27 | #include <magick/magick.h> |
28 | #include <magick/magick.h> |
28 | |
29 | |
29 | /* This is ridiculously simple using ImageMagick. Without it, it would |
30 | /* This is ridiculously simple using ImageMagick. Without it, it would |
30 | be quite somewhat harder - it will be left for later on. |
31 | be quite somewhat harder - it will be left for later on. |
31 | Note that we ignore any errors. Dangerous... */ |
32 | Note that we ignore any errors. Dangerous... */ |
… | |
… | |
170 | { |
171 | { |
171 | struct psiconv_fileformat ff; |
172 | struct psiconv_fileformat ff; |
172 | #if IMAGEMAGICK |
173 | #if IMAGEMAGICK |
173 | MagickInfo *mi; |
174 | MagickInfo *mi; |
174 | ff.output = psiconv_gen_image; |
175 | ff.output = psiconv_gen_image; |
175 | for (mi = GetMagickInfo(NULL); mi ; mi = mi->next) { |
176 | for (mi = GetMagickFileList(); mi ; mi = mi->next) { |
176 | if (mi->encoder) { |
177 | if (mi->encoder) { |
177 | ff.name = strdup(mi->tag); |
178 | ff.name = strdup(mi->tag); |
178 | ff.description = strdup(mi->description); |
179 | ff.description = strdup(mi->description); |
179 | psiconv_list_add(fileformat_list,&ff); |
180 | psiconv_list_add(fileformat_list,&ff); |
180 | } |
181 | } |