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

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

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

Revision 73 Revision 142
… …
24#include <string.h> 24#include <string.h>
25 25
26#include "generate_routines.h" 26#include "generate_routines.h"
27#include "error.h" 27#include "error.h"
28 28
29#ifdef DMALLOC
30#include <dmalloc.h>
31#endif
32
33
29 34
30int psiconv_write_page_header(psiconv_buffer buf, 35int psiconv_write_page_header(psiconv_buffer buf,
31 const psiconv_page_header value) 36 const psiconv_page_header value,
37 psiconv_buffer *extra_buf)
32{ 38{
33 int res; 39 int res;
34 psiconv_paragraph_layout basepara; 40 psiconv_paragraph_layout basepara;
35 psiconv_character_layout basechar; 41 psiconv_character_layout basechar;
36 42
37 if (!value) { 43 if (!value) {
38 psiconv_warn(0,psiconv_list_length(buf),"Null page header"); 44 psiconv_warn(0,psiconv_buffer_length(buf),"Null page header");
39 res = -PSICONV_E_GENERATE; 45 res = -PSICONV_E_GENERATE;
40 goto ERROR1; 46 goto ERROR1;
41 } 47 }
42 48
43 if (!(basepara=psiconv_basic_paragraph_layout())) { 49 if (!(basepara=psiconv_basic_paragraph_layout())) {
… …
52 /* Unknown byte */ 58 /* Unknown byte */
53 if ((res = psiconv_write_u8(buf,0x01))) 59 if ((res = psiconv_write_u8(buf,0x01)))
54 goto ERROR3; 60 goto ERROR3;
55 if ((res = psiconv_write_bool(buf,value->on_first_page))) 61 if ((res = psiconv_write_bool(buf,value->on_first_page)))
56 goto ERROR3; 62 goto ERROR3;
63 /* Three unknown bytes */
64 if ((res = psiconv_write_u8(buf,0x00)))
65 goto ERROR3;
66 if ((res = psiconv_write_u8(buf,0x00)))
67 goto ERROR3;
68 if ((res = psiconv_write_u8(buf,0x00)))
69 goto ERROR3;
57 if ((res = psiconv_write_paragraph_layout_list(buf, 70 if ((res = psiconv_write_paragraph_layout_list(buf,
58 value->base_paragraph_layout,basepara))) 71 value->base_paragraph_layout,basepara)))
59 goto ERROR3; 72 goto ERROR3;
60 if ((res = psiconv_write_character_layout_list(buf, 73 if ((res = psiconv_write_character_layout_list(buf,
61 value->base_character_layout,basechar))) 74 value->base_character_layout,basechar)))
62 goto ERROR3; 75 goto ERROR3;
63 res = psiconv_write_texted_section(buf,value->text, 76 res = psiconv_write_texted_section(buf,value->text,
64 value->base_character_layout, 77 value->base_character_layout,
65 value->base_paragraph_layout); 78 value->base_paragraph_layout,extra_buf);
66ERROR3: 79ERROR3:
67 psiconv_free_character_layout(basechar); 80 psiconv_free_character_layout(basechar);
68ERROR2: 81ERROR2:
69 psiconv_free_paragraph_layout(basepara); 82 psiconv_free_paragraph_layout(basepara);
70ERROR1: 83ERROR1:
… …
73 86
74int psiconv_write_page_layout_section(psiconv_buffer buf, 87int psiconv_write_page_layout_section(psiconv_buffer buf,
75 const psiconv_page_layout_section value) 88 const psiconv_page_layout_section value)
76{ 89{
77 int res; 90 int res;
91 psiconv_buffer header_buf,footer_buf;
78 92
79 if (!value) { 93 if (!value) {
80 psiconv_warn(0,psiconv_list_length(buf),"Null page section"); 94 psiconv_warn(0,psiconv_buffer_length(buf),"Null page section");
81 return -PSICONV_E_GENERATE; 95 res = -PSICONV_E_GENERATE;
96 goto ERROR1;
82 } 97 }
83 98
84 if ((res = psiconv_write_u32(buf,value->first_page_nr))) 99 if ((res = psiconv_write_u32(buf,value->first_page_nr)))
85 return res; 100 goto ERROR1;
86 if ((res = psiconv_write_length(buf,value->header_dist))) 101 if ((res = psiconv_write_length(buf,value->header_dist)))
87 return res; 102 goto ERROR1;
88 if ((res = psiconv_write_length(buf,value->footer_dist))) 103 if ((res = psiconv_write_length(buf,value->footer_dist)))
89 return res; 104 goto ERROR1;
90 if ((res = psiconv_write_length(buf,value->left_margin))) 105 if ((res = psiconv_write_length(buf,value->left_margin)))
91 return res; 106 goto ERROR1;
92 if ((res = psiconv_write_length(buf,value->right_margin))) 107 if ((res = psiconv_write_length(buf,value->right_margin)))
93 return res; 108 goto ERROR1;
94 if ((res = psiconv_write_length(buf,value->top_margin))) 109 if ((res = psiconv_write_length(buf,value->top_margin)))
95 return res; 110 goto ERROR1;
96 if ((res = psiconv_write_length(buf,value->bottom_margin))) 111 if ((res = psiconv_write_length(buf,value->bottom_margin)))
97 return res; 112 goto ERROR1;
98 if ((res = psiconv_write_page_header(buf,value->header))) 113 if ((res = psiconv_write_page_header(buf,value->header,&header_buf)))
99 return res; 114 goto ERROR1;
100 if ((res = psiconv_write_page_header(buf,value->footer))) 115 if ((res = psiconv_write_page_header(buf,value->footer,&footer_buf)))
101 return res; 116 goto ERROR2;
102 if ((res = psiconv_write_u32(buf,PSICONV_ID_PAGE_DIMENSIONS))) 117 if ((res = psiconv_write_u32(buf,PSICONV_ID_PAGE_DIMENSIONS2)))
103 return res; 118 goto ERROR3;
104 if ((res = psiconv_write_length(buf,value->page_width))) 119 if ((res = psiconv_write_length(buf,value->page_width)))
120 goto ERROR3;
121 if ((res = psiconv_write_length(buf,value->page_height)))
122 goto ERROR3;
123 if ((res = psiconv_write_bool(buf,value->landscape)))
124 goto ERROR3;
125 if ((res = psiconv_buffer_concat(buf,header_buf)))
126 goto ERROR3;
127 res = psiconv_buffer_concat(buf,footer_buf);
128
129
130ERROR3:
131 psiconv_buffer_free(footer_buf);
132ERROR2:
133 psiconv_buffer_free(header_buf);
134ERROR1:
105 return res; 135 return res;
106 return psiconv_write_length(buf,value->page_height);
107} 136}
Legend:
Removed from v.73  
changed lines
  Added in v.142
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26