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