/[public]/psiconv/trunk/lib/psiconv/parse_routines.h
ViewVC logotype

Diff of /psiconv/trunk/lib/psiconv/parse_routines.h

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

Revision 129 Revision 168
22 22
23#include <psiconv/general.h> 23#include <psiconv/general.h>
24#include <psiconv/data.h> 24#include <psiconv/data.h>
25#include <psiconv/buffer.h> 25#include <psiconv/buffer.h>
26#include <psiconv/common.h> 26#include <psiconv/common.h>
27#include <psiconv/configuration.h>
27 28
28#ifdef __cplusplus 29#ifdef __cplusplus
29extern "C" { 30extern "C" {
30#endif /* __cplusplus */ 31#endif /* __cplusplus */
31 32
32 33
33/* ****************** 34/* ******************
34 * parse_simple.c * 35 * parse_simple.c *
35 ****************** */ 36 ****************** */
36 37
37extern psiconv_u8 psiconv_read_u8(const psiconv_buffer buf,int lev, 38extern psiconv_u8 psiconv_read_u8(const psiconv_config config,
39 const psiconv_buffer buf,int lev,
38 psiconv_u32 off, int *status); 40 psiconv_u32 off, int *status);
39extern psiconv_u16 psiconv_read_u16(const psiconv_buffer buf,int lev, 41extern psiconv_u16 psiconv_read_u16(const psiconv_config config,
42 const psiconv_buffer buf,int lev,
40 psiconv_u32 off, int *status); 43 psiconv_u32 off, int *status);
41extern psiconv_u32 psiconv_read_u32(const psiconv_buffer buf,int lev, 44extern psiconv_u32 psiconv_read_u32(const psiconv_config config,
45 const psiconv_buffer buf,int lev,
42 psiconv_u32 off, int *status); 46 psiconv_u32 off, int *status);
43extern psiconv_s32 psiconv_read_sint(const psiconv_buffer buf,int lev, 47extern psiconv_s32 psiconv_read_sint(const psiconv_config config,
48 const psiconv_buffer buf,int lev,
44 psiconv_u32 off, int *length, int *status); 49 psiconv_u32 off, int *length, int *status);
45 50
46extern psiconv_S_t psiconv_read_S(const psiconv_buffer buf, int lev, 51extern psiconv_S_t psiconv_read_S(const psiconv_config config,
52 const psiconv_buffer buf, int lev,
47 psiconv_u32 off, int *length, int *status); 53 psiconv_u32 off, int *length, int *status);
48extern psiconv_X_t psiconv_read_X(const psiconv_buffer buf, int lev, 54extern psiconv_X_t psiconv_read_X(const psiconv_config config,
55 const psiconv_buffer buf, int lev,
49 psiconv_u32 off, int *length, int *status); 56 psiconv_u32 off, int *length, int *status);
50extern psiconv_length_t psiconv_read_length(const psiconv_buffer buf, int lev, 57extern psiconv_length_t psiconv_read_length(const psiconv_config config,
58 const psiconv_buffer buf, int lev,
51 psiconv_u32 off, int *length, 59 psiconv_u32 off, int *length,
52 int *status); 60 int *status);
53extern psiconv_size_t psiconv_read_size (const psiconv_buffer buf, int lev, 61extern psiconv_size_t psiconv_read_size (const psiconv_config config,
62 const psiconv_buffer buf, int lev,
54 psiconv_u32 off, int *length, 63 psiconv_u32 off, int *length,
55 int *status); 64 int *status);
56extern psiconv_string_t psiconv_read_string(const psiconv_buffer buf,int lev, 65extern psiconv_string_t psiconv_read_string(const psiconv_config config,
66 const psiconv_buffer buf,int lev,
57 psiconv_u32 off,int *length, 67 psiconv_u32 off,int *length,
58 int *status); 68 int *status);
59extern psiconv_string_t psiconv_read_short_string(const psiconv_buffer buf, 69extern psiconv_string_t psiconv_read_short_string(const psiconv_config config,
70 const psiconv_buffer buf,
60 int lev,psiconv_u32 off, 71 int lev,psiconv_u32 off,
61 int *length,int *status); 72 int *length,int *status);
62 73
63extern int psiconv_parse_bool(const psiconv_buffer buf, int lev, 74extern int psiconv_parse_bool(const psiconv_config config,
75 const psiconv_buffer buf, int lev,
64 psiconv_u32 off, int *length, 76 psiconv_u32 off, int *length,
65 psiconv_bool_t *result); 77 psiconv_bool_t *result);
66 78
67extern psiconv_float_t psiconv_read_float(const psiconv_buffer buf, int lev, 79extern psiconv_float_t psiconv_read_float(const psiconv_config config,
80 const psiconv_buffer buf, int lev,
68 psiconv_u32 off, int *length, int *status); 81 psiconv_u32 off, int *length, int *status);
69 82
70 83
71 84
72/* ****************** 85/* ******************
73 * parse_layout.c * 86 * parse_layout.c *
74 ****************** */ 87 ****************** */
75 88
76extern int psiconv_parse_color(const psiconv_buffer buf, int lev, 89extern int psiconv_parse_color(const psiconv_config config,
90 const psiconv_buffer buf, int lev,
77 psiconv_u32 off, int *length, 91 psiconv_u32 off, int *length,
78 psiconv_color *result); 92 psiconv_color *result);
79 93
80extern int psiconv_parse_font(const psiconv_buffer buf, int lev, 94extern int psiconv_parse_font(const psiconv_config config,
95 const psiconv_buffer buf, int lev,
81 psiconv_u32 off, int *length, 96 psiconv_u32 off, int *length,
82 psiconv_font *result); 97 psiconv_font *result);
83 98
84extern int psiconv_parse_border(const psiconv_buffer buf,int lev, 99extern int psiconv_parse_border(const psiconv_config config,
100 const psiconv_buffer buf,int lev,
85 psiconv_u32 off, int *length, 101 psiconv_u32 off, int *length,
86 psiconv_border *result); 102 psiconv_border *result);
87 103
88extern int psiconv_parse_bullet(const psiconv_buffer buf,int lev, 104extern int psiconv_parse_bullet(const psiconv_config config,
105 const psiconv_buffer buf,int lev,
89 psiconv_u32 off, int *length, 106 psiconv_u32 off, int *length,
90 psiconv_bullet *result); 107 psiconv_bullet *result);
91 108
92extern int psiconv_parse_tab(const psiconv_buffer buf, int lev, 109extern int psiconv_parse_tab(const psiconv_config config,
110 const psiconv_buffer buf, int lev,
93 psiconv_u32 off, int *length, 111 psiconv_u32 off, int *length,
94 psiconv_tab *result); 112 psiconv_tab *result);
95 113
96/* Note: the next two are special, because they modify an existing 114/* Note: the next two are special, because they modify an existing
97 layout structure! If it exits due to an unexpected error, part 115 layout structure! If it exits due to an unexpected error, part
98 of the structure may be modified, but it is still safe to call 116 of the structure may be modified, but it is still safe to call
99 psiconv_free_{paragraph,character}_layout_list on it (and that 117 psiconv_free_{paragraph,character}_layout_list on it (and that
100 is the only safe thing to do!) */ 118 is the only safe thing to do!) */
101 119
102extern int psiconv_parse_paragraph_layout_list(const psiconv_buffer buf, 120extern int psiconv_parse_paragraph_layout_list(const psiconv_config config,
121 const psiconv_buffer buf,
103 int lev, psiconv_u32 off, int *length, 122 int lev, psiconv_u32 off, int *length,
104 psiconv_paragraph_layout result); 123 psiconv_paragraph_layout result);
105 124
106extern int psiconv_parse_character_layout_list(const psiconv_buffer buf, 125extern int psiconv_parse_character_layout_list(const psiconv_config config,
126 const psiconv_buffer buf,
107 int lev, psiconv_u32 off, int *length, 127 int lev, psiconv_u32 off, int *length,
108 psiconv_character_layout result); 128 psiconv_character_layout result);
109 129
110 130
111/* **************** 131/* ****************
112 * parse_page.c * 132 * parse_page.c *
113 **************** */ 133 **************** */
114 134
115extern int psiconv_parse_page_header(const psiconv_buffer buf,int lev, 135extern int psiconv_parse_page_header(const psiconv_config config,
136 const psiconv_buffer buf,int lev,
116 psiconv_u32 off, int *length, 137 psiconv_u32 off, int *length,
117 psiconv_page_header *result); 138 psiconv_page_header *result);
118 139
119extern int psiconv_parse_page_layout_section(const psiconv_buffer buf,int lev, 140extern int psiconv_parse_page_layout_section(const psiconv_config config,
141 const psiconv_buffer buf,int lev,
120 psiconv_u32 off, int *length, 142 psiconv_u32 off, int *length,
121 psiconv_page_layout_section *result); 143 psiconv_page_layout_section *result);
122 144
123/* ****************** 145/* ******************
124 * parse_common.c * 146 * parse_common.c *
125 ****************** */ 147 ****************** */
126 148
127extern int psiconv_parse_header_section(const psiconv_buffer buf,int lev, 149extern int psiconv_parse_header_section(const psiconv_config config,
150 const psiconv_buffer buf,int lev,
128 psiconv_u32 off, int *length, 151 psiconv_u32 off, int *length,
129 psiconv_header_section *result); 152 psiconv_header_section *result);
130 153
131extern int psiconv_parse_section_table_section(const psiconv_buffer buf, 154extern int psiconv_parse_section_table_section(const psiconv_config config,
155 const psiconv_buffer buf,
132 int lev, psiconv_u32 off, 156 int lev, psiconv_u32 off,
133 int *length, 157 int *length,
134 psiconv_section_table_section *result); 158 psiconv_section_table_section *result);
135 159
136extern int psiconv_parse_application_id_section(const psiconv_buffer buf, 160extern int psiconv_parse_application_id_section(const psiconv_config config,
161 const psiconv_buffer buf,
137 int lev, psiconv_u32 off, int *length, 162 int lev, psiconv_u32 off, int *length,
138 psiconv_application_id_section *result); 163 psiconv_application_id_section *result);
139 164
140extern int psiconv_parse_text_section(const psiconv_buffer buf,int lev, 165extern int psiconv_parse_text_section(const psiconv_config config,
166 const psiconv_buffer buf,int lev,
141 psiconv_u32 off, int *length, 167 psiconv_u32 off, int *length,
142 psiconv_text_and_layout *result); 168 psiconv_text_and_layout *result);
143 169
144extern int psiconv_parse_styled_layout_section(const psiconv_buffer buf, 170extern int psiconv_parse_styled_layout_section(const psiconv_config config,
171 const psiconv_buffer buf,
145 int lev,psiconv_u32 off, 172 int lev,psiconv_u32 off,
146 int *length, 173 int *length,
147 psiconv_text_and_layout result, 174 psiconv_text_and_layout result,
148 const psiconv_word_styles_section styles); 175 const psiconv_word_styles_section styles);
176
149extern int psiconv_parse_styleless_layout_section(const psiconv_buffer buf, 177extern int psiconv_parse_styleless_layout_section(const psiconv_config config,
178 const psiconv_buffer buf,
150 int lev,psiconv_u32 off, 179 int lev,psiconv_u32 off,
151 int *length, 180 int *length,
152 psiconv_text_and_layout result, 181 psiconv_text_and_layout result,
153 const psiconv_character_layout base_char, 182 const psiconv_character_layout base_char,
154 const psiconv_paragraph_layout base_para); 183 const psiconv_paragraph_layout base_para);
155 184
185extern int psiconv_parse_embedded_object_section
186 (const psiconv_config config,
187 const psiconv_buffer buf, int lev,
188 psiconv_u32 off, int *length,
189 psiconv_embedded_object_section *result);
190
191extern int psiconv_parse_object_display_section(const psiconv_config config,
192 const psiconv_buffer buf,
193 int lev,
194 psiconv_u32 off, int *length,
195 psiconv_object_display_section *result);
196
197extern int psiconv_parse_object_icon_section(const psiconv_config config,
198 const psiconv_buffer buf,int lev,
199 psiconv_u32 off, int *length,
200 psiconv_object_icon_section *result);
201
202
203
204
156 205
157/* ****************** 206/* ******************
158 * parse_texted.c * 207 * parse_texted.c *
159 ****************** */ 208 ****************** */
160 209
161extern int psiconv_parse_texted_section(const psiconv_buffer buf,int lev, 210extern int psiconv_parse_texted_section(const psiconv_config config,
211 const psiconv_buffer buf,int lev,
162 psiconv_u32 off, int *length, 212 psiconv_u32 off, int *length,
163 psiconv_texted_section *result, 213 psiconv_texted_section *result,
164 psiconv_character_layout base_char, 214 psiconv_character_layout base_char,
165 psiconv_paragraph_layout base_para); 215 psiconv_paragraph_layout base_para);
166 216
167 217
168/* **************** 218/* ****************
169 * parse_word.c * 219 * parse_word.c *
170 **************** */ 220 **************** */
171 221
172extern int psiconv_parse_word_status_section(const psiconv_buffer buf, int lev, 222extern int psiconv_parse_word_status_section(const psiconv_config config,
223 const psiconv_buffer buf, int lev,
173 psiconv_u32 off, int *length, 224 psiconv_u32 off, int *length,
174 psiconv_word_status_section *result); 225 psiconv_word_status_section *result);
175 226
176extern int psiconv_parse_word_styles_section(const psiconv_buffer buf, int lev, 227extern int psiconv_parse_word_styles_section(const psiconv_config config,
228 const psiconv_buffer buf, int lev,
177 psiconv_u32 off, int *length, 229 psiconv_u32 off, int *length,
178 psiconv_word_styles_section *result); 230 psiconv_word_styles_section *result);
179 231
180 232
181/* ***************** 233/* *****************
182 * parse_sheet.c * 234 * parse_sheet.c *
183 ***************** */ 235 ***************** */
184 236
185extern int psiconv_parse_sheet_status_section(const psiconv_buffer buf, int lev, 237extern int psiconv_parse_sheet_status_section(const psiconv_config config,
238 const psiconv_buffer buf, int lev,
186 psiconv_u32 off, int *length, 239 psiconv_u32 off, int *length,
187 psiconv_sheet_status_section *result); 240 psiconv_sheet_status_section *result);
188 241
189extern int psiconv_parse_sheet_formula_list(const psiconv_buffer buf, int lev, 242extern int psiconv_parse_sheet_formula_list(const psiconv_config config,
243 const psiconv_buffer buf, int lev,
190 psiconv_u32 off, int *length, 244 psiconv_u32 off, int *length,
191 psiconv_formula_list *result); 245 psiconv_formula_list *result);
192 246
193extern int psiconv_parse_formula(const psiconv_buffer buf, int lev, 247extern int psiconv_parse_formula(const psiconv_config config,
248 const psiconv_buffer buf, int lev,
194 psiconv_u32 off, int *length, 249 psiconv_u32 off, int *length,
195 psiconv_formula *result); 250 psiconv_formula *result);
196 251
197extern int psiconv_parse_sheet_workbook_section(const psiconv_buffer buf, 252extern int psiconv_parse_sheet_workbook_section(const psiconv_config config,
253 const psiconv_buffer buf,
198 int lev, 254 int lev,
199 psiconv_u32 off, int *length, 255 psiconv_u32 off, int *length,
200 psiconv_sheet_workbook_section *result); 256 psiconv_sheet_workbook_section *result);
201extern int psiconv_parse_sheet_cell(const psiconv_buffer buf, int lev, 257extern int psiconv_parse_sheet_cell(const psiconv_config config,
258 const psiconv_buffer buf, int lev,
202 psiconv_u32 off, int *length, 259 psiconv_u32 off, int *length,
203 psiconv_sheet_cell *result, 260 psiconv_sheet_cell *result,
204 const psiconv_sheet_cell_layout default_layout, 261 const psiconv_sheet_cell_layout default_layout,
205 const psiconv_sheet_line_list row_default_layouts, 262 const psiconv_sheet_line_list row_default_layouts,
206 const psiconv_sheet_line_list col_default_layouts); 263 const psiconv_sheet_line_list col_default_layouts);
207 264
208extern int psiconv_parse_sheet_cell_list(const psiconv_buffer buf, int lev, 265extern int psiconv_parse_sheet_cell_list(const psiconv_config config,
266 const psiconv_buffer buf, int lev,
209 psiconv_u32 off, int *length, 267 psiconv_u32 off, int *length,
210 psiconv_sheet_cell_list *result, 268 psiconv_sheet_cell_list *result,
211 const psiconv_sheet_cell_layout default_layout, 269 const psiconv_sheet_cell_layout default_layout,
212 const psiconv_sheet_line_list row_default_layouts, 270 const psiconv_sheet_line_list row_default_layouts,
213 const psiconv_sheet_line_list col_default_layouts); 271 const psiconv_sheet_line_list col_default_layouts);
272
214extern int psiconv_parse_sheet_worksheet_list( const psiconv_buffer buf, 273extern int psiconv_parse_sheet_worksheet_list(const psiconv_config config,
274 const psiconv_buffer buf,
215 int lev, 275 int lev,
216 psiconv_u32 off, int *length, 276 psiconv_u32 off, int *length,
217 psiconv_sheet_worksheet_list *result); 277 psiconv_sheet_worksheet_list *result);
278
218extern int psiconv_parse_sheet_worksheet(const psiconv_buffer buf, int lev, 279extern int psiconv_parse_sheet_worksheet(const psiconv_config config,
280 const psiconv_buffer buf, int lev,
219 psiconv_u32 off, int *length, 281 psiconv_u32 off, int *length,
220 psiconv_sheet_worksheet *result); 282 psiconv_sheet_worksheet *result);
283
221extern int psiconv_parse_sheet_numberformat(const psiconv_buffer buf, int lev, 284extern int psiconv_parse_sheet_numberformat(const psiconv_config config,
285 const psiconv_buffer buf, int lev,
222 psiconv_u32 off, int *length, 286 psiconv_u32 off, int *length,
223 psiconv_sheet_numberformat result); 287 psiconv_sheet_numberformat result);
288
224extern int psiconv_parse_sheet_cell_layout(const psiconv_buffer buf, int lev, 289extern int psiconv_parse_sheet_cell_layout(const psiconv_config config,
290 const psiconv_buffer buf, int lev,
225 psiconv_u32 off, int *length, 291 psiconv_u32 off, int *length,
226 psiconv_sheet_cell_layout result); 292 psiconv_sheet_cell_layout result);
293
227extern int psiconv_parse_sheet_line(const psiconv_buffer buf, int lev, 294extern int psiconv_parse_sheet_line(const psiconv_config config,
295 const psiconv_buffer buf, int lev,
228 psiconv_u32 off, int *length, 296 psiconv_u32 off, int *length,
229 psiconv_sheet_line *result, 297 psiconv_sheet_line *result,
230 const psiconv_sheet_cell_layout default_layout); 298 const psiconv_sheet_cell_layout default_layout);
299
231extern int psiconv_parse_sheet_line_list(const psiconv_buffer buf, int lev, 300extern int psiconv_parse_sheet_line_list(const psiconv_config config,
301 const psiconv_buffer buf, int lev,
232 psiconv_u32 off, int *length, 302 psiconv_u32 off, int *length,
233 psiconv_sheet_line_list *result, 303 psiconv_sheet_line_list *result,
234 const psiconv_sheet_cell_layout default_layout); 304 const psiconv_sheet_cell_layout default_layout);
305
235extern int psiconv_parse_sheet_name_section(const psiconv_buffer buf, int lev, 306extern int psiconv_parse_sheet_name_section(const psiconv_config config,
307 const psiconv_buffer buf, int lev,
236 psiconv_u32 off, int *length, 308 psiconv_u32 off, int *length,
237 psiconv_sheet_name_section *result); 309 psiconv_sheet_name_section *result);
310
238extern int psiconv_parse_sheet_info_section(const psiconv_buffer buf, int lev, 311extern int psiconv_parse_sheet_info_section(const psiconv_config config,
312 const psiconv_buffer buf, int lev,
239 psiconv_u32 off, int *length, 313 psiconv_u32 off, int *length,
240 psiconv_sheet_info_section *result); 314 psiconv_sheet_info_section *result);
315
241extern int psiconv_parse_sheet_variable(const psiconv_buffer buf, int lev, 316extern int psiconv_parse_sheet_variable(const psiconv_config config,
317 const psiconv_buffer buf, int lev,
242 psiconv_u32 off, int *length, 318 psiconv_u32 off, int *length,
243 psiconv_sheet_variable *result); 319 psiconv_sheet_variable *result);
320
244extern int psiconv_parse_sheet_variable_list(const psiconv_buffer buf, int lev, 321extern int psiconv_parse_sheet_variable_list(const psiconv_config config,
322 const psiconv_buffer buf, int lev,
245 psiconv_u32 off, int *length, 323 psiconv_u32 off, int *length,
246 psiconv_sheet_variable_list *result); 324 psiconv_sheet_variable_list *result);
325
326extern int psiconv_parse_sheet_grid_section(const psiconv_config config,
327 const psiconv_buffer buf, int lev,
328 psiconv_u32 off, int *length,
329 psiconv_sheet_grid_section *result);
330
331extern int psiconv_parse_sheet_grid_size_list(const psiconv_config config,
332 const psiconv_buffer buf, int lev,
333 psiconv_u32 off, int *length,
334 psiconv_sheet_grid_size_list *result);
335
336extern int psiconv_parse_sheet_grid_size(const psiconv_config config,
337 const psiconv_buffer buf, int lev,
338 psiconv_u32 off, int *length,
339 psiconv_sheet_grid_size *result);
340
341extern int psiconv_parse_sheet_grid_break_list(const psiconv_config config,
342 const psiconv_buffer buf,
343 int lev, psiconv_u32 off, int *length,
344 psiconv_sheet_grid_break_list *result);
345
346
247 347
248 348
249/* ***************** 349/* *****************
250 * parse_image.c * 350 * parse_image.c *
251 ***************** */ 351 ***************** */
252 352
253extern int psiconv_parse_paint_data_section(const psiconv_buffer buf,int lev, 353extern int psiconv_parse_paint_data_section(const psiconv_config config,
354 const psiconv_buffer buf,int lev,
254 psiconv_u32 off, int *length, 355 psiconv_u32 off, int *length,
255 int isclipart, 356 int isclipart,
256 psiconv_paint_data_section *result); 357 psiconv_paint_data_section *result);
257 358
258extern int psiconv_parse_jumptable_section(const psiconv_buffer buf,int lev, 359extern int psiconv_parse_jumptable_section(const psiconv_config config,
360 const psiconv_buffer buf,int lev,
259 psiconv_u32 off, int *length, 361 psiconv_u32 off, int *length,
260 psiconv_jumptable_section *result); 362 psiconv_jumptable_section *result);
363
261extern int psiconv_parse_sketch_section(const psiconv_buffer buf, int lev, 364extern int psiconv_parse_sketch_section(const psiconv_config config,
365 const psiconv_buffer buf, int lev,
262 psiconv_u32 off, int *length, int is_object, 366 psiconv_u32 off, int *length,
263 psiconv_sketch_section *result); 367 psiconv_sketch_section *result);
368
264extern int psiconv_parse_clipart_section(const psiconv_buffer buf, int lev, 369extern int psiconv_parse_clipart_section(const psiconv_config config,
370 const psiconv_buffer buf, int lev,
265 psiconv_u32 off, int *length, 371 psiconv_u32 off, int *length,
266 psiconv_clipart_section *result); 372 psiconv_clipart_section *result);
267 373
268 374
269 375
271 377
272/* **************** 378/* ****************
273 * parse_driver.c * 379 * parse_driver.c *
274 **************** */ 380 **************** */
275 381
276extern int psiconv_parse_texted_file(const psiconv_buffer buf,int lev, 382extern int psiconv_parse_texted_file(const psiconv_config config,
383 const psiconv_buffer buf,int lev,
277 psiconv_u32 off, psiconv_texted_f *result); 384 psiconv_u32 off, psiconv_texted_f *result);
278 385
279extern int psiconv_parse_word_file(const psiconv_buffer buf,int lev, 386extern int psiconv_parse_word_file(const psiconv_config config,
387 const psiconv_buffer buf,int lev,
280 psiconv_u32 off, psiconv_word_f *result); 388 psiconv_u32 off, psiconv_word_f *result);
281 389
282extern int psiconv_parse_mbm_file(const psiconv_buffer buf,int lev, 390extern int psiconv_parse_mbm_file(const psiconv_config config,
391 const psiconv_buffer buf,int lev,
283 psiconv_u32 off, psiconv_mbm_f *result); 392 psiconv_u32 off, psiconv_mbm_f *result);
284 393
285extern int psiconv_parse_sketch_file(const psiconv_buffer buf,int lev, 394extern int psiconv_parse_sketch_file(const psiconv_config config,
395 const psiconv_buffer buf,int lev,
286 psiconv_u32 off, psiconv_sketch_f *result); 396 psiconv_u32 off, psiconv_sketch_f *result);
287 397
288extern int psiconv_parse_clipart_file(const psiconv_buffer buf,int lev, 398extern int psiconv_parse_clipart_file(const psiconv_config config,
399 const psiconv_buffer buf,int lev,
289 psiconv_u32 off, psiconv_clipart_f *result); 400 psiconv_u32 off, psiconv_clipart_f *result);
290extern int psiconv_parse_sheet_file(const psiconv_buffer buf,int lev, 401extern int psiconv_parse_sheet_file(const psiconv_config config,
402 const psiconv_buffer buf,int lev,
291 psiconv_u32 off, psiconv_sheet_f *result); 403 psiconv_u32 off, psiconv_sheet_f *result);
292 404
293#ifdef __cplusplus 405#ifdef __cplusplus
294} 406}
295#endif /* __cplusplus */ 407#endif /* __cplusplus */

Legend:
Removed from v.129  
changed lines
  Added in v.168

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