--- psiconv/trunk/program/psiconv/gen_image.c 2014/10/20 08:40:49 342 +++ psiconv/trunk/program/psiconv/gen_image.c 2014/10/20 11:44:17 343 @@ -91,7 +91,7 @@ size_t length; char *data; int i; - + strcpy(image->magick,dest); image_info = CloneImageInfo(NULL); GetExceptionInfo(&exc); @@ -235,18 +235,25 @@ { struct fileformat_s ff; #if IMAGEMAGICK - const MagickInfo *mi; + const MagickInfo **mi; + int i; +#if IMAGEMAGICK_API == 100 + InitializeMagick(NULL); +#endif ff.output = gen_image; - for (mi = GetMagickFileList(); mi ; mi = mi->next) { - if (mi->encoder) { - ff.name = strdup(mi->name); - ff.description = strdup(mi->description); + mi = GetMagickFileList(); + i = 0; + while (mi[i]) { + if (mi[i]->encoder) { + ff.name = strdup(mi[i]->name); + ff.description = strdup(mi[i]->description); ff.supported_format = FORMAT_CLIPART_SINGLE | FORMAT_MBM_SINGLE | FORMAT_SKETCH; - if (mi->adjoin) + if (mi[i]->adjoin) ff.supported_format |= FORMAT_MBM_MULTIPLE | FORMAT_CLIPART_MULTIPLE; psiconv_list_add(fileformat_list,&ff); } + i++; } #endif }