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

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

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

Revision 140 Revision 168
… …
24#include <string.h> 24#include <string.h>
25 25
26#include "parse_routines.h" 26#include "parse_routines.h"
27#include "error.h" 27#include "error.h"
28 28
29int psiconv_parse_page_header(const psiconv_buffer buf,int lev,psiconv_u32 off, 29#ifdef DMALLOC
30#include <dmalloc.h>
31#endif
32
33
34int psiconv_parse_page_header(const psiconv_config config,
35 const psiconv_buffer buf,int lev,psiconv_u32 off,
30 int *length,psiconv_page_header *result) 36 int *length,psiconv_page_header *result)
31{ 37{
32 int res = 0; 38 int res = 0;
33 int len = 0; 39 int len = 0;
34 int i,leng,has_content; 40 int i,leng,has_content;
35 psiconv_u32 temp; 41 psiconv_u32 temp;
36 42
37 psiconv_progress(lev+1,off,"Going to read a page header (or footer)"); 43 psiconv_progress(config,lev+1,off,"Going to read a page header (or footer)");
38 if (!(*result = malloc(sizeof(**result)))) 44 if (!(*result = malloc(sizeof(**result))))
39 goto ERROR1; 45 goto ERROR1;
40 46
41 psiconv_progress(lev+2,off+len, 47 psiconv_progress(config,lev+2,off+len,
42 "Going to read the has_content flag"); 48 "Going to read the has_content flag");
43 temp = psiconv_read_u8(buf,lev+2,off+len,&res); 49 temp = psiconv_read_u8(config,buf,lev+2,off+len,&res);
44 if (res) 50 if (res)
45 goto ERROR2; 51 goto ERROR2;
46 if (temp == 0x00) 52 if (temp == 0x00)
47 has_content = 0; 53 has_content = 0;
48 else if (temp == 0x01) 54 else if (temp == 0x01)
49 has_content = 1; 55 has_content = 1;
50 else { 56 else {
51 psiconv_warn(lev+2,off+len, 57 psiconv_warn(config,lev+2,off+len,
52 "Page header has_content flag unknown value (assumed default)"); 58 "Page header has_content flag unknown value (assumed default)");
53 psiconv_debug(lev+2,off+len,"Flag: %02x",temp); 59 psiconv_debug(config,lev+2,off+len,"Flag: %02x",temp);
54 has_content = 1; 60 has_content = 1;
55 } 61 }
56 psiconv_debug(lev+2,off+len,"Has_content flag: %02x",has_content); 62 psiconv_debug(config,lev+2,off+len,"Has_content flag: %02x",has_content);
57 len += 1; 63 len += 1;
58 64
59 psiconv_progress(lev+2,off+len,"Going to read displayed-on-first-page flag"); 65 psiconv_progress(config,lev+2,off+len,"Going to read displayed-on-first-page flag");
60 if ((res = psiconv_parse_bool(buf,lev+2,off+len,&leng, 66 if ((res = psiconv_parse_bool(config,buf,lev+2,off+len,&leng,
61 &(*result)->on_first_page))) 67 &(*result)->on_first_page)))
62 goto ERROR2; 68 goto ERROR2;
63 len += leng; 69 len += leng;
64 70
65 psiconv_progress(lev+2,off+len,"Going to read three zero bytes"); 71 psiconv_progress(config,lev+2,off+len,"Going to read three zero bytes");
66 for (i = 0; i < 0x03; i++,len++) { 72 for (i = 0; i < 0x03; i++,len++) {
67 temp = psiconv_read_u8(buf,lev+2,off+len,&res); 73 temp = psiconv_read_u8(config,buf,lev+2,off+len,&res);
68 if (res) 74 if (res)
69 goto ERROR2; 75 goto ERROR2;
70 if (temp != 0x00) { 76 if (temp != 0x00) {
71 psiconv_warn(lev+2,off+len, 77 psiconv_warn(config,lev+2,off+len,
72 "Page Header unknown value in zero bytes section"); 78 "Page Header unknown value in zero bytes section");
73 psiconv_debug(lev+2,off+len,"Byte %d: read %02x, expected %02x", 79 psiconv_debug(config,lev+2,off+len,"Byte %d: read %02x, expected %02x",
74 i,temp,0x00); 80 i,temp,0x00);
75 } 81 }
76 } 82 }
77 83
78 psiconv_progress(lev+2,off+len,"Going to read base paragraph layout"); 84 psiconv_progress(config,lev+2,off+len,"Going to read base paragraph layout");
79 if (!((*result)->base_paragraph_layout = psiconv_basic_paragraph_layout())) 85 if (!((*result)->base_paragraph_layout = psiconv_basic_paragraph_layout()))
80 goto ERROR2; 86 goto ERROR2;
81 87
82 if (has_content) { 88 if (has_content) {
83 if ((res = psiconv_parse_paragraph_layout_list(buf,lev+2,off+len,&leng, 89 if ((res = psiconv_parse_paragraph_layout_list(config,buf,lev+2,off+len,&leng,
84 (*result)->base_paragraph_layout))) 90 (*result)->base_paragraph_layout)))
85 goto ERROR3; 91 goto ERROR3;
86 len += leng; 92 len += leng;
87 } 93 }
88 94
89 psiconv_progress(lev+2,off+len,"Going to read base character layout"); 95 psiconv_progress(config,lev+2,off+len,"Going to read base character layout");
90 if (!((*result)->base_character_layout = psiconv_basic_character_layout())) 96 if (!((*result)->base_character_layout = psiconv_basic_character_layout()))
91 goto ERROR3; 97 goto ERROR3;
92 if (has_content) { 98 if (has_content) {
93 if ((res = psiconv_parse_character_layout_list(buf,lev+2,off+len,&leng, 99 if ((res = psiconv_parse_character_layout_list(config,buf,lev+2,off+len,&leng,
94 (*result)->base_character_layout))) 100 (*result)->base_character_layout)))
95 goto ERROR4; 101 goto ERROR4;
96 } 102 }
97 len += leng; 103 len += leng;
98 104
99 105
100 psiconv_progress(lev+2,off+len,"Going to read the TextEd section"); 106 psiconv_progress(config,lev+2,off+len,"Going to read the TextEd section");
101 if (has_content) { 107 if (has_content) {
102 if ((res = psiconv_parse_texted_section(buf,lev+2,off+len,&leng, 108 if ((res = psiconv_parse_texted_section(config,buf,lev+2,off+len,&leng,
103 &(*result)->text, 109 &(*result)->text,
104 (*result)->base_character_layout, 110 (*result)->base_character_layout,
105 (*result)->base_paragraph_layout))) 111 (*result)->base_paragraph_layout)))
106 goto ERROR4; 112 goto ERROR4;
107 len += leng; 113 len += leng;
… …
110 } 116 }
111 117
112 if (length) 118 if (length)
113 *length = len; 119 *length = len;
114 120
115 psiconv_progress(lev+1,off+len-1,"End of page header" 121 psiconv_progress(config,lev+1,off+len-1,"End of page header"
116 "(total length: %08x", len); 122 "(total length: %08x", len);
117 123
118 return res; 124 return res;
119 125
120ERROR4: 126ERROR4:
… …
122ERROR3: 128ERROR3:
123 psiconv_free_paragraph_layout((*result)->base_paragraph_layout); 129 psiconv_free_paragraph_layout((*result)->base_paragraph_layout);
124ERROR2: 130ERROR2:
125 free (*result); 131 free (*result);
126ERROR1: 132ERROR1:
127 psiconv_warn(lev+1,off,"Reading of Page Header failed"); 133 psiconv_warn(config,lev+1,off,"Reading of Page Header failed");
128 if (length) 134 if (length)
129 *length = 0; 135 *length = 0;
130 if (!res) 136 if (!res)
131 return -PSICONV_E_NOMEM; 137 return -PSICONV_E_NOMEM;
132 else 138 else
133 return res; 139 return res;
134} 140}
135 141
136int psiconv_parse_page_layout_section(const psiconv_buffer buf,int lev, 142int psiconv_parse_page_layout_section(const psiconv_config config,
143 const psiconv_buffer buf,int lev,
137 psiconv_u32 off, int *length, 144 psiconv_u32 off, int *length,
138 psiconv_page_layout_section *result) 145 psiconv_page_layout_section *result)
139{ 146{
140 int res = 0; 147 int res = 0;
141 int len = 0; 148 int len = 0;
142 int leng; 149 int leng;
143 psiconv_u32 temp; 150 psiconv_u32 temp;
144 151
145 psiconv_progress(lev+1,off,"Going to read the page layout section"); 152 psiconv_progress(config,lev+1,off,"Going to read the page layout section");
146 if (!(*result = malloc(sizeof(**result)))) 153 if (!(*result = malloc(sizeof(**result))))
147 goto ERROR1; 154 goto ERROR1;
148 155
149 psiconv_progress(lev+2,off+len,"Going to read first page number"); 156 psiconv_progress(config,lev+2,off+len,"Going to read first page number");
150 (*result)->first_page_nr = psiconv_read_u32(buf,lev+2,off+len,&res); 157 (*result)->first_page_nr = psiconv_read_u32(config,buf,lev+2,off+len,&res);
151 if (res) 158 if (res)
152 goto ERROR2; 159 goto ERROR2;
153 psiconv_debug(lev+2,off+len,"First page: %d",(*result)->first_page_nr); 160 psiconv_debug(config,lev+2,off+len,"First page: %d",(*result)->first_page_nr);
154 len += 4; 161 len += 4;
155 162
156 psiconv_progress(lev+2,off+len,"Going to read header distance"); 163 psiconv_progress(config,lev+2,off+len,"Going to read header distance");
157 (*result)->header_dist = psiconv_read_length(buf,lev+2,off+len,&leng,&res); 164 (*result)->header_dist = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res);
158 if (res) 165 if (res)
159 goto ERROR2; 166 goto ERROR2;
160 psiconv_debug(lev+2,off+len,"Header distance: %6.3f",(*result)->header_dist); 167 psiconv_debug(config,lev+2,off+len,"Header distance: %6.3f",(*result)->header_dist);
161 len += leng; 168 len += leng;
162 169
163 psiconv_progress(lev+2,off+len,"Going to read footer distance"); 170 psiconv_progress(config,lev+2,off+len,"Going to read footer distance");
164 (*result)->footer_dist = psiconv_read_length(buf,lev+2,off+len,&leng,&res); 171 (*result)->footer_dist = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res);
165 if (res) 172 if (res)
166 goto ERROR2; 173 goto ERROR2;
167 psiconv_debug(lev+2,off+len,"Footer distance: %6.3f",(*result)->footer_dist); 174 psiconv_debug(config,lev+2,off+len,"Footer distance: %6.3f",(*result)->footer_dist);
168 len += leng; 175 len += leng;
169 176
170 psiconv_progress(lev+2,off+len,"Going to read the left margin"); 177 psiconv_progress(config,lev+2,off+len,"Going to read the left margin");
171 (*result)->left_margin = psiconv_read_length(buf,lev+2,off+len,&leng,&res); 178 (*result)->left_margin = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res);
172 if (res) 179 if (res)
173 goto ERROR2; 180 goto ERROR2;
174 psiconv_debug(lev+2,off+len,"Left margin: %6.3f",(*result)->left_margin); 181 psiconv_debug(config,lev+2,off+len,"Left margin: %6.3f",(*result)->left_margin);
175 len += leng; 182 len += leng;
176 183
177 psiconv_progress(lev+2,off+len,"Going read the to right margin"); 184 psiconv_progress(config,lev+2,off+len,"Going read the to right margin");
178 (*result)->right_margin = psiconv_read_length(buf,lev+2,off+len,&leng,&res); 185 (*result)->right_margin = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res);
179 if (res) 186 if (res)
180 goto ERROR2; 187 goto ERROR2;
181 psiconv_debug(lev+2,off+len,"Right margin: %6.3f",(*result)->right_margin); 188 psiconv_debug(config,lev+2,off+len,"Right margin: %6.3f",(*result)->right_margin);
182 len += leng; 189 len += leng;
183 190
184 psiconv_progress(lev+2,off+len,"Going to read the top margin"); 191 psiconv_progress(config,lev+2,off+len,"Going to read the top margin");
185 (*result)->top_margin = psiconv_read_length(buf,lev+2,off+len,&leng,&res); 192 (*result)->top_margin = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res);
186 if (res) 193 if (res)
187 goto ERROR2; 194 goto ERROR2;
188 psiconv_debug(lev+2,off+len,"Top margin: %6.3f",(*result)->top_margin); 195 psiconv_debug(config,lev+2,off+len,"Top margin: %6.3f",(*result)->top_margin);
189 len += leng; 196 len += leng;
190 197
191 psiconv_progress(lev+2,off+len,"Going to read the bottom margin"); 198 psiconv_progress(config,lev+2,off+len,"Going to read the bottom margin");
192 (*result)->bottom_margin = psiconv_read_length(buf,lev+2,off+len,&leng,&res); 199 (*result)->bottom_margin = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res);
193 if (res) 200 if (res)
194 goto ERROR2; 201 goto ERROR2;
195 psiconv_debug(lev+2,off+len,"Bottom margin: %6.3f",(*result)->bottom_margin); 202 psiconv_debug(config,lev+2,off+len,"Bottom margin: %6.3f",(*result)->bottom_margin);
196 len += leng; 203 len += leng;
197 204
198 psiconv_progress(lev+2,off+len,"Going to read the header"); 205 psiconv_progress(config,lev+2,off+len,"Going to read the header");
199 if ((res = psiconv_parse_page_header(buf,lev+2,off+len,&leng, 206 if ((res = psiconv_parse_page_header(config,buf,lev+2,off+len,&leng,
200 &(*result)->header))) 207 &(*result)->header)))
201 goto ERROR2; 208 goto ERROR2;
202 len += leng; 209 len += leng;
203 210
204 psiconv_progress(lev+2,off+len,"Going to read the footer"); 211 psiconv_progress(config,lev+2,off+len,"Going to read the footer");
205 if ((res = psiconv_parse_page_header(buf,lev+2,off+len,&leng, 212 if ((res = psiconv_parse_page_header(config,buf,lev+2,off+len,&leng,
206 &(*result)->footer))) 213 &(*result)->footer)))
207 goto ERROR3; 214 goto ERROR3;
208 len += leng; 215 len += leng;
209 216
210 psiconv_progress(lev+2,off+len,"Going to read page dimensions id"); 217 psiconv_progress(config,lev+2,off+len,"Going to read page dimensions id");
211 temp = psiconv_read_u32(buf,lev+2,off+len,&res); 218 temp = psiconv_read_u32(config,buf,lev+2,off+len,&res);
212 if (res) 219 if (res)
213 goto ERROR4; 220 goto ERROR4;
214 if ((temp != PSICONV_ID_PAGE_DIMENSIONS1) && 221 if ((temp != PSICONV_ID_PAGE_DIMENSIONS1) &&
215 (temp != PSICONV_ID_PAGE_DIMENSIONS2)) { 222 (temp != PSICONV_ID_PAGE_DIMENSIONS2)) {
216 psiconv_warn(lev+2,off+len, 223 psiconv_warn(config,lev+2,off+len,
217 "Page layout section page dimensions marker not found"); 224 "Page layout section page dimensions marker not found");
218 psiconv_debug(lev+2,off+len, 225 psiconv_debug(config,lev+2,off+len,
219 "Page dimensions marker: read %08x, expected %08x or %08x", 226 "Page dimensions marker: read %08x, expected %08x or %08x",
220 temp, PSICONV_ID_PAGE_DIMENSIONS1, 227 temp, PSICONV_ID_PAGE_DIMENSIONS1,
221 PSICONV_ID_PAGE_DIMENSIONS2); 228 PSICONV_ID_PAGE_DIMENSIONS2);
222 } 229 }
223 len += 4; 230 len += 4;
224 231
225 psiconv_progress(lev+2,off+len,"Going to read the page width"); 232 psiconv_progress(config,lev+2,off+len,"Going to read the page width");
226 (*result)->page_width = psiconv_read_length(buf,lev+2,off+len,&leng,&res); 233 (*result)->page_width = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res);
227 if (res) 234 if (res)
228 goto ERROR4; 235 goto ERROR4;
229 psiconv_debug(lev+2,off+len,"Page width: %6.3f",(*result)->page_width); 236 psiconv_debug(config,lev+2,off+len,"Page width: %6.3f",(*result)->page_width);
230 len += leng; 237 len += leng;
231 238
232 psiconv_progress(lev+2,off+len,"Going to read the page height"); 239 psiconv_progress(config,lev+2,off+len,"Going to read the page height");
233 (*result)->page_height = psiconv_read_length(buf,lev+2,off+len,&leng,&res); 240 (*result)->page_height = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res);
234 if (res) 241 if (res)
235 goto ERROR4; 242 goto ERROR4;
236 psiconv_debug(lev+2,off+len,"Page height: %6.3f",(*result)->page_height); 243 psiconv_debug(config,lev+2,off+len,"Page height: %6.3f",(*result)->page_height);
237 len += leng; 244 len += leng;
238 245
239 psiconv_progress(lev+2,off+len,"Going to read page portrait/landscape"); 246 psiconv_progress(config,lev+2,off+len,"Going to read page portrait/landscape");
240 if ((res = psiconv_parse_bool(buf,lev+2,off+len,&leng,&(*result)->landscape))) 247 if ((res = psiconv_parse_bool(config,buf,lev+2,off+len,&leng,&(*result)->landscape)))
241 goto ERROR4; 248 goto ERROR4;
242 psiconv_debug(lev+2,off+len,"Landscape: %d",(*result)->landscape); 249 psiconv_debug(config,lev+2,off+len,"Landscape: %d",(*result)->landscape);
243 len += leng; 250 len += leng;
244 251
245 252
246 if (length) 253 if (length)
247 *length = len; 254 *length = len;
248 255
249 psiconv_progress(lev,off+len-1,"End of page section (total length: %08x)", 256 psiconv_progress(config,lev,off+len-1,"End of page section (total length: %08x)",
250 len); 257 len);
251 258
252 return res; 259 return res;
253 260
254ERROR4: 261ERROR4:
… …
256ERROR3: 263ERROR3:
257 psiconv_free_page_header((*result)->header); 264 psiconv_free_page_header((*result)->header);
258ERROR2: 265ERROR2:
259 free (*result); 266 free (*result);
260ERROR1: 267ERROR1:
261 psiconv_warn(lev+1,off,"Reading of Page Section failed"); 268 psiconv_warn(config,lev+1,off,"Reading of Page Section failed");
262 if (length) 269 if (length)
263 *length = 0; 270 *length = 0;
264 if (!res) 271 if (!res)
265 return -PSICONV_E_NOMEM; 272 return -PSICONV_E_NOMEM;
266 else 273 else
Legend:
Removed from v.140  
changed lines
  Added in v.168
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26