--- psiconv/trunk/lib/psiconv/parse_driver.c 1999/10/29 21:14:58 24 +++ psiconv/trunk/lib/psiconv/parse_driver.c 1999/12/03 23:13:55 42 @@ -68,6 +68,9 @@ else if ((*result)->type == psiconv_sketch_file) res = psiconv_parse_sketch_file(buf,lev+2,leng, (psiconv_sketch_f *)(&((*result)->file))); + else if ((*result)->type == psiconv_clipart_file) + res = psiconv_parse_clipart_file(buf,lev+2,leng, + (psiconv_clipart_f *)(&((*result)->file))); else { psiconv_warn(lev+1,off,"Can't parse this file yet!"); (*result)->file = NULL; @@ -77,12 +80,20 @@ return res; } +int psiconv_parse_clipart_file(const psiconv_buffer buf,int lev, + psiconv_u32 off, psiconv_clipart_f *result) +{ + int res=0; + (*result) = malloc(sizeof(**result)); + return 0; +} + int psiconv_parse_mbm_file(const psiconv_buffer buf,int lev, psiconv_u32 off, psiconv_mbm_f *result) { int res=0; int i; - psiconv_mbm_jumptable_section table; + psiconv_jumptable_section table; psiconv_paint_data_section paint; psiconv_u32 *entry; psiconv_u32 sto; @@ -95,7 +106,7 @@ psiconv_debug(lev+2,off,"Offset: %08x",sto); psiconv_progress(lev+2,off,"Going to read the MBM jumptable"); - res |= psiconv_parse_mbm_jumptable_section(buf,lev+2,sto, NULL,&table); + res |= psiconv_parse_jumptable_section(buf,lev+2,sto, NULL,&table); psiconv_progress(lev+2,off,"Going to read the picture sections"); (*result)->sections = psiconv_list_new(sizeof(*paint)); @@ -106,7 +117,7 @@ psiconv_list_add((*result)->sections,paint); } - psiconv_free_mbm_jumptable_section(table); + psiconv_free_jumptable_section(table); psiconv_progress(lev+1,off,"End of mbm file"); return res; }