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

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

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

Revision 75 Revision 76
272 !value->top_border->color || !base->top_border->color || 272 !value->top_border->color || !base->top_border->color ||
273 (value->top_border->kind != base->top_border->kind) || 273 (value->top_border->kind != base->top_border->kind) ||
274 (value->top_border->thickness != base->top_border->thickness) || 274 (value->top_border->thickness != base->top_border->thickness) ||
275 (value->top_border->color->red != base->top_border->color->red) || 275 (value->top_border->color->red != base->top_border->color->red) ||
276 (value->top_border->color->green != base->top_border->color->green) || 276 (value->top_border->color->green != base->top_border->color->green) ||
277 (value->top_border->color->blue != base->top_border->color->blue)) 277 (value->top_border->color->blue != base->top_border->color->blue)) {
278 if ((res = psiconv_write_u8(extra_buf,0x11))) 278 if ((res = psiconv_write_u8(extra_buf,0x11)))
279 goto ERROR; 279 goto ERROR;
280 if ((res = psiconv_write_border(extra_buf,value->top_border))) { 280 if ((res = psiconv_write_border(extra_buf,value->top_border)))
281 goto ERROR; 281 goto ERROR;
282 } 282 }
283 283
284 if (!base || !value->top_border || !base->top_border || 284 if (!base || !value->top_border || !base->top_border ||
285 !value->top_border->color || !base->top_border->color || 285 !value->top_border->color || !base->top_border->color ||
387 if ((res = psiconv_write_tab(extra_buf,value_tab))) 387 if ((res = psiconv_write_tab(extra_buf,value_tab)))
388 goto ERROR; 388 goto ERROR;
389 } 389 }
390 } 390 }
391 391
392 if ((res = psiconv_write_u32(buf,psiconv_list_length(extra_buf))))
393 goto ERROR;
394
392 res = psiconv_list_concat(buf,extra_buf); 395 res = psiconv_list_concat(buf,extra_buf);
393 396
394ERROR: 397ERROR:
395 psiconv_free_buffer(extra_buf); 398 psiconv_free_buffer(extra_buf);
396 return res; 399 return res;
486 goto ERROR; 489 goto ERROR;
487 if ((res = psiconv_write_font(extra_buf,value->font))) 490 if ((res = psiconv_write_font(extra_buf,value->font)))
488 goto ERROR; 491 goto ERROR;
489 } 492 }
490 493
494 if ((res = psiconv_write_u32(buf,psiconv_list_length(extra_buf))))
495 goto ERROR;
496
491 res = psiconv_list_concat(buf,extra_buf); 497 res = psiconv_list_concat(buf,extra_buf);
492 498
493ERROR: 499ERROR:
494 psiconv_free_buffer(extra_buf); 500 psiconv_free_buffer(extra_buf);
495 return res; 501 return res;

Legend:
Removed from v.75  
changed lines
  Added in v.76

frodo@frodo.looijaard.name
ViewVC Help
Powered by ViewVC 1.1.26