--- psiconv/trunk/program/psiconv/gen_image.c 1999/12/02 17:18:55 34 +++ psiconv/trunk/program/psiconv/gen_image.c 1999/12/02 20:09:59 38 @@ -46,13 +46,23 @@ #endif } -static void psiconv_gen_image_mbm(FILE *of, psiconv_mbm_f f, const char *dest) +static int psiconv_gen_image_mbm(FILE *of, psiconv_mbm_f f, const char *dest) { psiconv_paint_data_section section; - if (psiconv_list_length(f->sections) >= 1) { +#if IMAGEMAGICK + MagickInfo *mi = GetMagickInfo(dest); +#endif + if (psiconv_list_length(f->sections) == 1) { section = psiconv_list_get(f->sections,0); gen_paint_data_section(of,section,dest); - } + return 0; +#if IMAGEMAGICK + } else if ((mi->adjoin) && (psiconv_list_length(f->sections) >= 1)) { + /* Not yet supported... */ + return -1; +#endif + } else + return -1; } static void psiconv_gen_image_sketch(FILE *of, psiconv_sketch_f f, @@ -64,10 +74,9 @@ static int psiconv_gen_image(FILE * of, const psiconv_file file, const char *dest) { - if (file->type == psiconv_mbm_file) { - psiconv_gen_image_mbm(of,(psiconv_mbm_f) file->file,dest); - return 0; - } else if (file->type == psiconv_sketch_file) { + if (file->type == psiconv_mbm_file) + return psiconv_gen_image_mbm(of,(psiconv_mbm_f) file->file,dest); + else if (file->type == psiconv_sketch_file) { psiconv_gen_image_sketch(of,(psiconv_sketch_f) file->file,dest); return 0; } else