/[public]/psiconv/trunk/program/psiconv/gen_image.c
ViewVC logotype

Diff of /psiconv/trunk/program/psiconv/gen_image.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 118 Revision 138
… …
74static int psiconv_gen_image_clipart(const char *filename, psiconv_clipart_f f, 74static int psiconv_gen_image_clipart(const char *filename, psiconv_clipart_f f,
75 const char *dest) 75 const char *dest)
76{ 76{
77#if IMAGEMAGICK 77#if IMAGEMAGICK
78 psiconv_clipart_section section; 78 psiconv_clipart_section section;
79 MagickInfo *mi; 79 const MagickInfo *mi;
80 ImageInfo *image_info; 80 ImageInfo *image_info;
81 Image *image = NULL; 81 Image *image = NULL;
82 Image *last_image = NULL; 82 Image *last_image = NULL;
83 Image *this_image, *images; 83 Image *this_image, *images;
84 ExceptionInfo exc; 84 ExceptionInfo exc;
… …
130 const char *dest) 130 const char *dest)
131{ 131{
132 132
133#if IMAGEMAGICK 133#if IMAGEMAGICK
134 psiconv_paint_data_section section; 134 psiconv_paint_data_section section;
135 MagickInfo *mi; 135 const MagickInfo *mi;
136 ImageInfo *image_info; 136 ImageInfo *image_info;
137 Image *image = NULL; 137 Image *image = NULL;
138 Image *last_image = NULL; 138 Image *last_image = NULL;
139 Image *this_image, *images; 139 Image *this_image, *images;
140 ExceptionInfo exc; 140 ExceptionInfo exc;
… …
215 215
216void init_image(void) 216void init_image(void)
217{ 217{
218 struct psiconv_fileformat_s ff; 218 struct psiconv_fileformat_s ff;
219#if IMAGEMAGICK 219#if IMAGEMAGICK
220 MagickInfo *mi; 220 const MagickInfo *mi;
221 ff.output = psiconv_gen_image; 221 ff.output = psiconv_gen_image;
222 for (mi = GetMagickFileList(); mi ; mi = mi->next) { 222 for (mi = GetMagickFileList(); mi ; mi = mi->next) {
223 if (mi->encoder) { 223 if (mi->encoder) {
224 ff.name = strdup(mi->tag); 224 ff.name = strdup(mi->name);
225 ff.description = strdup(mi->description); 225 ff.description = strdup(mi->description);
226 psiconv_list_add(fileformat_list,&ff); 226 psiconv_list_add(fileformat_list,&ff);
227 } 227 }
228 } 228 }
229#endif 229#endif
Legend:
Removed from v.118  
changed lines
  Added in v.138
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26