/[public]/psiconv/trunk/lib/psiconv/generate_driver.c
ViewVC logotype

Diff of /psiconv/trunk/lib/psiconv/generate_driver.c

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

Revision 171 Revision 174
… …
71 0x00000000))) 71 0x00000000)))
72 goto ERROR; 72 goto ERROR;
73 if ((res =psiconv_write_mbm_file(config,*buf, 73 if ((res =psiconv_write_mbm_file(config,*buf,
74 (psiconv_mbm_f) (value->file)))) 74 (psiconv_mbm_f) (value->file))))
75 goto ERROR; 75 goto ERROR;
76#if 0
77 } else if (value->type == psiconv_clipart_file) { 76 } else if (value->type == psiconv_clipart_file) {
77 /* No complete header section, so we do it all in the below function */
78 if ((res =psiconv_write_clipart_file(config,*buf, 78 if ((res =psiconv_write_clipart_file(config,*buf,
79 (psiconv_clipart_f) (value->file)))) 79 (psiconv_clipart_f) (value->file))))
80 goto ERROR; 80 goto ERROR;
81#endif
82 } else { 81 } else {
83 psiconv_warn(config,0,0,"Unknown or unsupported file type"); 82 psiconv_warn(config,0,0,"Unknown or unsupported file type");
84 res = -PSICONV_E_GENERATE; 83 res = -PSICONV_E_GENERATE;
85 goto ERROR; 84 goto ERROR;
86 } 85 }
… …
368 } 367 }
369 id = psiconv_buffer_unique_id(); 368 id = psiconv_buffer_unique_id();
370 psiconv_list_add(jumptable,&id); 369 psiconv_list_add(jumptable,&id);
371 if ((res = psiconv_buffer_add_target(buf,id))) 370 if ((res = psiconv_buffer_add_target(buf,id)))
372 goto ERROR2; 371 goto ERROR2;
373 if ((res = psiconv_write_paint_data_section(config,buf,section))) 372 if ((res = psiconv_write_paint_data_section(config,buf,section,0)))
374 goto ERROR2; 373 goto ERROR2;
375 } 374 }
376 375
377 if ((res = psiconv_buffer_add_target(buf,table_id))) 376 if ((res = psiconv_buffer_add_target(buf,table_id)))
378 goto ERROR2; 377 goto ERROR2;
… …
383ERROR2: 382ERROR2:
384 psiconv_list_free(jumptable); 383 psiconv_list_free(jumptable);
385ERROR1: 384ERROR1:
386 return res; 385 return res;
387} 386}
387
388/* Note: this file is special, because it does not have a complete header! */
389int psiconv_write_clipart_file(const psiconv_config config,
390 psiconv_buffer buf,psiconv_clipart_f value)
391{
392 int res,i;
393 psiconv_jumptable_section jumptable;
394 psiconv_u32 *entry,id;
395 psiconv_clipart_section section;
396 psiconv_buffer sec_buf;
397
398 if (!value) {
399 psiconv_warn(config,0,0,"Null Clipart file");
400 return -PSICONV_E_GENERATE;
401 }
402
403 if (!(jumptable = psiconv_list_new(sizeof(*entry)))) {
404 res = -PSICONV_E_NOMEM;
405 goto ERROR1;
406 }
407
408 if (!(sec_buf = psiconv_buffer_new())) {
409 res = -PSICONV_E_NOMEM;
410 goto ERROR2;
411 }
412
413 if ((res = psiconv_write_u32(config,buf,PSICONV_ID_CLIPART)))
414 goto ERROR3;
415
416 for (i = 0; i < psiconv_list_length(value->sections); i++) {
417 if (!(section = psiconv_list_get(value->sections,i))) {
418 psiconv_warn(config,0,0,"Massive memory corruption");
419 res = -PSICONV_E_NOMEM;
420 goto ERROR3;
421 }
422 id = psiconv_buffer_unique_id();
423 psiconv_list_add(jumptable,&id);
424 if ((res = psiconv_buffer_add_target(sec_buf,id)))
425 goto ERROR3;
426 if ((res = psiconv_write_clipart_section(config,sec_buf, section)))
427 goto ERROR3;
428 }
429
430 if ((res = psiconv_write_jumptable_section(config,buf,jumptable)))
431 goto ERROR3;
432
433 if ((res = psiconv_buffer_concat(buf,sec_buf)))
434 goto ERROR3;
435
436
437ERROR3:
438 psiconv_buffer_free(sec_buf);
439ERROR2:
440 psiconv_list_free(jumptable);
441ERROR1:
442 return res;
443}
Legend:
Removed from v.171  
changed lines
  Added in v.174
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26