/[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 270 Revision 343
… …
89 ImageInfo *image_info; 89 ImageInfo *image_info;
90 ExceptionInfo exc; 90 ExceptionInfo exc;
91 size_t length; 91 size_t length;
92 char *data; 92 char *data;
93 int i; 93 int i;
94 94
95 strcpy(image->magick,dest); 95 strcpy(image->magick,dest);
96 image_info = CloneImageInfo(NULL); 96 image_info = CloneImageInfo(NULL);
97 GetExceptionInfo(&exc); 97 GetExceptionInfo(&exc);
98 data = ImageToBlob(image_info,image,&length,&exc); 98 data = ImageToBlob(image_info,image,&length,&exc);
99 if (!data || (exc.severity != UndefinedException)) { 99 if (!data || (exc.severity != UndefinedException)) {
… …
233 233
234void init_image(void) 234void init_image(void)
235{ 235{
236 struct fileformat_s ff; 236 struct fileformat_s ff;
237#if IMAGEMAGICK 237#if IMAGEMAGICK
238 const MagickInfo *mi; 238 const MagickInfo **mi;
239 int i;
240#if IMAGEMAGICK_API == 100
241 InitializeMagick(NULL);
242#endif
239 ff.output = gen_image; 243 ff.output = gen_image;
240 for (mi = GetMagickFileList(); mi ; mi = mi->next) { 244 mi = GetMagickFileList();
245 i = 0;
246 while (mi[i]) {
241 if (mi->encoder) { 247 if (mi[i]->encoder) {
242 ff.name = strdup(mi->name); 248 ff.name = strdup(mi[i]->name);
243 ff.description = strdup(mi->description); 249 ff.description = strdup(mi[i]->description);
244 ff.supported_format = FORMAT_CLIPART_SINGLE | FORMAT_MBM_SINGLE | 250 ff.supported_format = FORMAT_CLIPART_SINGLE | FORMAT_MBM_SINGLE |
245 FORMAT_SKETCH; 251 FORMAT_SKETCH;
246 if (mi->adjoin) 252 if (mi[i]->adjoin)
247 ff.supported_format |= FORMAT_MBM_MULTIPLE | FORMAT_CLIPART_MULTIPLE; 253 ff.supported_format |= FORMAT_MBM_MULTIPLE | FORMAT_CLIPART_MULTIPLE;
248 psiconv_list_add(fileformat_list,&ff); 254 psiconv_list_add(fileformat_list,&ff);
249 } 255 }
256 i++;
250 } 257 }
251#endif 258#endif
252} 259}
253 260
Legend:
Removed from v.270  
changed lines
  Added in v.343
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26