| … | |
… | |
| 21 | #include "psiconv/data.h" |
21 | #include "psiconv/data.h" |
| 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 | #ifdef IMAGEMAGICK |
| 27 | #include "magick-aux.h" |
27 | #include "magick-aux.h" |
| 28 | #include <magick/magick.h> |
28 | #include <magick/magick.h> |
|
|
29 | |
|
|
30 | #ifdef DMALLOC |
|
|
31 | #include "dmalloc.h" |
|
|
32 | #endif |
| 29 | |
33 | |
| 30 | static void set_filename(char *dest,const char *type, const char *name) |
34 | static void set_filename(char *dest,const char *type, const char *name) |
| 31 | { |
35 | { |
| 32 | int len; |
36 | int len; |
| 33 | strcpy(dest,type); |
37 | strcpy(dest,type); |
| … | |
… | |
| 74 | static int psiconv_gen_image_clipart(const char *filename, psiconv_clipart_f f, |
78 | static int psiconv_gen_image_clipart(const char *filename, psiconv_clipart_f f, |
| 75 | const char *dest) |
79 | const char *dest) |
| 76 | { |
80 | { |
| 77 | #if IMAGEMAGICK |
81 | #if IMAGEMAGICK |
| 78 | psiconv_clipart_section section; |
82 | psiconv_clipart_section section; |
| 79 | MagickInfo *mi; |
83 | const MagickInfo *mi; |
| 80 | ImageInfo *image_info; |
84 | ImageInfo *image_info; |
| 81 | Image *image = NULL; |
85 | Image *image = NULL; |
| 82 | Image *last_image = NULL; |
86 | Image *last_image = NULL; |
| 83 | Image *this_image, *images; |
87 | Image *this_image, *images; |
| 84 | ExceptionInfo exc; |
88 | ExceptionInfo exc; |
| … | |
… | |
| 130 | const char *dest) |
134 | const char *dest) |
| 131 | { |
135 | { |
| 132 | |
136 | |
| 133 | #if IMAGEMAGICK |
137 | #if IMAGEMAGICK |
| 134 | psiconv_paint_data_section section; |
138 | psiconv_paint_data_section section; |
| 135 | MagickInfo *mi; |
139 | const MagickInfo *mi; |
| 136 | ImageInfo *image_info; |
140 | ImageInfo *image_info; |
| 137 | Image *image = NULL; |
141 | Image *image = NULL; |
| 138 | Image *last_image = NULL; |
142 | Image *last_image = NULL; |
| 139 | Image *this_image, *images; |
143 | Image *this_image, *images; |
| 140 | ExceptionInfo exc; |
144 | ExceptionInfo exc; |
| … | |
… | |
| 215 | |
219 | |
| 216 | void init_image(void) |
220 | void init_image(void) |
| 217 | { |
221 | { |
| 218 | struct psiconv_fileformat_s ff; |
222 | struct psiconv_fileformat_s ff; |
| 219 | #if IMAGEMAGICK |
223 | #if IMAGEMAGICK |
| 220 | MagickInfo *mi; |
224 | const MagickInfo *mi; |
| 221 | ff.output = psiconv_gen_image; |
225 | ff.output = psiconv_gen_image; |
| 222 | for (mi = GetMagickFileList(); mi ; mi = mi->next) { |
226 | for (mi = GetMagickFileList(); mi ; mi = mi->next) { |
| 223 | if (mi->encoder) { |
227 | if (mi->encoder) { |
| 224 | ff.name = strdup(mi->tag); |
228 | ff.name = strdup(mi->name); |
| 225 | ff.description = strdup(mi->description); |
229 | ff.description = strdup(mi->description); |
| 226 | psiconv_list_add(fileformat_list,&ff); |
230 | psiconv_list_add(fileformat_list,&ff); |
| 227 | } |
231 | } |
| 228 | } |
232 | } |
| 229 | #endif |
233 | #endif |
Parent Directory
| 
Revision Log
| 
Patch