… | |
… | |
22 | |
22 | |
23 | #include <stdlib.h> |
23 | #include <stdlib.h> |
24 | |
24 | |
25 | #include "parse_routines.h" |
25 | #include "parse_routines.h" |
26 | #include "error.h" |
26 | #include "error.h" |
|
|
27 | #include "image.h" |
27 | |
28 | |
28 | #ifdef DMALLOC |
29 | #ifdef DMALLOC |
29 | #include <dmalloc.h> |
30 | #include <dmalloc.h> |
30 | #endif |
31 | #endif |
31 | |
32 | |
|
|
33 | static int psiconv_decode_rle8 (const psiconv_config config, int lev, |
|
|
34 | psiconv_u32 off, |
|
|
35 | const psiconv_pixel_bytes encoded, |
|
|
36 | psiconv_pixel_bytes *decoded); |
32 | |
37 | |
|
|
38 | static int psiconv_bytes_to_pixel_data(const psiconv_config config, |
|
|
39 | int lev, psiconv_u32 off, |
|
|
40 | const psiconv_pixel_bytes bytes, |
|
|
41 | psiconv_pixel_ints *pixels, |
|
|
42 | int colordepth, int xsize, int ysize); |
|
|
43 | |
|
|
44 | static int psiconv_pixel_data_to_floats (const psiconv_config config, int lev, |
|
|
45 | psiconv_u32 off, |
|
|
46 | const psiconv_pixel_ints pixels, |
|
|
47 | psiconv_pixel_floats_t *floats, |
|
|
48 | int colordepth, int color, |
|
|
49 | int redbits, int bluebits, int greenbits, |
|
|
50 | const psiconv_pixel_floats_t palet); |
|
|
51 | |
|
|
52 | |
|
|
53 | |
33 | int psiconv_parse_jumptable_section(const psiconv_buffer buf,int lev, |
54 | int psiconv_parse_jumptable_section(const psiconv_config config, |
|
|
55 | const psiconv_buffer buf,int lev, |
34 | psiconv_u32 off, int *length, |
56 | psiconv_u32 off, int *length, |
35 | psiconv_jumptable_section *result) |
57 | psiconv_jumptable_section *result) |
36 | { |
58 | { |
37 | int res = 0; |
59 | int res = 0; |
38 | int len = 0; |
60 | int len = 0; |
39 | psiconv_u32 listlen,temp; |
61 | psiconv_u32 listlen,temp; |
40 | int i; |
62 | int i; |
41 | |
63 | |
42 | psiconv_progress(lev+1,off+len,"Going to read the jumptable section"); |
64 | psiconv_progress(config,lev+1,off+len,"Going to read the jumptable section"); |
43 | if (!((*result) = psiconv_list_new(sizeof(psiconv_u32)))) |
65 | if (!((*result) = psiconv_list_new(sizeof(psiconv_u32)))) |
44 | goto ERROR1; |
66 | goto ERROR1; |
45 | |
67 | |
46 | psiconv_progress(lev+2,off+len,"Going to read the list length"); |
68 | psiconv_progress(config,lev+2,off+len,"Going to read the list length"); |
47 | listlen = psiconv_read_u32(buf,lev+2,off+len,&res); |
69 | listlen = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
48 | if (res) |
70 | if (res) |
49 | goto ERROR2; |
71 | goto ERROR2; |
50 | psiconv_debug(lev+2,off+len,"List length: %08x",listlen); |
72 | psiconv_debug(config,lev+2,off+len,"List length: %08x",listlen); |
51 | len += 4; |
73 | len += 4; |
52 | |
74 | |
53 | psiconv_progress(lev+2,off+len,"Going to read the list"); |
75 | psiconv_progress(config,lev+2,off+len,"Going to read the list"); |
54 | for (i = 0; i < listlen; i++) { |
76 | for (i = 0; i < listlen; i++) { |
55 | temp = psiconv_read_u32(buf,lev+2,off+len,&res); |
77 | temp = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
56 | if (res) |
78 | if (res) |
57 | goto ERROR2; |
79 | goto ERROR2; |
58 | if ((res = psiconv_list_add(*result,&temp))) |
80 | if ((res = psiconv_list_add(*result,&temp))) |
59 | goto ERROR2; |
81 | goto ERROR2; |
60 | psiconv_debug(lev+3,off+len,"Offset: %08x",temp); |
82 | psiconv_debug(config,lev+3,off+len,"Offset: %08x",temp); |
61 | len += 4; |
83 | len += 4; |
62 | } |
84 | } |
63 | |
85 | |
64 | if (length) |
86 | if (length) |
65 | *length = len; |
87 | *length = len; |
66 | |
88 | |
67 | psiconv_progress(lev+1,off+len-1,"End of jumptable section " |
89 | psiconv_progress(config,lev+1,off+len-1,"End of jumptable section " |
68 | "(total length: %08x)", len); |
90 | "(total length: %08x)", len); |
69 | |
91 | |
70 | return 0; |
92 | return 0; |
71 | |
93 | |
72 | ERROR2: |
94 | ERROR2: |
73 | psiconv_list_free(*result); |
95 | psiconv_list_free(*result); |
74 | ERROR1: |
96 | ERROR1: |
75 | psiconv_warn(lev+1,off,"Reading of Jumptable Section failed"); |
97 | psiconv_warn(config,lev+1,off,"Reading of Jumptable Section failed"); |
76 | if (length) |
98 | if (length) |
77 | *length = 0; |
99 | *length = 0; |
78 | if (!res) |
100 | if (!res) |
79 | return -PSICONV_E_NOMEM; |
101 | return -PSICONV_E_NOMEM; |
80 | else |
102 | else |
81 | return res; |
103 | return res; |
82 | } |
104 | } |
83 | |
105 | |
84 | static int decode_byte(int lev, psiconv_u32 off, |
106 | static int decode_byte(const psiconv_config config, int lev, psiconv_u32 off, |
85 | psiconv_paint_data_section data, psiconv_u32 *pixelnr, |
107 | psiconv_paint_data_section data, psiconv_u32 *pixelnr, |
86 | psiconv_u8 byte, int bits_per_pixel, int linelen, |
108 | psiconv_u8 byte, int bits_per_pixel, int linelen, |
87 | int *linepos,int picsize) |
109 | int *linepos,int picsize) |
88 | { |
110 | { |
89 | int mask = (bits_per_pixel << 1) -1; |
111 | int mask = (bits_per_pixel << 1) -1; |
90 | int i; |
112 | int i; |
91 | if (*linepos < (data->xsize + (8/bits_per_pixel) - 1) / (8/bits_per_pixel)) |
113 | if (*linepos < (data->xsize + (8/bits_per_pixel) - 1) / (8/bits_per_pixel)) |
92 | for (i = 0; i < 8/bits_per_pixel; i ++) { |
114 | for (i = 0; i < 8/bits_per_pixel; i ++) { |
93 | if ((i != 0) && ((*pixelnr % (data->xsize)) == 0)) { |
115 | if ((i != 0) && ((*pixelnr % (data->xsize)) == 0)) { |
94 | psiconv_debug(lev+1,off,"Skipping padding: %02x",byte); |
116 | psiconv_debug(config,lev+1,off,"Skipping padding: %02x",byte); |
95 | i = 8; |
117 | i = 8; |
96 | } else if (*pixelnr >= picsize) { |
118 | } else if (*pixelnr >= picsize) { |
97 | psiconv_warn(lev+1,off,"Corrupted picture data!"); |
119 | psiconv_warn(config,lev+1,off,"Corrupted picture data!"); |
98 | psiconv_debug(lev+1,off,"Trying to write a pixel too far"); |
120 | psiconv_debug(config,lev+1,off,"Trying to write a pixel too far"); |
99 | return -1; |
121 | return -1; |
100 | } else { |
122 | } else { |
101 | data->red[*pixelnr] = data->green[*pixelnr] = data->blue[*pixelnr] = |
123 | data->red[*pixelnr] = data->green[*pixelnr] = data->blue[*pixelnr] = |
102 | ((float) (byte & mask)) / ((1 << bits_per_pixel) -1); |
124 | ((float) (byte & mask)) / ((1 << bits_per_pixel) -1); |
103 | psiconv_debug(lev+1,off,"Pixel %04x: (%04x,%04x) value %02x, color %f", |
125 | psiconv_debug(config,lev+1,off,"Pixel %04x: (%04x,%04x) value %02x, color %f", |
104 | *pixelnr,*pixelnr % data->xsize, |
126 | *pixelnr,*pixelnr % data->xsize, |
105 | *pixelnr / data->xsize, byte&mask, data->red[*pixelnr]); |
127 | *pixelnr / data->xsize, byte&mask, data->red[*pixelnr]); |
106 | byte = byte >> bits_per_pixel; |
128 | byte = byte >> bits_per_pixel; |
107 | (*pixelnr) ++; |
129 | (*pixelnr) ++; |
108 | } |
130 | } |
109 | } |
131 | } |
110 | else |
132 | else |
111 | psiconv_debug(lev+1,off,"Skipping padding byte"); |
133 | psiconv_debug(config,lev+1,off,"Skipping padding byte"); |
112 | (*linepos) ++; |
134 | (*linepos) ++; |
113 | if (*linepos == linelen) |
135 | if (*linepos == linelen) |
114 | *linepos = 0; |
136 | *linepos = 0; |
115 | return 0; |
137 | return 0; |
116 | } |
138 | } |
117 | |
139 | |
118 | |
140 | |
119 | int psiconv_parse_paint_data_section(const psiconv_buffer buf,int lev, |
141 | int psiconv_parse_paint_data_section(const psiconv_config config, |
|
|
142 | const psiconv_buffer buf,int lev, |
120 | psiconv_u32 off, int *length,int isclipart, |
143 | psiconv_u32 off, int *length,int isclipart, |
121 | psiconv_paint_data_section *result) |
144 | psiconv_paint_data_section *result) |
122 | { |
145 | { |
123 | int res = 0; |
146 | int res = 0; |
124 | int len = 0; |
147 | int len = 0; |
… | |
… | |
126 | psiconv_u8 marker; |
149 | psiconv_u8 marker; |
127 | int i,leng; |
150 | int i,leng; |
128 | psiconv_u32 bits_per_pixel,compression; |
151 | psiconv_u32 bits_per_pixel,compression; |
129 | int linepos = 0; |
152 | int linepos = 0; |
130 | |
153 | |
131 | psiconv_progress(lev+1,off,"Going to read a paint data section"); |
154 | psiconv_progress(config,lev+1,off,"Going to read a paint data section"); |
132 | if (!((*result) = malloc(sizeof(**result)))) |
155 | if (!((*result) = malloc(sizeof(**result)))) |
133 | goto ERROR1; |
156 | goto ERROR1; |
134 | |
157 | |
135 | psiconv_progress(lev+2,off+len,"Going to read section size"); |
158 | psiconv_progress(config,lev+2,off+len,"Going to read section size"); |
136 | size = psiconv_read_u32(buf,lev+2,off+len,&res); |
159 | size = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
137 | if (res) |
160 | if (res) |
138 | goto ERROR2; |
161 | goto ERROR2; |
139 | psiconv_debug(lev+2,off+len,"Section size: %08x",size); |
162 | psiconv_debug(config,lev+2,off+len,"Section size: %08x",size); |
140 | len += 4; |
163 | len += 4; |
141 | |
164 | |
142 | psiconv_progress(lev+2,off+len,"Going to read pixel data offset"); |
165 | psiconv_progress(config,lev+2,off+len,"Going to read pixel data offset"); |
143 | offset = psiconv_read_u32(buf,lev+2,off+len,&res); |
166 | offset = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
144 | if (res) |
167 | if (res) |
145 | goto ERROR2; |
168 | goto ERROR2; |
146 | if (offset != 0x28) { |
169 | if (offset != 0x28) { |
147 | psiconv_warn(lev+2,off+len, |
170 | psiconv_warn(config,lev+2,off+len, |
148 | "Paint data section data offset has unexpected value"); |
171 | "Paint data section data offset has unexpected value"); |
149 | psiconv_debug(lev+2,off+len, |
172 | psiconv_debug(config,lev+2,off+len, |
150 | "Data offset: read %08x, expected %08x",offset,0x28); |
173 | "Data offset: read %08x, expected %08x",offset,0x28); |
151 | res = -1; |
174 | res = -1; |
152 | } |
175 | } |
153 | len += 4; |
176 | len += 4; |
154 | |
177 | |
155 | psiconv_progress(lev+2,off+len,"Going to read picture X size"); |
178 | psiconv_progress(config,lev+2,off+len,"Going to read picture X size"); |
156 | (*result)->xsize = psiconv_read_u32(buf,lev+2,off+len,&res); |
179 | (*result)->xsize = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
157 | if (res) |
180 | if (res) |
158 | goto ERROR2; |
181 | goto ERROR2; |
159 | psiconv_debug(lev+2,off+len,"Picture X size: %08x:",(*result)->xsize); |
182 | psiconv_debug(config,lev+2,off+len,"Picture X size: %08x:",(*result)->xsize); |
160 | len += 4; |
183 | len += 4; |
161 | |
184 | |
162 | psiconv_progress(lev+2,off+len,"Going to read picture Y size"); |
185 | psiconv_progress(config,lev+2,off+len,"Going to read picture Y size"); |
163 | (*result)->ysize = psiconv_read_u32(buf,lev+2,off+len,&res); |
186 | (*result)->ysize = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
164 | if (res) |
187 | if (res) |
165 | goto ERROR2; |
188 | goto ERROR2; |
166 | psiconv_debug(lev+2,off+len,"Picture Y size: %08x:",(*result)->ysize); |
189 | psiconv_debug(config,lev+2,off+len,"Picture Y size: %08x:",(*result)->ysize); |
167 | len += 4; |
190 | len += 4; |
168 | |
191 | |
169 | picsize = (*result)->ysize * (*result)->xsize; |
192 | picsize = (*result)->ysize * (*result)->xsize; |
170 | |
193 | |
171 | psiconv_progress(lev+2,off+len,"Going to read the real picture x size"); |
194 | psiconv_progress(config,lev+2,off+len,"Going to read the real picture x size"); |
172 | (*result)->pic_xsize = psiconv_read_length(buf,lev+2,off+len,&leng,&res); |
195 | (*result)->pic_xsize = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res); |
173 | if (res) |
196 | if (res) |
174 | goto ERROR2; |
197 | goto ERROR2; |
175 | psiconv_debug(lev+2,off+len,"Picture x size: %f",(*result)->pic_xsize); |
198 | psiconv_debug(config,lev+2,off+len,"Picture x size: %f",(*result)->pic_xsize); |
176 | len += leng; |
199 | len += leng; |
177 | |
200 | |
178 | psiconv_progress(lev+2,off+len,"Going to read the real picture y size"); |
201 | psiconv_progress(config,lev+2,off+len,"Going to read the real picture y size"); |
179 | (*result)->pic_ysize = psiconv_read_length(buf,lev+2,off+len,&leng,&res); |
202 | (*result)->pic_ysize = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res); |
180 | if (res) |
203 | if (res) |
181 | goto ERROR2; |
204 | goto ERROR2; |
182 | psiconv_debug(lev+2,off+len,"Picture y size: %f",(*result)->pic_ysize); |
205 | psiconv_debug(config,lev+2,off+len,"Picture y size: %f",(*result)->pic_ysize); |
183 | len += leng; |
206 | len += leng; |
184 | |
207 | |
185 | psiconv_progress(lev+2,off+len,"Going to read the number of bits per pixel"); |
208 | psiconv_progress(config,lev+2,off+len,"Going to read the number of bits per pixel"); |
186 | bits_per_pixel=psiconv_read_u32(buf,lev+2,off+len,&res); |
209 | bits_per_pixel=psiconv_read_u32(config,buf,lev+2,off+len,&res); |
187 | if (res) |
210 | if (res) |
188 | goto ERROR2; |
211 | goto ERROR2; |
189 | if (bits_per_pixel > 8) { |
212 | if (bits_per_pixel > 8) { |
190 | psiconv_warn(lev+2,off+len,"Picture has too many colors"); |
213 | psiconv_warn(config,lev+2,off+len,"Picture has too many colors"); |
191 | psiconv_debug(lev+2,off+len,"Read %d colorbits",bits_per_pixel); |
214 | psiconv_debug(config,lev+2,off+len,"Read %d colorbits",bits_per_pixel); |
192 | res = -PSICONV_E_PARSE; |
215 | res = -PSICONV_E_PARSE; |
193 | goto ERROR2; |
216 | goto ERROR2; |
194 | } |
217 | } |
195 | psiconv_debug(lev+2,off+len,"Bits per pixel: %d",bits_per_pixel); |
218 | psiconv_debug(config,lev+2,off+len,"Bits per pixel: %d",bits_per_pixel); |
196 | len += 4; |
219 | len += 4; |
197 | |
220 | |
198 | for (i = 0 ; i < 2; i++) { |
221 | for (i = 0 ; i < 2; i++) { |
199 | temp = psiconv_read_u32(buf,lev+2,off+len,&res); |
222 | temp = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
200 | if (res) |
223 | if (res) |
201 | goto ERROR2; |
224 | goto ERROR2; |
202 | if (temp != 00) { |
225 | if (temp != 00) { |
203 | psiconv_warn(lev+2,off+len, |
226 | psiconv_warn(config,lev+2,off+len, |
204 | "Paint data section prologue has unknown values (ignored)"); |
227 | "Paint data section prologue has unknown values (ignored)"); |
205 | psiconv_debug(lev+2,off+len, |
228 | psiconv_debug(config,lev+2,off+len, |
206 | "offset %02x: read %08x, expected %08x",i,temp, 0x00); |
229 | "offset %02x: read %08x, expected %08x",i,temp, 0x00); |
207 | } |
230 | } |
208 | len += 4; |
231 | len += 4; |
209 | } |
232 | } |
210 | |
233 | |
211 | psiconv_progress(lev+2,off+len, |
234 | psiconv_progress(config,lev+2,off+len, |
212 | "Going to read whether RLE compression is used"); |
235 | "Going to read whether RLE compression is used"); |
213 | compression=psiconv_read_u32(buf,lev+2,off+len,&res); |
236 | compression=psiconv_read_u32(config,buf,lev+2,off+len,&res); |
214 | if (res) |
237 | if (res) |
215 | goto ERROR2; |
238 | goto ERROR2; |
216 | if (compression > 1) { |
239 | if (compression > 1) { |
217 | psiconv_warn(lev+2,off+len,"Paint data section has unknown " |
240 | psiconv_warn(config,lev+2,off+len,"Paint data section has unknown " |
218 | "compression type, assuming RLE"); |
241 | "compression type, assuming RLE"); |
219 | psiconv_debug(lev+2,off+len,"Read compression type %d",compression); |
242 | psiconv_debug(config,lev+2,off+len,"Read compression type %d",compression); |
220 | compression = 1; |
243 | compression = 1; |
221 | } |
244 | } |
222 | psiconv_debug(lev+2,off+len,"Compression: %s",compression?"RLE":"none"); |
245 | psiconv_debug(config,lev+2,off+len,"Compression: %s",compression?"RLE8":"none"); |
223 | len += 4; |
246 | len += 4; |
224 | |
247 | |
225 | if (isclipart) { |
248 | if (isclipart) { |
226 | psiconv_progress(lev+2,off+len,"Going to read an unknown long"); |
249 | psiconv_progress(config,lev+2,off+len,"Going to read an unknown long"); |
227 | temp = psiconv_read_u32(buf,lev+2,off+len,&res); |
250 | temp = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
228 | if (res) |
251 | if (res) |
229 | goto ERROR2; |
252 | goto ERROR2; |
230 | if (temp != 0xffffffff) { |
253 | if (temp != 0xffffffff) { |
231 | psiconv_warn(lev+2,off+len, |
254 | psiconv_warn(config,lev+2,off+len, |
232 | "Paint data section prologue has unknown values (ignoring)"); |
255 | "Paint data section prologue has unknown values (ignoring)"); |
233 | psiconv_debug(lev+2,off+len, |
256 | psiconv_debug(config,lev+2,off+len, |
234 | "offset %02x: read %08x, expected %08x",i,temp, 0xffffffff); |
257 | "offset %02x: read %08x, expected %08x",i,temp, 0xffffffff); |
235 | } |
258 | } |
236 | len += 4; |
259 | len += 4; |
237 | psiconv_progress(lev+2,off+len,"Going to read a second unknown long"); |
260 | psiconv_progress(config,lev+2,off+len,"Going to read a second unknown long"); |
238 | temp = psiconv_read_u32(buf,lev+2,off+len,&res); |
261 | temp = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
239 | if (res) |
262 | if (res) |
240 | goto ERROR2; |
263 | goto ERROR2; |
241 | if (temp != 0x44) { |
264 | if (temp != 0x44) { |
242 | psiconv_warn(lev+2,off+len, |
265 | psiconv_warn(config,lev+2,off+len, |
243 | "Paint data section prologue has unknown values (ignoring)"); |
266 | "Paint data section prologue has unknown values (ignoring)"); |
244 | psiconv_debug(lev+2,off+len, |
267 | psiconv_debug(config,lev+2,off+len, |
245 | "offset %02x: read %08x, expected %08x",i,temp, 0x44); |
268 | "offset %02x: read %08x, expected %08x",i,temp, 0x44); |
246 | } |
269 | } |
247 | len += 4; |
270 | len += 4; |
248 | } |
271 | } |
249 | |
272 | |
… | |
… | |
256 | len = offset; |
279 | len = offset; |
257 | datasize = size - len; |
280 | datasize = size - len; |
258 | if (isclipart) |
281 | if (isclipart) |
259 | len += 8; |
282 | len += 8; |
260 | |
283 | |
261 | psiconv_progress(lev+2,off+len,"Going to read the pixel data"); |
284 | psiconv_progress(config,lev+2,off+len,"Going to read the pixel data"); |
262 | pixelnr = 0; |
285 | pixelnr = 0; |
263 | datanr = 0; |
286 | datanr = 0; |
264 | if (!compression) { |
287 | if (!compression) { |
265 | linelen = datasize / (*result)->ysize; |
288 | linelen = datasize / (*result)->ysize; |
266 | psiconv_debug(lev+3,off+len,"Line length: %04x bytes",linelen); |
289 | psiconv_debug(config,lev+3,off+len,"Line length: %04x bytes",linelen); |
267 | while((datanr < datasize)) { |
290 | while((datanr < datasize)) { |
268 | temp = psiconv_read_u8(buf,lev+2,off+len+datanr,&res); |
291 | temp = psiconv_read_u8(config,buf,lev+2,off+len+datanr,&res); |
269 | if (res) |
292 | if (res) |
270 | goto ERROR5; |
293 | goto ERROR5; |
271 | if (decode_byte(lev+3,off+len+datanr,*result,&pixelnr,temp,bits_per_pixel, |
294 | if (decode_byte(config,lev+3,off+len+datanr,*result,&pixelnr,temp,bits_per_pixel, |
272 | linelen,&linepos,picsize)) { |
295 | linelen,&linepos,picsize)) { |
273 | res = -PSICONV_E_PARSE; |
296 | res = -PSICONV_E_PARSE; |
274 | break; |
297 | break; |
275 | } |
298 | } |
276 | datanr++; |
299 | datanr++; |
277 | } |
300 | } |
278 | } else { |
301 | } else { |
279 | psiconv_progress(lev+2,off+len,"First pass: determining line length"); |
302 | psiconv_progress(config,lev+2,off+len,"First pass: determining line length"); |
280 | datanr = 0; |
303 | datanr = 0; |
281 | i = 0; |
304 | i = 0; |
282 | while (datanr < datasize) { |
305 | while (datanr < datasize) { |
283 | marker = psiconv_read_u8(buf,lev+3,off+len+datanr,&res); |
306 | marker = psiconv_read_u8(config,buf,lev+3,off+len+datanr,&res); |
284 | if (res) |
307 | if (res) |
285 | goto ERROR5; |
308 | goto ERROR5; |
286 | if (marker >= 0x80) { |
309 | if (marker >= 0x80) { |
287 | datanr += 0x100 - marker + 1; |
310 | datanr += 0x100 - marker + 1; |
288 | i += 0x100 - marker; |
311 | i += 0x100 - marker; |
… | |
… | |
291 | i += marker + 1; |
314 | i += marker + 1; |
292 | } |
315 | } |
293 | } |
316 | } |
294 | linelen = i / (*result)->ysize; |
317 | linelen = i / (*result)->ysize; |
295 | datanr=0; |
318 | datanr=0; |
296 | psiconv_debug(lev+2,off+len,"Linelen: %04x bytes",linelen); |
319 | psiconv_debug(config,lev+2,off+len,"Linelen: %04x bytes",linelen); |
297 | while((datanr < datasize)) { |
320 | while((datanr < datasize)) { |
298 | marker = psiconv_read_u8(buf,lev+3,off+len+datanr,&res); |
321 | marker = psiconv_read_u8(config,buf,lev+3,off+len+datanr,&res); |
299 | if (res) |
322 | if (res) |
300 | goto ERROR5; |
323 | goto ERROR5; |
301 | psiconv_debug(lev+3,off+len+datanr, |
324 | psiconv_debug(config,lev+3,off+len+datanr, |
302 | "Pixelnr %08x, Datanr %08x: Read marker %02x", |
325 | "Pixelnr %08x, Datanr %08x: Read marker %02x", |
303 | pixelnr,datanr,marker); |
326 | pixelnr,datanr,marker); |
304 | datanr ++; |
327 | datanr ++; |
305 | if (marker >= 0x80) { |
328 | if (marker >= 0x80) { |
306 | /* 0x100 - marker bytes of data follow */ |
329 | /* 0x100 - marker bytes of data follow */ |
307 | for (i = 0; i < 0x100-marker; i++,datanr++) { |
330 | for (i = 0; i < 0x100-marker; i++,datanr++) { |
308 | if (datanr >= datasize) { |
331 | if (datanr >= datasize) { |
309 | psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data"); |
332 | psiconv_warn(config,lev+3,off+len+datanr,"Corrupted picture data"); |
310 | psiconv_debug(lev+3,off+len+datanr, |
333 | psiconv_debug(config,lev+3,off+len+datanr, |
311 | "Picsize: %08x, Datasize: %08x, Pixelnr: %08x," |
334 | "Picsize: %08x, Datasize: %08x, Pixelnr: %08x," |
312 | "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr, |
335 | "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr, |
313 | datanr,marker); |
336 | datanr,marker); |
314 | res = -PSICONV_E_PARSE; |
337 | res = -PSICONV_E_PARSE; |
315 | break; |
338 | break; |
316 | } |
339 | } |
317 | temp = psiconv_read_u8(buf,lev+2,off+len+datanr,&res); |
340 | temp = psiconv_read_u8(config,buf,lev+2,off+len+datanr,&res); |
318 | if (res) |
341 | if (res) |
319 | goto ERROR5; |
342 | goto ERROR5; |
320 | if (decode_byte(lev+2,off+len+datanr,*result,&pixelnr,temp, |
343 | if (decode_byte(config,lev+2,off+len+datanr,*result,&pixelnr,temp, |
321 | bits_per_pixel,linelen,&linepos,picsize)) { |
344 | bits_per_pixel,linelen,&linepos,picsize)) { |
322 | res = -PSICONV_E_PARSE; |
345 | res = -PSICONV_E_PARSE; |
323 | break; |
346 | break; |
324 | } |
347 | } |
325 | } |
348 | } |
326 | } else { |
349 | } else { |
327 | if (datanr >= datasize) { |
350 | if (datanr >= datasize) { |
328 | psiconv_warn(lev+3,off+len+datanr,"Corrupted picture data"); |
351 | psiconv_warn(config,lev+3,off+len+datanr,"Corrupted picture data"); |
329 | psiconv_debug(lev+3,off+len+datanr, |
352 | psiconv_debug(config,lev+3,off+len+datanr, |
330 | "Picsize: %08x, Datasize: %08x, Pixelnr: %08x," |
353 | "Picsize: %08x, Datasize: %08x, Pixelnr: %08x," |
331 | "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr, |
354 | "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr, |
332 | datanr,marker); |
355 | datanr,marker); |
333 | res = -PSICONV_E_PARSE; |
356 | res = -PSICONV_E_PARSE; |
334 | } else { |
357 | } else { |
335 | temp = psiconv_read_u8(buf,lev+3,off+len+datanr,&res); |
358 | temp = psiconv_read_u8(config,buf,lev+3,off+len+datanr,&res); |
336 | if (res) |
359 | if (res) |
337 | goto ERROR5; |
360 | goto ERROR5; |
338 | for (i = 0; i <= marker; i++) { |
361 | for (i = 0; i <= marker; i++) { |
339 | if (decode_byte(lev+2,off+len+datanr,*result,&pixelnr,temp, |
362 | if (decode_byte(config,lev+2,off+len+datanr,*result,&pixelnr,temp, |
340 | bits_per_pixel,linelen,&linepos,picsize)) { |
363 | bits_per_pixel,linelen,&linepos,picsize)) { |
341 | res = -PSICONV_E_PARSE; |
364 | res = -PSICONV_E_PARSE; |
342 | break; |
365 | break; |
343 | } |
366 | } |
344 | } |
367 | } |
… | |
… | |
351 | if (linepos >= ((*result)->xsize + (8/bits_per_pixel) - 1) / |
374 | if (linepos >= ((*result)->xsize + (8/bits_per_pixel) - 1) / |
352 | (8/bits_per_pixel)) |
375 | (8/bits_per_pixel)) |
353 | datanr += (linelen - linepos); |
376 | datanr += (linelen - linepos); |
354 | |
377 | |
355 | if (res || (datanr != datasize) || (pixelnr != picsize)) { |
378 | if (res || (datanr != datasize) || (pixelnr != picsize)) { |
356 | psiconv_warn(lev+2,off+len,"Corrupted picture data!"); |
379 | psiconv_warn(config,lev+2,off+len,"Corrupted picture data!"); |
357 | psiconv_debug(lev+3,off+len+datanr, |
380 | psiconv_debug(config,lev+3,off+len+datanr, |
358 | "Picsize: %08x, Datasize: %08x, Pixelnr: %08x," |
381 | "Picsize: %08x, Datasize: %08x, Pixelnr: %08x," |
359 | "Datanr: %08x",picsize,datasize,pixelnr,datanr); |
382 | "Datanr: %08x",picsize,datasize,pixelnr,datanr); |
360 | goto ERROR5; |
383 | goto ERROR5; |
361 | } |
384 | } |
362 | |
385 | |
363 | len += datanr; |
386 | len += datanr; |
364 | |
387 | |
365 | if (length) |
388 | if (length) |
366 | *length = len; |
389 | *length = len; |
367 | |
390 | |
368 | psiconv_progress(lev+1,off+len-1,"End of paint data section " |
391 | psiconv_progress(config,lev+1,off+len-1,"End of paint data section " |
369 | "(total length: %08x)", len); |
392 | "(total length: %08x)", len); |
370 | |
393 | |
371 | return res; |
394 | return res; |
372 | |
395 | |
373 | ERROR5: |
396 | ERROR5: |
… | |
… | |
377 | ERROR3: |
400 | ERROR3: |
378 | free((*result)->red); |
401 | free((*result)->red); |
379 | ERROR2: |
402 | ERROR2: |
380 | free (*result); |
403 | free (*result); |
381 | ERROR1: |
404 | ERROR1: |
382 | psiconv_warn(lev+1,off,"Reading of Paint Data Section failed"); |
405 | psiconv_warn(config,lev+1,off,"Reading of Paint Data Section failed"); |
383 | if (length) |
406 | if (length) |
384 | *length = 0; |
407 | *length = 0; |
385 | if (!res) |
408 | if (!res) |
386 | return -PSICONV_E_NOMEM; |
409 | return -PSICONV_E_NOMEM; |
387 | else |
410 | else |
388 | return res; |
411 | return res; |
389 | } |
412 | } |
390 | |
413 | |
391 | int psiconv_parse_sketch_section(const psiconv_buffer buf, int lev, |
414 | int psiconv_parse_sketch_section(const psiconv_config config, |
|
|
415 | const psiconv_buffer buf, int lev, |
392 | psiconv_u32 off, int *length, int is_object, |
416 | psiconv_u32 off, int *length, |
393 | psiconv_sketch_section *result) |
417 | psiconv_sketch_section *result) |
394 | { |
418 | { |
395 | int res=0; |
419 | int res=0; |
396 | int len=0; |
420 | int len=0; |
397 | psiconv_u32 temp; |
421 | psiconv_u32 temp; |
398 | int leng; |
422 | int leng; |
399 | int i; |
|
|
400 | |
423 | |
401 | psiconv_progress(lev+1,off,"Going to read the sketch section"); |
424 | psiconv_progress(config,lev+1,off,"Going to read the sketch section"); |
402 | if (!(*result = malloc(sizeof(**result)))) |
425 | if (!(*result = malloc(sizeof(**result)))) |
403 | goto ERROR1; |
426 | goto ERROR1; |
404 | |
427 | |
405 | if (!is_object) { |
|
|
406 | psiconv_progress(lev+2,off+len,"Going to read the form hor. size"); |
428 | psiconv_progress(config,lev+2,off+len,"Going to read the displayed hor. size"); |
407 | (*result)->form_xsize = psiconv_read_u16(buf,lev+2,off + len,&res); |
429 | (*result)->displayed_xsize = psiconv_read_u16(config,buf,lev+2,off + len,&res); |
408 | if (res) |
430 | if (res) |
409 | goto ERROR2; |
431 | goto ERROR2; |
|
|
432 | psiconv_debug(config,lev+2,off+len,"Displayed hor. size: %04x", |
|
|
433 | (*result)->displayed_xsize); |
|
|
434 | len += 0x02; |
|
|
435 | psiconv_progress(config,lev+2,off+len,"Going to read displayed ver. size"); |
|
|
436 | (*result)->displayed_ysize = psiconv_read_u16(config,buf,lev+2,off + len,&res); |
|
|
437 | if (res) |
|
|
438 | goto ERROR2; |
|
|
439 | psiconv_debug(config,lev+2,off+len,"Displayed ver. size: %04x", |
|
|
440 | (*result)->displayed_ysize); |
|
|
441 | len += 0x02; |
|
|
442 | |
|
|
443 | psiconv_progress(config,lev+2,off+len,"Going to read the data hor. offset"); |
|
|
444 | (*result)->picture_data_x_offset = psiconv_read_u16(config,buf,lev+2,off + len, |
|
|
445 | &res); |
|
|
446 | if (res) |
|
|
447 | goto ERROR2; |
|
|
448 | psiconv_debug(config,lev+2,off+len,"Data hor. offset: %04x", |
|
|
449 | (*result)->picture_data_x_offset); |
|
|
450 | len += 0x02; |
|
|
451 | psiconv_progress(config,lev+2,off+len,"Going to read the data ver. offset"); |
|
|
452 | (*result)->picture_data_y_offset = psiconv_read_u16(config,buf,lev+2,off + len, |
|
|
453 | &res); |
|
|
454 | if (res) |
|
|
455 | goto ERROR2; |
|
|
456 | psiconv_debug(config,lev+2,off+len,"Data ver. offset: %04x", |
|
|
457 | (*result)->picture_data_y_offset); |
|
|
458 | len += 0x02; |
|
|
459 | |
|
|
460 | psiconv_progress(config,lev+2,off+len,"Going to read the displayed hor. offset"); |
|
|
461 | (*result)->displayed_size_x_offset = psiconv_read_u16(config,buf,lev+2,off + len, |
|
|
462 | &res); |
|
|
463 | if (res) |
|
|
464 | goto ERROR2; |
|
|
465 | psiconv_debug(config,lev+2,off+len,"Displayed hor. offset: %04x", |
|
|
466 | (*result)->displayed_size_x_offset); |
|
|
467 | len += 0x02; |
|
|
468 | psiconv_progress(config,lev+2,off+len,"Going to read the displayed ver. offset"); |
|
|
469 | (*result)->displayed_size_y_offset = psiconv_read_u16(config,buf,lev+2,off + len, |
|
|
470 | &res); |
|
|
471 | if (res) |
|
|
472 | goto ERROR2; |
|
|
473 | psiconv_debug(config,lev+2,off+len,"Displayed ver. offset: %04x", |
|
|
474 | (*result)->displayed_size_y_offset); |
|
|
475 | len += 0x02; |
|
|
476 | |
|
|
477 | psiconv_progress(config,lev+2,off+len,"Going to read the form hor. size"); |
|
|
478 | (*result)->form_xsize = psiconv_read_u16(config,buf,lev+2,off + len,&res); |
|
|
479 | if (res) |
|
|
480 | goto ERROR2; |
410 | psiconv_debug(lev+2,off+len,"Form hor. size: %04x", |
481 | psiconv_debug(config,lev+2,off+len,"Form hor. size: %04x", |
411 | (*result)->form_xsize); |
482 | (*result)->form_xsize); |
412 | len += 0x02; |
483 | len += 0x02; |
413 | psiconv_progress(lev+2,off+len,"Going to read the form ver. size"); |
484 | psiconv_progress(config,lev+2,off+len,"Going to read form ver. size"); |
414 | (*result)->form_ysize = psiconv_read_u16(buf,lev+2,off + len,&res); |
485 | (*result)->form_ysize = psiconv_read_u16(config,buf,lev+2,off + len,&res); |
415 | if (res) |
486 | if (res) |
416 | goto ERROR2; |
487 | goto ERROR2; |
417 | psiconv_debug(lev+2,off+len,"Form ver. size: %04x", |
488 | psiconv_debug(config,lev+2,off+len,"Form ver. size: %04x", |
418 | (*result)->form_ysize); |
489 | (*result)->form_ysize); |
419 | len += 0x02; |
490 | len += 0x02; |
420 | psiconv_progress(lev+2,off+len,"Going to read the picture hor. offset"); |
491 | |
421 | (*result)->picture_x_offset = psiconv_read_u16(buf,lev+2,off + len,&res); |
492 | psiconv_progress(config,lev+2,off+len,"Going to skip 1 word of zeros"); |
|
|
493 | temp = psiconv_read_u16(config,buf,lev+2,off+len,&res); |
422 | if (res) |
494 | if (res) |
423 | goto ERROR2; |
495 | goto ERROR2; |
424 | psiconv_debug(lev+2,off+len,"Picture hor. offset: %04x", |
|
|
425 | (*result)->picture_x_offset); |
|
|
426 | len += 0x02; |
|
|
427 | psiconv_progress(lev+2,off+len,"Going to read the picture ver. offset"); |
|
|
428 | (*result)->picture_y_offset = psiconv_read_u16(buf,lev+2,off + len,&res); |
|
|
429 | if (res) |
|
|
430 | goto ERROR2; |
|
|
431 | psiconv_debug(lev+2,off+len,"Picture ver. offset: %04x", |
|
|
432 | (*result)->picture_y_offset); |
|
|
433 | len += 0x02; |
|
|
434 | psiconv_progress(lev+2,off+len,"Going to skip 5 words of zeros"); |
|
|
435 | for (i = 0; i < 5; i++) { |
|
|
436 | temp = psiconv_read_u16(buf,lev+2,off+len,&res); |
|
|
437 | if (res) |
|
|
438 | goto ERROR2; |
|
|
439 | if (temp != 0) { |
|
|
440 | psiconv_warn(lev+2,off+len, |
|
|
441 | "Unexpected value in sketch section preamble (ignored)"); |
|
|
442 | psiconv_debug(lev+2,off+len,"Word %d: Read %04x, expected %04x",i, |
|
|
443 | temp,0); |
|
|
444 | } |
|
|
445 | off += 0x02; |
|
|
446 | } |
|
|
447 | } else { |
|
|
448 | psiconv_progress(lev+2,off+len,"Going to read the displayed hor. size"); |
|
|
449 | (*result)->picture_xsize = psiconv_read_u16(buf,lev+2,off + len,&res); |
|
|
450 | if (res) |
|
|
451 | goto ERROR2; |
|
|
452 | psiconv_debug(lev+2,off+len,"Displayed hor. size: %04x", |
|
|
453 | (*result)->picture_xsize); |
|
|
454 | len += 0x02; |
|
|
455 | psiconv_progress(lev+2,off+len,"Going to read the displayed ver. size"); |
|
|
456 | (*result)->picture_ysize = psiconv_read_u16(buf,lev+2,off + len,&res); |
|
|
457 | if (res) |
|
|
458 | goto ERROR2; |
|
|
459 | psiconv_debug(lev+2,off+len,"Displayed ver. size: %04x", |
|
|
460 | (*result)->picture_ysize); |
|
|
461 | len += 0x02; |
|
|
462 | |
|
|
463 | psiconv_progress(lev+2,off+len,"Going to skip 2 words of zeros"); |
|
|
464 | for (i = 0; i < 2; i++) { |
|
|
465 | temp = psiconv_read_u16(buf,lev+2,off+len,&res); |
|
|
466 | if (res) |
|
|
467 | goto ERROR2; |
|
|
468 | if (temp != 0) { |
|
|
469 | psiconv_warn(lev+2,off+len, |
|
|
470 | "Unexpected value in sketch section preamble (ignored)"); |
|
|
471 | psiconv_debug(lev+2,off+len,"Word %d: Read %04x, expected %04x",i, |
|
|
472 | temp,0); |
|
|
473 | } |
|
|
474 | off += 0x02; |
|
|
475 | } |
|
|
476 | psiconv_progress(lev+2,off+len,"Going to read the picture hor. offset"); |
|
|
477 | (*result)->picture_x_offset = psiconv_read_u16(buf,lev+2,off + len,&res); |
|
|
478 | if (res) |
|
|
479 | goto ERROR2; |
|
|
480 | psiconv_debug(lev+2,off+len,"Picture hor. offset: %04x", |
|
|
481 | (*result)->picture_x_offset); |
|
|
482 | len += 0x02; |
|
|
483 | psiconv_progress(lev+2,off+len,"Going to read the picture ver. offset"); |
|
|
484 | (*result)->picture_y_offset = psiconv_read_u16(buf,lev+2,off + len,&res); |
|
|
485 | if (res) |
|
|
486 | goto ERROR2; |
|
|
487 | psiconv_debug(lev+2,off+len,"Picture ver. offset: %04x", |
|
|
488 | (*result)->picture_y_offset); |
|
|
489 | len += 0x02; |
|
|
490 | psiconv_progress(lev+2,off+len,"Going to read the form hor. size"); |
|
|
491 | (*result)->form_xsize = psiconv_read_u16(buf,lev+2,off + len,&res); |
|
|
492 | if (res) |
|
|
493 | goto ERROR2; |
|
|
494 | psiconv_debug(lev+2,off+len,"Form hor. size: %04x", |
|
|
495 | (*result)->form_xsize); |
|
|
496 | len += 0x02; |
|
|
497 | psiconv_progress(lev+2,off+len,"Going to read the form ver. size"); |
|
|
498 | (*result)->form_ysize = psiconv_read_u16(buf,lev+2,off + len,&res); |
|
|
499 | if (res) |
|
|
500 | goto ERROR2; |
|
|
501 | psiconv_debug(lev+2,off+len,"Form ver. size: %04x", |
|
|
502 | (*result)->form_ysize); |
|
|
503 | len += 0x02; |
|
|
504 | psiconv_progress(lev+2,off+len,"Going to skip 1 zero word"); |
|
|
505 | temp = psiconv_read_u16(buf,lev+2,off+len,&res); |
|
|
506 | if (res) |
|
|
507 | goto ERROR2; |
|
|
508 | if (temp != 0) { |
496 | if (temp != 0) { |
509 | psiconv_warn(lev+2,off+len, |
497 | psiconv_warn(config,lev+2,off+len, |
510 | "Unexpected value in sketch section preamble (ignored)"); |
498 | "Unexpected value in sketch section preamble (ignored)"); |
511 | psiconv_debug(lev+2,off+len,"Read %04x, expected %04x",i, temp,0); |
499 | psiconv_debug(config,lev+2,off+len,"Read %04x, expected %04x", |
|
|
500 | temp,0); |
512 | } |
501 | } |
513 | off += 0x02; |
502 | off += 0x02; |
514 | } |
|
|
515 | |
503 | |
516 | psiconv_progress(lev+2,off+len,"Going to read the picture data"); |
504 | psiconv_progress(config,lev+2,off+len,"Going to read the picture data"); |
517 | if ((res = psiconv_parse_paint_data_section(buf,lev+2,off+len,&leng,0, |
505 | if ((res = psiconv_parse_paint_data_section(config,buf,lev+2,off+len,&leng,0, |
518 | &((*result)->picture)))) |
506 | &((*result)->picture)))) |
519 | goto ERROR2; |
507 | goto ERROR2; |
520 | off += leng; |
508 | off += leng; |
521 | if (!is_object) { |
|
|
522 | (*result)->picture_xsize = (*result)->picture->xsize; |
|
|
523 | (*result)->picture_ysize = (*result)->picture->ysize; |
|
|
524 | } |
|
|
525 | |
509 | |
526 | psiconv_progress(lev+2,off+len,"Going to read the hor. magnification"); |
510 | psiconv_progress(config,lev+2,off+len,"Going to read the hor. magnification"); |
527 | (*result)->magnification_x = psiconv_read_u16(buf,lev+2,off+len,&res)/1000.0; |
511 | (*result)->magnification_x = psiconv_read_u16(config,buf,lev+2,off+len,&res)/1000.0; |
528 | if (res) |
512 | if (res) |
529 | goto ERROR3; |
513 | goto ERROR3; |
530 | psiconv_debug(lev+2,off+len,"Form hor. magnification: %f", |
514 | psiconv_debug(config,lev+2,off+len,"Form hor. magnification: %f", |
531 | (*result)->magnification_x); |
515 | (*result)->magnification_x); |
532 | len += 0x02; |
516 | len += 0x02; |
533 | psiconv_progress(lev+2,off+len,"Going to read the ver. magnification"); |
517 | psiconv_progress(config,lev+2,off+len,"Going to read the ver. magnification"); |
534 | (*result)->magnification_y = psiconv_read_u16(buf,lev+2,off+len,&res)/1000.0; |
518 | (*result)->magnification_y = psiconv_read_u16(config,buf,lev+2,off+len,&res)/1000.0; |
535 | if (res) |
519 | if (res) |
536 | goto ERROR3; |
520 | goto ERROR3; |
537 | psiconv_debug(lev+2,off+len,"Form ver. magnification: %f", |
521 | psiconv_debug(config,lev+2,off+len,"Form ver. magnification: %f", |
538 | (*result)->magnification_y); |
522 | (*result)->magnification_y); |
539 | len += 0x02; |
523 | len += 0x02; |
540 | |
524 | |
541 | psiconv_progress(lev+2,off+len,"Going to read the left cut"); |
525 | psiconv_progress(config,lev+2,off+len,"Going to read the left cut"); |
542 | temp = psiconv_read_u32(buf,lev+2,off + len,&res); |
526 | temp = psiconv_read_u32(config,buf,lev+2,off + len,&res); |
543 | if (res) |
527 | if (res) |
544 | goto ERROR3; |
528 | goto ERROR3; |
545 | (*result)->cut_left = (temp * 6.0) / (*result)->picture_xsize; |
529 | (*result)->cut_left = (temp * 6.0) / (*result)->displayed_xsize; |
546 | psiconv_debug(lev+2,off+len,"Left cut: raw %08x, real: %f", |
530 | psiconv_debug(config,lev+2,off+len,"Left cut: raw %08x, real: %f", |
547 | temp,(*result)->cut_left); |
531 | temp,(*result)->cut_left); |
548 | len += 0x04; |
532 | len += 0x04; |
549 | psiconv_progress(lev+2,off+len,"Going to read the right cut"); |
533 | psiconv_progress(config,lev+2,off+len,"Going to read the right cut"); |
550 | temp = psiconv_read_u32(buf,lev+2,off + len,&res); |
534 | temp = psiconv_read_u32(config,buf,lev+2,off + len,&res); |
551 | if (res) |
535 | if (res) |
552 | goto ERROR3; |
536 | goto ERROR3; |
553 | (*result)->cut_right = (temp * 6.0) / (*result)->picture_xsize; |
537 | (*result)->cut_right = (temp * 6.0) / (*result)->displayed_xsize; |
554 | psiconv_debug(lev+2,off+len,"Right cut: raw %08x, real: %f", |
538 | psiconv_debug(config,lev+2,off+len,"Right cut: raw %08x, real: %f", |
555 | temp,(*result)->cut_right); |
539 | temp,(*result)->cut_right); |
556 | len += 0x04; |
540 | len += 0x04; |
557 | psiconv_progress(lev+2,off+len,"Going to read the top cut"); |
541 | psiconv_progress(config,lev+2,off+len,"Going to read the top cut"); |
558 | temp = psiconv_read_u32(buf,lev+2,off + len,&res); |
542 | temp = psiconv_read_u32(config,buf,lev+2,off + len,&res); |
559 | if (res) |
543 | if (res) |
560 | goto ERROR3; |
544 | goto ERROR3; |
561 | (*result)->cut_top = (temp * 6.0) / (*result)->picture_ysize; |
545 | (*result)->cut_top = (temp * 6.0) / (*result)->displayed_ysize; |
562 | psiconv_debug(lev+2,off+len,"Top cut: raw %08x, real: %f", |
546 | psiconv_debug(config,lev+2,off+len,"Top cut: raw %08x, real: %f", |
563 | temp,(*result)->cut_top); |
547 | temp,(*result)->cut_top); |
564 | len += 0x04; |
548 | len += 0x04; |
565 | psiconv_progress(lev+2,off+len,"Going to read the bottom cut"); |
549 | psiconv_progress(config,lev+2,off+len,"Going to read the bottom cut"); |
566 | temp = psiconv_read_u32(buf,lev+2,off + len,&res); |
550 | temp = psiconv_read_u32(config,buf,lev+2,off + len,&res); |
567 | if (res) |
551 | if (res) |
568 | goto ERROR3; |
552 | goto ERROR3; |
569 | (*result)->cut_bottom = (temp * 6.0) / (*result)->picture_ysize; |
553 | (*result)->cut_bottom = (temp * 6.0) / (*result)->displayed_ysize; |
570 | psiconv_debug(lev+2,off+len,"Bottom cut: raw %08x, real: %f", |
554 | psiconv_debug(config,lev+2,off+len,"Bottom cut: raw %08x, real: %f", |
571 | temp,(*result)->cut_bottom); |
555 | temp,(*result)->cut_bottom); |
572 | len += 0x04; |
556 | len += 0x04; |
573 | |
557 | |
574 | if (length) |
558 | if (length) |
575 | *length = len; |
559 | *length = len; |
576 | |
560 | |
577 | psiconv_progress(lev,off+len-1, |
561 | psiconv_progress(config,lev,off+len-1, |
578 | "End of sketch section (total length: %08x)", len); |
562 | "End of sketch section (total length: %08x)", len); |
579 | |
563 | |
580 | return res; |
564 | return res; |
581 | ERROR3: |
565 | ERROR3: |
582 | psiconv_free_paint_data_section((*result)->picture); |
566 | psiconv_free_paint_data_section((*result)->picture); |
583 | ERROR2: |
567 | ERROR2: |
584 | free (*result); |
568 | free (*result); |
585 | ERROR1: |
569 | ERROR1: |
586 | psiconv_warn(lev+1,off,"Reading of Sketch Section failed"); |
570 | psiconv_warn(config,lev+1,off,"Reading of Sketch Section failed"); |
587 | if (length) |
571 | if (length) |
588 | *length = 0; |
572 | *length = 0; |
589 | if (!res) |
573 | if (!res) |
590 | return -PSICONV_E_NOMEM; |
574 | return -PSICONV_E_NOMEM; |
591 | else |
575 | else |
592 | return res; |
576 | return res; |
593 | } |
577 | } |
594 | |
578 | |
595 | |
579 | |
596 | int psiconv_parse_clipart_section(const psiconv_buffer buf,int lev, |
580 | int psiconv_parse_clipart_section(const psiconv_config config, |
|
|
581 | const psiconv_buffer buf,int lev, |
597 | psiconv_u32 off, int *length, |
582 | psiconv_u32 off, int *length, |
598 | psiconv_clipart_section *result) |
583 | psiconv_clipart_section *result) |
599 | { |
584 | { |
600 | int res=0; |
585 | int res=0; |
601 | int len=0; |
586 | int len=0; |
602 | int leng; |
587 | int leng; |
603 | psiconv_u32 temp; |
588 | psiconv_u32 temp; |
604 | |
589 | |
605 | psiconv_progress(lev+1,off+len,"Going to read the clipart section"); |
590 | psiconv_progress(config,lev+1,off+len,"Going to read the clipart section"); |
606 | if (!(*result = malloc(sizeof(**result)))) |
591 | if (!(*result = malloc(sizeof(**result)))) |
607 | goto ERROR1; |
592 | goto ERROR1; |
608 | |
593 | |
609 | psiconv_progress(lev+2,off+len,"Going to read the section ID"); |
594 | psiconv_progress(config,lev+2,off+len,"Going to read the section ID"); |
610 | temp = psiconv_read_u32(buf,lev+2,off+len,&res); |
595 | temp = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
611 | if (res) |
596 | if (res) |
612 | goto ERROR2; |
597 | goto ERROR2; |
613 | if (temp != PSICONV_ID_CLIPART_ITEM) { |
598 | if (temp != PSICONV_ID_CLIPART_ITEM) { |
614 | psiconv_warn(lev+2,off+len, |
599 | psiconv_warn(config,lev+2,off+len, |
615 | "Unexpected value in clipart section preamble (ignored)"); |
600 | "Unexpected value in clipart section preamble (ignored)"); |
616 | psiconv_debug(lev+2,off+len,"Read %08x, expected %08x",temp, |
601 | psiconv_debug(config,lev+2,off+len,"Read %08x, expected %08x",temp, |
617 | PSICONV_ID_CLIPART_ITEM); |
602 | PSICONV_ID_CLIPART_ITEM); |
618 | } else |
603 | } else |
619 | psiconv_debug(lev+2,off+len,"Clipart ID: %08x", temp); |
604 | psiconv_debug(config,lev+2,off+len,"Clipart ID: %08x", temp); |
620 | off += 4; |
605 | off += 4; |
621 | |
606 | |
622 | psiconv_progress(lev+2,off+len,"Going to read an unknown long"); |
607 | psiconv_progress(config,lev+2,off+len,"Going to read an unknown long"); |
623 | temp = psiconv_read_u32(buf,lev+2,off+len,&res); |
608 | temp = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
624 | if (res) |
609 | if (res) |
625 | goto ERROR2; |
610 | goto ERROR2; |
626 | if (temp != 0x02) { |
611 | if (temp != 0x02) { |
627 | psiconv_warn(lev+2,off+len, |
612 | psiconv_warn(config,lev+2,off+len, |
628 | "Unexpected value in clipart section preamble (ignored)"); |
613 | "Unexpected value in clipart section preamble (ignored)"); |
629 | psiconv_debug(lev+2,off+len,"Read %08x, expected %08x",temp, |
614 | psiconv_debug(config,lev+2,off+len,"Read %08x, expected %08x",temp, |
630 | 0x02); |
615 | 0x02); |
631 | } else |
616 | } else |
632 | psiconv_debug(lev+2,off+len,"First unknown long: %08x", temp); |
617 | psiconv_debug(config,lev+2,off+len,"First unknown long: %08x", temp); |
633 | off += 4; |
618 | off += 4; |
634 | |
619 | |
635 | psiconv_progress(lev+2,off+len,"Going to read a second unknown long"); |
620 | psiconv_progress(config,lev+2,off+len,"Going to read a second unknown long"); |
636 | temp = psiconv_read_u32(buf,lev+2,off+len,&res); |
621 | temp = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
637 | if (res) |
622 | if (res) |
638 | goto ERROR2; |
623 | goto ERROR2; |
639 | if (temp != 0) { |
624 | if (temp != 0) { |
640 | psiconv_warn(lev+2,off+len, |
625 | psiconv_warn(config,lev+2,off+len, |
641 | "Unexpected value in clipart section preamble (ignored)"); |
626 | "Unexpected value in clipart section preamble (ignored)"); |
642 | psiconv_debug(lev+2,off+len,"Read %08x, expected %08x",temp, 0); |
627 | psiconv_debug(config,lev+2,off+len,"Read %08x, expected %08x",temp, 0); |
643 | } else |
628 | } else |
644 | psiconv_debug(lev+2,off+len,"Second unknown long: %08x", temp); |
629 | psiconv_debug(config,lev+2,off+len,"Second unknown long: %08x", temp); |
645 | off += 4; |
630 | off += 4; |
646 | |
631 | |
647 | psiconv_progress(lev+2,off+len,"Going to read a third unknown long"); |
632 | psiconv_progress(config,lev+2,off+len,"Going to read a third unknown long"); |
648 | temp = psiconv_read_u32(buf,lev+2,off+len,&res); |
633 | temp = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
649 | if (res) |
634 | if (res) |
650 | goto ERROR2; |
635 | goto ERROR2; |
651 | if (temp != 0) { |
636 | if (temp != 0) { |
652 | psiconv_warn(lev+2,off+len, |
637 | psiconv_warn(config,lev+2,off+len, |
653 | "Unexpected value in clipart section preamble (ignored)"); |
638 | "Unexpected value in clipart section preamble (ignored)"); |
654 | psiconv_debug(lev+2,off+len,"Read %08x, expected %08x",temp, 0); |
639 | psiconv_debug(config,lev+2,off+len,"Read %08x, expected %08x",temp, 0); |
655 | } else |
640 | } else |
656 | psiconv_debug(lev+2,off+len,"Third unknown long: %08x", temp); |
641 | psiconv_debug(config,lev+2,off+len,"Third unknown long: %08x", temp); |
657 | off += 4; |
642 | off += 4; |
658 | |
643 | |
659 | psiconv_progress(lev+2,off+len,"Going to read a fourth unknown long"); |
644 | psiconv_progress(config,lev+2,off+len,"Going to read a fourth unknown long"); |
660 | temp = psiconv_read_u32(buf,lev+2,off+len,&res); |
645 | temp = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
661 | if (res) |
646 | if (res) |
662 | goto ERROR2; |
647 | goto ERROR2; |
663 | if ((temp != 0x0c) && (temp != 0x08)) { |
648 | if ((temp != 0x0c) && (temp != 0x08)) { |
664 | psiconv_warn(lev+2,off+len, |
649 | psiconv_warn(config,lev+2,off+len, |
665 | "Unexpected value in clipart section preamble (ignored)"); |
650 | "Unexpected value in clipart section preamble (ignored)"); |
666 | psiconv_debug(lev+2,off+len,"Read %08x, expected %08x or %08x",temp, |
651 | psiconv_debug(config,lev+2,off+len,"Read %08x, expected %08x or %08x",temp, |
667 | 0x0c, 0x08); |
652 | 0x0c, 0x08); |
668 | } else |
653 | } else |
669 | psiconv_debug(lev+2,off+len,"Fourth unknown long: %08x", temp); |
654 | psiconv_debug(config,lev+2,off+len,"Fourth unknown long: %08x", temp); |
670 | off += 4; |
655 | off += 4; |
671 | |
656 | |
672 | psiconv_progress(lev+2,off+len,"Going to read the Paint Data Section"); |
657 | psiconv_progress(config,lev+2,off+len,"Going to read the Paint Data Section"); |
673 | if ((res = psiconv_parse_paint_data_section(buf,lev+2,off+len,&leng,1, |
658 | if ((res = psiconv_parse_paint_data_section(config,buf,lev+2,off+len,&leng,1, |
674 | &((*result)->picture)))) |
659 | &((*result)->picture)))) |
675 | goto ERROR2; |
660 | goto ERROR2; |
676 | len += leng; |
661 | len += leng; |
677 | |
662 | |
678 | if (length) |
663 | if (length) |
679 | *length = len; |
664 | *length = len; |
680 | |
665 | |
681 | psiconv_progress(lev,off+len-1, |
666 | psiconv_progress(config,lev,off+len-1, |
682 | "End of clipart section (total length: %08x)", len); |
667 | "End of clipart section (total length: %08x)", len); |
683 | return 0; |
668 | return 0; |
684 | |
669 | |
685 | ERROR2: |
670 | ERROR2: |
686 | free (*result); |
671 | free (*result); |
687 | ERROR1: |
672 | ERROR1: |
688 | psiconv_warn(lev+1,off,"Reading of Font failed"); |
673 | psiconv_warn(config,lev+1,off,"Reading of Font failed"); |
689 | if (length) |
674 | if (length) |
690 | *length = 0; |
675 | *length = 0; |
691 | if (!res) |
676 | if (!res) |
692 | return -PSICONV_E_NOMEM; |
677 | return -PSICONV_E_NOMEM; |
693 | else |
678 | else |
694 | return res; |
679 | return res; |
695 | } |
680 | } |
|
|
681 | |
|
|
682 | int psiconv_decode_rle8 (const psiconv_config config, int lev, psiconv_u32 off, |
|
|
683 | const psiconv_pixel_bytes encoded, |
|
|
684 | psiconv_pixel_bytes *decoded) |
|
|
685 | { |
|
|
686 | int res=0; |
|
|
687 | psiconv_u8 *marker,*value; |
|
|
688 | int i,j; |
|
|
689 | |
|
|
690 | psiconv_progress(config,lev+1,off,"Going to decode the RLE8 encoding"); |
|
|
691 | if (!(*decoded = psiconv_list_new(sizeof(psiconv_u8)))) |
|
|
692 | goto ERROR1; |
|
|
693 | |
|
|
694 | for (i = 0; i < psiconv_list_length(encoded);) { |
|
|
695 | psiconv_progress(config,lev+2,off,"Going to read marker byte at %04x",i); |
|
|
696 | if (!(marker = psiconv_list_get(encoded,i))) |
|
|
697 | goto ERROR2; |
|
|
698 | psiconv_debug(config,lev+2,off,"Marker byte: %02x",*marker); |
|
|
699 | if (*marker < 0x80) { |
|
|
700 | psiconv_debug(config,lev+2,off,"Marker: repeat value byte %02x times", |
|
|
701 | *marker+1); |
|
|
702 | psiconv_progress(config,lev+2,off,"Going to read value byte at %04x",i+1); |
|
|
703 | if (!(value = psiconv_list_get(encoded,i+1))) |
|
|
704 | goto ERROR2; |
|
|
705 | psiconv_debug(config,lev+2,off,"Value byte: %02x",*value); |
|
|
706 | psiconv_progress(config,lev+2,off,"Adding %02x bytes %02x", |
|
|
707 | *marker+1,*value); |
|
|
708 | for (j = 0; j < *marker + 1; j++) |
|
|
709 | if ((res = psiconv_list_add(*decoded,value))) |
|
|
710 | goto ERROR2; |
|
|
711 | i += 2; |
|
|
712 | } else { |
|
|
713 | psiconv_debug(config,lev+2,off,"Marker: %02x value bytes follow", |
|
|
714 | 0x100 - *marker); |
|
|
715 | for (j = 0; j < (0x100 - *marker); j++) { |
|
|
716 | psiconv_progress(config,lev+2,off,"Going to read value byte at %04x", |
|
|
717 | i+j+1); |
|
|
718 | if (!(value = psiconv_list_get(encoded,i+j+1))) |
|
|
719 | goto ERROR2; |
|
|
720 | psiconv_debug(config,lev+2,off,"Value: %02x",*value); |
|
|
721 | if ((res = psiconv_list_add(*decoded,value))) |
|
|
722 | goto ERROR2; |
|
|
723 | } |
|
|
724 | i += (0x100 - *marker) + 1; |
|
|
725 | } |
|
|
726 | } |
|
|
727 | psiconv_progress(config,lev,off, |
|
|
728 | "End of RLE8 decoding process"); |
|
|
729 | return 0; |
|
|
730 | |
|
|
731 | ERROR2: |
|
|
732 | psiconv_list_free(*decoded); |
|
|
733 | ERROR1: |
|
|
734 | psiconv_warn(config,lev+1,off,"Decoding of RLE8 failed"); |
|
|
735 | if (!res) |
|
|
736 | return -PSICONV_E_NOMEM; |
|
|
737 | else |
|
|
738 | return res; |
|
|
739 | } |
|
|
740 | |
|
|
741 | int psiconv_bytes_to_pixel_data(const psiconv_config config, |
|
|
742 | int lev, psiconv_u32 off, |
|
|
743 | const psiconv_pixel_bytes bytes, |
|
|
744 | psiconv_pixel_ints *pixels, |
|
|
745 | int colordepth, int xsize, int ysize) |
|
|
746 | { |
|
|
747 | int res=0; |
|
|
748 | int ibits,obits,x,y,bits; |
|
|
749 | psiconv_u8 input; |
|
|
750 | psiconv_u32 nr,output; |
|
|
751 | psiconv_u8 *ientry; |
|
|
752 | |
|
|
753 | psiconv_progress(config,lev+1,off,"Going to convert the bytes to pixels"); |
|
|
754 | if (!(*pixels = psiconv_list_new(sizeof(psiconv_u32)))) |
|
|
755 | goto ERROR1; |
|
|
756 | |
|
|
757 | nr = 0; |
|
|
758 | for (y = 0; y < ysize; y++) { |
|
|
759 | /* New lines will start at longs */ |
|
|
760 | while (nr % 4) |
|
|
761 | nr ++; |
|
|
762 | input = 0; |
|
|
763 | ibits = 0; |
|
|
764 | for (x= 0; x < xsize; x++) { |
|
|
765 | psiconv_progress(config,lev+2,off, |
|
|
766 | "Processing pixel at (x,y) = (%04x,%04x)",x,y); |
|
|
767 | output = 0; |
|
|
768 | obits = 0; |
|
|
769 | while (obits < colordepth) { |
|
|
770 | if (ibits == 0) { |
|
|
771 | psiconv_progress(config,lev+3,off, |
|
|
772 | "Going to read byte %08x",nr); |
|
|
773 | if (!(ientry = psiconv_list_get(bytes,nr))) |
|
|
774 | goto ERROR2; |
|
|
775 | psiconv_debug(config,lev+3,off,"Byte value: %02x",*ientry); |
|
|
776 | input = *ientry; |
|
|
777 | ibits = 8; |
|
|
778 | nr ++; |
|
|
779 | } |
|
|
780 | bits = ibits + obits > colordepth?colordepth-obits:ibits; |
|
|
781 | output = output << bits; |
|
|
782 | output |= input & ((1 << bits) - 1); |
|
|
783 | input = input >> bits; |
|
|
784 | ibits -= bits; |
|
|
785 | obits += bits; |
|
|
786 | } |
|
|
787 | psiconv_debug(config,lev+2,off,"Pixel value: %08x",output); |
|
|
788 | if ((res = psiconv_list_add(*pixels,&output))) |
|
|
789 | goto ERROR2; |
|
|
790 | } |
|
|
791 | } |
|
|
792 | |
|
|
793 | psiconv_progress(config,lev,off, |
|
|
794 | "Converting bytes to pixels completed"); |
|
|
795 | return 0; |
|
|
796 | |
|
|
797 | |
|
|
798 | ERROR2: |
|
|
799 | psiconv_list_free(*pixels); |
|
|
800 | ERROR1: |
|
|
801 | psiconv_warn(config,lev+1,off,"Converting bytes to pixels failed"); |
|
|
802 | if (!res) |
|
|
803 | return -PSICONV_E_NOMEM; |
|
|
804 | else |
|
|
805 | return res; |
|
|
806 | } |
|
|
807 | |
|
|
808 | int psiconv_pixel_data_to_floats (const psiconv_config config, int lev, |
|
|
809 | psiconv_u32 off, |
|
|
810 | const psiconv_pixel_ints pixels, |
|
|
811 | psiconv_pixel_floats_t *floats, |
|
|
812 | int colordepth, int color, |
|
|
813 | int redbits, int bluebits, int greenbits, |
|
|
814 | const psiconv_pixel_floats_t palet) |
|
|
815 | { |
|
|
816 | int res = 0; |
|
|
817 | psiconv_u32 i; |
|
|
818 | psiconv_u32 *pixel; |
|
|
819 | |
|
|
820 | psiconv_progress(config,lev+1,off,"Going to convert pixels to floats"); |
|
|
821 | if (!((*floats).red = malloc(psiconv_list_length(pixels) * |
|
|
822 | sizeof(*(*floats).red)))) |
|
|
823 | goto ERROR1; |
|
|
824 | if (!((*floats).green = malloc(psiconv_list_length(pixels) * |
|
|
825 | sizeof(*(*floats).green)))) |
|
|
826 | goto ERROR2; |
|
|
827 | if (!((*floats).blue = malloc(psiconv_list_length(pixels) * |
|
|
828 | sizeof(*(*floats).blue)))) |
|
|
829 | goto ERROR3; |
|
|
830 | (*floats).length = psiconv_list_length(pixels); |
|
|
831 | |
|
|
832 | for (i = 0; i < psiconv_list_length(pixels); i++) { |
|
|
833 | if (!(pixel = psiconv_list_get(pixels,i))) |
|
|
834 | goto ERROR4; |
|
|
835 | psiconv_progress(config,lev+2,off, "Handling pixel %04x (%04x)",i,*pixel); |
|
|
836 | if (!palet.length) { |
|
|
837 | if (color) { |
|
|
838 | (*floats).blue[i] = (*pixel & ((1 << bluebits) - 1)) / |
|
|
839 | (1 << bluebits); |
|
|
840 | (*floats).green[i] = ((*pixel >> bluebits) & ((1 << greenbits) - 1)) / |
|
|
841 | (1 << greenbits); |
|
|
842 | (*floats).red[i] = ((*pixel >> (bluebits+greenbits)) & |
|
|
843 | ((1 << redbits) - 1)) / (1 << redbits); |
|
|
844 | } else { |
|
|
845 | (*floats).red[i] = (*floats).green[i] = |
|
|
846 | (*floats).blue[i] = *pixel / (1 << colordepth); |
|
|
847 | } |
|
|
848 | } else { |
|
|
849 | if (*pixel >= palet.length) { |
|
|
850 | psiconv_warn(config,lev+2,off, |
|
|
851 | "Invalid palet color found (using color 0x00)"); |
|
|
852 | (*floats).red[i] = palet.red[0]; |
|
|
853 | (*floats).green[i] = palet.green[0]; |
|
|
854 | (*floats).blue[i] = palet.blue[0]; |
|
|
855 | } else { |
|
|
856 | (*floats).red[i] = palet.red[*pixel]; |
|
|
857 | (*floats).green[i] = palet.green[*pixel]; |
|
|
858 | (*floats).blue[i] = palet.blue[*pixel]; |
|
|
859 | } |
|
|
860 | } |
|
|
861 | psiconv_debug(config,lev+2,off, "Pixel: Red (%f), green (%f), blue (%f)", |
|
|
862 | (*floats).red[i],(*floats).green[i],(*floats).blue[i]); |
|
|
863 | } |
|
|
864 | psiconv_progress(config,lev+1,off,"Finished converting pixels to floats"); |
|
|
865 | return 0; |
|
|
866 | |
|
|
867 | ERROR4: |
|
|
868 | free((*floats).blue); |
|
|
869 | ERROR3: |
|
|
870 | free((*floats).green); |
|
|
871 | ERROR2: |
|
|
872 | free((*floats).red); |
|
|
873 | ERROR1: |
|
|
874 | psiconv_warn(config,lev+1,off,"Converting pixels to floats failed"); |
|
|
875 | if (!res) |
|
|
876 | return -PSICONV_E_NOMEM; |
|
|
877 | else |
|
|
878 | return res; |
|
|
879 | } |
|
|
880 | |
|
|
881 | |
|
|
882 | |