… | |
… | |
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); |
… | |
… | |
198 | DestroyImage(image); |
202 | DestroyImage(image); |
199 | #endif |
203 | #endif |
200 | } |
204 | } |
201 | |
205 | |
202 | static int psiconv_gen_image(const char * filename, const psiconv_file file, |
206 | static int psiconv_gen_image(const char * filename, const psiconv_file file, |
203 | const char *dest) |
207 | const char *dest, |
|
|
208 | const psiconv_encoding encoding_type) |
|
|
209 | /* Here the encoding_type is a dummy */ |
204 | { |
210 | { |
205 | if (file->type == psiconv_mbm_file) |
211 | if (file->type == psiconv_mbm_file) |
206 | psiconv_gen_image_mbm(filename,(psiconv_mbm_f) file->file,dest); |
212 | psiconv_gen_image_mbm(filename,(psiconv_mbm_f) file->file,dest); |
207 | else if (file->type == psiconv_clipart_file) |
213 | else if (file->type == psiconv_clipart_file) |
208 | psiconv_gen_image_clipart(filename,(psiconv_clipart_f) file->file,dest); |
214 | psiconv_gen_image_clipart(filename,(psiconv_clipart_f) file->file,dest); |