1 | /* |
1 | /* |
2 | parse_image.c - Part of psiconv, a PSION 5 file formats converter |
2 | parse_image.c - Part of psiconv, a PSION 5 file formats converter |
3 | Copyright (c) 1999, 2000 Frodo Looijaard <frodol@dds.nl> |
3 | Copyright (c) 1999-2005 Frodo Looijaard <frodo@frodo.looijaard.name> |
4 | |
4 | |
5 | This program is free software; you can redistribute it and/or modify |
5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by |
6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or |
7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. |
8 | (at your option) any later version. |
… | |
… | |
28 | |
28 | |
29 | #ifdef DMALLOC |
29 | #ifdef DMALLOC |
30 | #include <dmalloc.h> |
30 | #include <dmalloc.h> |
31 | #endif |
31 | #endif |
32 | |
32 | |
|
|
33 | /* Extreme debugging info */ |
|
|
34 | #undef LOUD |
|
|
35 | |
33 | static int psiconv_decode_rle8 (const psiconv_config config, int lev, |
36 | static int psiconv_decode_rle8 (const psiconv_config config, int lev, |
|
|
37 | psiconv_u32 off, |
|
|
38 | const psiconv_pixel_bytes encoded, |
|
|
39 | psiconv_pixel_bytes *decoded); |
|
|
40 | |
|
|
41 | static int psiconv_decode_rle12 (const psiconv_config config, int lev, |
|
|
42 | psiconv_u32 off, |
|
|
43 | const psiconv_pixel_bytes encoded, |
|
|
44 | psiconv_pixel_bytes *decoded); |
|
|
45 | |
|
|
46 | static int psiconv_decode_rle16 (const psiconv_config config, int lev, |
|
|
47 | psiconv_u32 off, |
|
|
48 | const psiconv_pixel_bytes encoded, |
|
|
49 | psiconv_pixel_bytes *decoded); |
|
|
50 | |
|
|
51 | static int psiconv_decode_rle24 (const psiconv_config config, int lev, |
34 | psiconv_u32 off, |
52 | psiconv_u32 off, |
35 | const psiconv_pixel_bytes encoded, |
53 | const psiconv_pixel_bytes encoded, |
36 | psiconv_pixel_bytes *decoded); |
54 | psiconv_pixel_bytes *decoded); |
37 | |
55 | |
38 | static int psiconv_bytes_to_pixel_data(const psiconv_config config, |
56 | static int psiconv_bytes_to_pixel_data(const psiconv_config config, |
… | |
… | |
92 | return 0; |
110 | return 0; |
93 | |
111 | |
94 | ERROR2: |
112 | ERROR2: |
95 | psiconv_list_free(*result); |
113 | psiconv_list_free(*result); |
96 | ERROR1: |
114 | ERROR1: |
97 | psiconv_warn(config,lev+1,off,"Reading of Jumptable Section failed"); |
115 | psiconv_error(config,lev+1,off,"Reading of Jumptable Section failed"); |
98 | if (length) |
116 | if (length) |
99 | *length = 0; |
117 | *length = 0; |
100 | if (!res) |
118 | if (!res) |
101 | return -PSICONV_E_NOMEM; |
119 | return -PSICONV_E_NOMEM; |
102 | else |
120 | else |
103 | return res; |
121 | return res; |
104 | } |
122 | } |
105 | |
123 | |
106 | static int decode_byte(const psiconv_config config, int lev, psiconv_u32 off, |
|
|
107 | psiconv_paint_data_section data, psiconv_u32 *pixelnr, |
|
|
108 | psiconv_u8 byte, int bits_per_pixel, int linelen, |
|
|
109 | int *linepos,int picsize) |
|
|
110 | { |
|
|
111 | int mask = (bits_per_pixel << 1) -1; |
|
|
112 | int i; |
|
|
113 | if (*linepos < (data->xsize + (8/bits_per_pixel) - 1) / (8/bits_per_pixel)) |
|
|
114 | for (i = 0; i < 8/bits_per_pixel; i ++) { |
|
|
115 | if ((i != 0) && ((*pixelnr % (data->xsize)) == 0)) { |
|
|
116 | psiconv_debug(config,lev+1,off,"Skipping padding: %02x",byte); |
|
|
117 | i = 8; |
|
|
118 | } else if (*pixelnr >= picsize) { |
|
|
119 | psiconv_warn(config,lev+1,off,"Corrupted picture data!"); |
|
|
120 | psiconv_debug(config,lev+1,off,"Trying to write a pixel too far"); |
|
|
121 | return -1; |
|
|
122 | } else { |
|
|
123 | data->red[*pixelnr] = data->green[*pixelnr] = data->blue[*pixelnr] = |
|
|
124 | ((float) (byte & mask)) / ((1 << bits_per_pixel) -1); |
|
|
125 | psiconv_debug(config,lev+1,off,"Pixel %04x: (%04x,%04x) value %02x, color %f", |
|
|
126 | *pixelnr,*pixelnr % data->xsize, |
|
|
127 | *pixelnr / data->xsize, byte&mask, data->red[*pixelnr]); |
|
|
128 | byte = byte >> bits_per_pixel; |
|
|
129 | (*pixelnr) ++; |
|
|
130 | } |
|
|
131 | } |
|
|
132 | else |
|
|
133 | psiconv_debug(config,lev+1,off,"Skipping padding byte"); |
|
|
134 | (*linepos) ++; |
|
|
135 | if (*linepos == linelen) |
|
|
136 | *linepos = 0; |
|
|
137 | return 0; |
|
|
138 | } |
|
|
139 | |
|
|
140 | |
|
|
141 | int psiconv_parse_paint_data_section(const psiconv_config config, |
124 | int psiconv_parse_paint_data_section(const psiconv_config config, |
142 | const psiconv_buffer buf,int lev, |
125 | const psiconv_buffer buf,int lev, |
143 | psiconv_u32 off, int *length,int isclipart, |
126 | psiconv_u32 off, int *length,int isclipart, |
144 | psiconv_paint_data_section *result) |
127 | psiconv_paint_data_section *result) |
145 | { |
128 | { |
146 | int res = 0; |
129 | int res = 0; |
147 | int len = 0; |
130 | int len = 0; |
148 | psiconv_u32 size,offset,picsize,temp,datasize,pixelnr,datanr,linelen; |
131 | psiconv_u32 size,offset,temp,datasize,color, |
|
|
132 | redbits,bluebits,greenbits; |
149 | psiconv_u8 marker; |
133 | psiconv_u8 byte; |
150 | int i,leng; |
134 | int leng,i; |
151 | psiconv_u32 bits_per_pixel,compression; |
135 | psiconv_u32 bits_per_pixel,compression; |
152 | int linepos = 0; |
136 | psiconv_pixel_bytes bytes,decoded; |
|
|
137 | psiconv_pixel_ints pixels; |
|
|
138 | psiconv_pixel_floats_t floats,palet; |
153 | |
139 | |
154 | psiconv_progress(config,lev+1,off,"Going to read a paint data section"); |
140 | psiconv_progress(config,lev+1,off,"Going to read a paint data section"); |
155 | if (!((*result) = malloc(sizeof(**result)))) |
141 | if (!((*result) = malloc(sizeof(**result)))) |
156 | goto ERROR1; |
142 | goto ERROR1; |
157 | |
143 | |
|
|
144 | if (!(bytes = psiconv_list_new(sizeof(psiconv_u8)))) |
|
|
145 | goto ERROR2; |
|
|
146 | |
158 | psiconv_progress(config,lev+2,off+len,"Going to read section size"); |
147 | psiconv_progress(config,lev+2,off+len,"Going to read section size"); |
159 | size = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
148 | size = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
160 | if (res) |
149 | if (res) |
161 | goto ERROR2; |
150 | goto ERROR3; |
162 | psiconv_debug(config,lev+2,off+len,"Section size: %08x",size); |
151 | psiconv_debug(config,lev+2,off+len,"Section size: %08x",size); |
163 | len += 4; |
152 | len += 4; |
164 | |
153 | |
165 | psiconv_progress(config,lev+2,off+len,"Going to read pixel data offset"); |
154 | psiconv_progress(config,lev+2,off+len,"Going to read pixel data offset"); |
166 | offset = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
155 | offset = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
167 | if (res) |
156 | if (res) |
168 | goto ERROR2; |
157 | goto ERROR3; |
169 | if (offset != 0x28) { |
158 | if (offset != 0x28) { |
170 | psiconv_warn(config,lev+2,off+len, |
159 | psiconv_error(config,lev+2,off+len, |
171 | "Paint data section data offset has unexpected value"); |
160 | "Paint data section data offset has unexpected value"); |
172 | psiconv_debug(config,lev+2,off+len, |
161 | psiconv_debug(config,lev+2,off+len, |
173 | "Data offset: read %08x, expected %08x",offset,0x28); |
162 | "Data offset: read %08x, expected %08x",offset,0x28); |
174 | res = -1; |
163 | res = -1; |
175 | } |
164 | } |
176 | len += 4; |
165 | len += 4; |
177 | |
166 | |
178 | psiconv_progress(config,lev+2,off+len,"Going to read picture X size"); |
167 | psiconv_progress(config,lev+2,off+len,"Going to read picture X size"); |
179 | (*result)->xsize = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
168 | (*result)->xsize = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
180 | if (res) |
169 | if (res) |
181 | goto ERROR2; |
170 | goto ERROR3; |
182 | psiconv_debug(config,lev+2,off+len,"Picture X size: %08x:",(*result)->xsize); |
171 | psiconv_debug(config,lev+2,off+len,"Picture X size: %08x:",(*result)->xsize); |
183 | len += 4; |
172 | len += 4; |
184 | |
173 | |
185 | psiconv_progress(config,lev+2,off+len,"Going to read picture Y size"); |
174 | psiconv_progress(config,lev+2,off+len,"Going to read picture Y size"); |
186 | (*result)->ysize = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
175 | (*result)->ysize = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
187 | if (res) |
176 | if (res) |
188 | goto ERROR2; |
177 | goto ERROR3; |
189 | psiconv_debug(config,lev+2,off+len,"Picture Y size: %08x:",(*result)->ysize); |
178 | psiconv_debug(config,lev+2,off+len,"Picture Y size: %08x:",(*result)->ysize); |
190 | len += 4; |
179 | len += 4; |
191 | |
180 | |
192 | picsize = (*result)->ysize * (*result)->xsize; |
|
|
193 | |
|
|
194 | psiconv_progress(config,lev+2,off+len,"Going to read the real picture x size"); |
181 | psiconv_progress(config,lev+2,off+len,"Going to read the real picture x size"); |
195 | (*result)->pic_xsize = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res); |
182 | (*result)->pic_xsize = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res); |
196 | if (res) |
183 | if (res) |
197 | goto ERROR2; |
184 | goto ERROR3; |
198 | psiconv_debug(config,lev+2,off+len,"Picture x size: %f",(*result)->pic_xsize); |
185 | psiconv_debug(config,lev+2,off+len,"Picture x size: %f",(*result)->pic_xsize); |
199 | len += leng; |
186 | len += leng; |
200 | |
187 | |
201 | psiconv_progress(config,lev+2,off+len,"Going to read the real picture y size"); |
188 | psiconv_progress(config,lev+2,off+len,"Going to read the real picture y size"); |
202 | (*result)->pic_ysize = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res); |
189 | (*result)->pic_ysize = psiconv_read_length(config,buf,lev+2,off+len,&leng,&res); |
203 | if (res) |
190 | if (res) |
204 | goto ERROR2; |
191 | goto ERROR3; |
205 | psiconv_debug(config,lev+2,off+len,"Picture y size: %f",(*result)->pic_ysize); |
192 | psiconv_debug(config,lev+2,off+len,"Picture y size: %f",(*result)->pic_ysize); |
206 | len += leng; |
193 | len += leng; |
207 | |
194 | |
208 | psiconv_progress(config,lev+2,off+len,"Going to read the number of bits per pixel"); |
195 | psiconv_progress(config,lev+2,off+len,"Going to read the number of bits per pixel"); |
209 | bits_per_pixel=psiconv_read_u32(config,buf,lev+2,off+len,&res); |
196 | bits_per_pixel=psiconv_read_u32(config,buf,lev+2,off+len,&res); |
210 | if (res) |
197 | if (res) |
211 | goto ERROR2; |
198 | goto ERROR3; |
212 | if (bits_per_pixel > 8) { |
|
|
213 | psiconv_warn(config,lev+2,off+len,"Picture has too many colors"); |
|
|
214 | psiconv_debug(config,lev+2,off+len,"Read %d colorbits",bits_per_pixel); |
|
|
215 | res = -PSICONV_E_PARSE; |
|
|
216 | goto ERROR2; |
|
|
217 | } |
|
|
218 | psiconv_debug(config,lev+2,off+len,"Bits per pixel: %d",bits_per_pixel); |
199 | psiconv_debug(config,lev+2,off+len,"Bits per pixel: %d",bits_per_pixel); |
219 | len += 4; |
200 | len += 4; |
220 | |
201 | |
221 | for (i = 0 ; i < 2; i++) { |
202 | psiconv_progress(config,lev+2,off+len, |
|
|
203 | "Going to read whether this is a colour or greyscale picture"); |
|
|
204 | color = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
|
|
205 | if (res) |
|
|
206 | goto ERROR3; |
|
|
207 | if ((color != 0) && (color != 1)) { |
|
|
208 | psiconv_warn(config,lev+2,off+len, |
|
|
209 | "Paint data section unknown color type (ignored)"); |
|
|
210 | psiconv_debug(config,lev+2,off+len, |
|
|
211 | "Color: read %08x, expected %08x or %08x",color,0,1); |
|
|
212 | color = 1; |
|
|
213 | } else { |
|
|
214 | psiconv_debug(config,lev+2,off+len,"Color: %08x (%s picture)", |
|
|
215 | color,(color?"color":"greyscale")); |
|
|
216 | } |
|
|
217 | len += 4; |
|
|
218 | |
222 | temp = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
219 | temp = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
223 | if (res) |
220 | if (res) |
224 | goto ERROR2; |
221 | goto ERROR3; |
225 | if (temp != 00) { |
222 | if (temp != 00) { |
226 | psiconv_warn(config,lev+2,off+len, |
223 | psiconv_warn(config,lev+2,off+len, |
227 | "Paint data section prologue has unknown values (ignored)"); |
224 | "Paint data section prologue has unknown values (ignored)"); |
228 | psiconv_debug(config,lev+2,off+len, |
225 | psiconv_debug(config,lev+2,off+len, |
229 | "offset %02x: read %08x, expected %08x",i,temp, 0x00); |
226 | "read %08x, expected %08x",temp, 0x00); |
230 | } |
227 | } |
231 | len += 4; |
228 | len += 4; |
232 | } |
|
|
233 | |
229 | |
234 | psiconv_progress(config,lev+2,off+len, |
230 | psiconv_progress(config,lev+2,off+len, |
235 | "Going to read whether RLE compression is used"); |
231 | "Going to read whether RLE compression is used"); |
236 | compression=psiconv_read_u32(config,buf,lev+2,off+len,&res); |
232 | compression=psiconv_read_u32(config,buf,lev+2,off+len,&res); |
237 | if (res) |
233 | if (res) |
238 | goto ERROR2; |
234 | goto ERROR3; |
239 | if (compression > 1) { |
235 | if (compression > 4) { |
240 | psiconv_warn(config,lev+2,off+len,"Paint data section has unknown " |
236 | psiconv_warn(config,lev+2,off+len,"Paint data section has unknown " |
241 | "compression type, assuming RLE"); |
237 | "compression type, assuming RLE"); |
242 | psiconv_debug(config,lev+2,off+len,"Read compression type %d",compression); |
238 | psiconv_debug(config,lev+2,off+len,"Read compression type %d",compression); |
243 | compression = 1; |
239 | compression = 0; |
244 | } |
240 | } |
245 | psiconv_debug(config,lev+2,off+len,"Compression: %s",compression?"RLE8":"none"); |
241 | psiconv_debug(config,lev+2,off+len,"Compression: %s", |
|
|
242 | compression == 4?"RLE24":compression == 3?"RLE16": |
|
|
243 | compression == 2?"RLE12":compression == 1?"RLE8":"none"); |
246 | len += 4; |
244 | len += 4; |
247 | |
245 | |
248 | if (isclipart) { |
246 | if (isclipart) { |
249 | psiconv_progress(config,lev+2,off+len,"Going to read an unknown long"); |
247 | psiconv_progress(config,lev+2,off+len,"Going to read an unknown long"); |
250 | temp = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
248 | temp = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
251 | if (res) |
249 | if (res) |
252 | goto ERROR2; |
250 | goto ERROR3; |
253 | if (temp != 0xffffffff) { |
251 | if (temp != 0xffffffff) { |
254 | psiconv_warn(config,lev+2,off+len, |
252 | psiconv_warn(config,lev+2,off+len, |
255 | "Paint data section prologue has unknown values (ignoring)"); |
253 | "Paint data section prologue has unknown values (ignoring)"); |
256 | psiconv_debug(config,lev+2,off+len, |
254 | psiconv_debug(config,lev+2,off+len, |
257 | "offset %02x: read %08x, expected %08x",i,temp, 0xffffffff); |
255 | "Read %08x, expected %08x",temp, 0xffffffff); |
258 | } |
256 | } |
259 | len += 4; |
257 | len += 4; |
260 | psiconv_progress(config,lev+2,off+len,"Going to read a second unknown long"); |
258 | psiconv_progress(config,lev+2,off+len,"Going to read a second unknown long"); |
261 | temp = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
259 | temp = psiconv_read_u32(config,buf,lev+2,off+len,&res); |
262 | if (res) |
260 | if (res) |
263 | goto ERROR2; |
261 | goto ERROR3; |
264 | if (temp != 0x44) { |
262 | if (temp != 0x44) { |
265 | psiconv_warn(config,lev+2,off+len, |
263 | psiconv_warn(config,lev+2,off+len, |
266 | "Paint data section prologue has unknown values (ignoring)"); |
264 | "Paint data section prologue has unknown values (ignoring)"); |
267 | psiconv_debug(config,lev+2,off+len, |
265 | psiconv_debug(config,lev+2,off+len, |
268 | "offset %02x: read %08x, expected %08x",i,temp, 0x44); |
266 | "read %08x, expected %08x",temp, 0x44); |
269 | } |
267 | } |
270 | len += 4; |
268 | len += 4; |
271 | } |
269 | } |
272 | |
270 | |
273 | if (!((*result)->red = malloc(sizeof(float) * picsize))) |
|
|
274 | goto ERROR2; |
|
|
275 | if (!((*result)->green = malloc(sizeof(float) * picsize))) |
|
|
276 | goto ERROR3; |
|
|
277 | if (!((*result)->blue = malloc(sizeof(float) * picsize))) |
|
|
278 | goto ERROR4; |
|
|
279 | len = offset; |
271 | len = offset; |
280 | datasize = size - len; |
272 | datasize = size - len; |
281 | if (isclipart) |
273 | if (isclipart) |
282 | len += 8; |
274 | len += 8; |
283 | |
275 | |
|
|
276 | if (color || (bits_per_pixel != 2)) |
|
|
277 | psiconv_warn(config,lev+2,off+len, |
|
|
278 | "All image types except 2-bit greyscale are experimental!"); |
|
|
279 | |
284 | psiconv_progress(config,lev+2,off+len,"Going to read the pixel data"); |
280 | psiconv_progress(config,lev+2,off+len,"Going to read the pixel data"); |
285 | pixelnr = 0; |
281 | for (i = 0; i < datasize; i++) { |
286 | datanr = 0; |
|
|
287 | if (!compression) { |
|
|
288 | linelen = datasize / (*result)->ysize; |
|
|
289 | psiconv_debug(config,lev+3,off+len,"Line length: %04x bytes",linelen); |
|
|
290 | while((datanr < datasize)) { |
|
|
291 | temp = psiconv_read_u8(config,buf,lev+2,off+len+datanr,&res); |
282 | byte = psiconv_read_u8(config,buf,lev+2,off+len+i,&res); |
|
|
283 | #ifdef LOUD |
|
|
284 | psiconv_debug(config,lev+2,off+len+i, |
|
|
285 | "Pixel byte %04x of %04x has value %02x", |
|
|
286 | i,datasize,byte); |
|
|
287 | #endif |
292 | if (res) |
288 | if (res) |
|
|
289 | goto ERROR3; |
|
|
290 | psiconv_list_add(bytes,&byte); |
|
|
291 | } |
|
|
292 | len += datasize; |
|
|
293 | |
|
|
294 | switch(compression) { |
|
|
295 | case 1: |
|
|
296 | if ((res = psiconv_decode_rle8(config,lev+2,off+len,bytes,&decoded))) |
|
|
297 | goto ERROR3; |
|
|
298 | psiconv_list_free(bytes); |
|
|
299 | bytes = decoded; |
|
|
300 | break; |
|
|
301 | case 2: |
|
|
302 | if ((psiconv_decode_rle12(config,lev+2,off+len,bytes,&decoded))) |
|
|
303 | goto ERROR3; |
|
|
304 | psiconv_list_free(bytes); |
|
|
305 | bytes = decoded; |
|
|
306 | break; |
|
|
307 | case 3: |
|
|
308 | if ((psiconv_decode_rle16(config,lev+2,off+len,bytes,&decoded))) |
293 | goto ERROR5; |
309 | goto ERROR3; |
294 | if (decode_byte(config,lev+3,off+len+datanr,*result,&pixelnr,temp,bits_per_pixel, |
310 | psiconv_list_free(bytes); |
295 | linelen,&linepos,picsize)) { |
311 | bytes = decoded; |
296 | res = -PSICONV_E_PARSE; |
|
|
297 | break; |
312 | break; |
298 | } |
313 | case 4: |
299 | datanr++; |
314 | if ((psiconv_decode_rle24(config,lev+2,off+len,bytes,&decoded))) |
|
|
315 | goto ERROR3; |
|
|
316 | psiconv_list_free(bytes); |
|
|
317 | bytes = decoded; |
|
|
318 | break; |
|
|
319 | } |
|
|
320 | |
|
|
321 | if ((res = psiconv_bytes_to_pixel_data(config,lev+2,off+len,bytes, |
|
|
322 | &pixels,bits_per_pixel, |
|
|
323 | (*result)->xsize,(*result)->ysize))) |
|
|
324 | goto ERROR3; |
|
|
325 | |
|
|
326 | /* Use some heuristics; things may get unexpected around here */ |
|
|
327 | bluebits = redbits = greenbits = 0; |
|
|
328 | palet = psiconv_palet_none; |
|
|
329 | if (color) { |
|
|
330 | if (bits_per_pixel == 4) |
|
|
331 | palet = psiconv_palet_color_4; |
|
|
332 | else if (bits_per_pixel == 8) |
|
|
333 | palet = psiconv_palet_color_8; |
|
|
334 | else { |
|
|
335 | redbits = (bits_per_pixel+2) / 3; |
|
|
336 | greenbits = (bits_per_pixel+2) / 3; |
|
|
337 | bluebits = bits_per_pixel - redbits - greenbits; |
300 | } |
338 | } |
301 | } else { |
|
|
302 | psiconv_progress(config,lev+2,off+len,"First pass: determining line length"); |
|
|
303 | datanr = 0; |
|
|
304 | i = 0; |
|
|
305 | while (datanr < datasize) { |
|
|
306 | marker = psiconv_read_u8(config,buf,lev+3,off+len+datanr,&res); |
|
|
307 | if (res) |
|
|
308 | goto ERROR5; |
|
|
309 | if (marker >= 0x80) { |
|
|
310 | datanr += 0x100 - marker + 1; |
|
|
311 | i += 0x100 - marker; |
|
|
312 | } else { |
|
|
313 | datanr += 2; |
|
|
314 | i += marker + 1; |
|
|
315 | } |
|
|
316 | } |
339 | } |
317 | linelen = i / (*result)->ysize; |
340 | if ((res = psiconv_pixel_data_to_floats(config,lev+2,off+len,pixels, |
318 | datanr=0; |
341 | &floats,bits_per_pixel,color, |
319 | psiconv_debug(config,lev+2,off+len,"Linelen: %04x bytes",linelen); |
342 | redbits,greenbits,bluebits,palet))) |
320 | while((datanr < datasize)) { |
|
|
321 | marker = psiconv_read_u8(config,buf,lev+3,off+len+datanr,&res); |
|
|
322 | if (res) |
|
|
323 | goto ERROR5; |
|
|
324 | psiconv_debug(config,lev+3,off+len+datanr, |
|
|
325 | "Pixelnr %08x, Datanr %08x: Read marker %02x", |
|
|
326 | pixelnr,datanr,marker); |
|
|
327 | datanr ++; |
|
|
328 | if (marker >= 0x80) { |
|
|
329 | /* 0x100 - marker bytes of data follow */ |
|
|
330 | for (i = 0; i < 0x100-marker; i++,datanr++) { |
|
|
331 | if (datanr >= datasize) { |
|
|
332 | psiconv_warn(config,lev+3,off+len+datanr,"Corrupted picture data"); |
|
|
333 | psiconv_debug(config,lev+3,off+len+datanr, |
|
|
334 | "Picsize: %08x, Datasize: %08x, Pixelnr: %08x," |
|
|
335 | "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr, |
|
|
336 | datanr,marker); |
|
|
337 | res = -PSICONV_E_PARSE; |
|
|
338 | break; |
|
|
339 | } |
|
|
340 | temp = psiconv_read_u8(config,buf,lev+2,off+len+datanr,&res); |
|
|
341 | if (res) |
|
|
342 | goto ERROR5; |
|
|
343 | if (decode_byte(config,lev+2,off+len+datanr,*result,&pixelnr,temp, |
|
|
344 | bits_per_pixel,linelen,&linepos,picsize)) { |
|
|
345 | res = -PSICONV_E_PARSE; |
|
|
346 | break; |
|
|
347 | } |
|
|
348 | } |
|
|
349 | } else { |
|
|
350 | if (datanr >= datasize) { |
|
|
351 | psiconv_warn(config,lev+3,off+len+datanr,"Corrupted picture data"); |
|
|
352 | psiconv_debug(config,lev+3,off+len+datanr, |
|
|
353 | "Picsize: %08x, Datasize: %08x, Pixelnr: %08x," |
|
|
354 | "Datanr: %08x, marker: %02x",picsize,datasize,pixelnr, |
|
|
355 | datanr,marker); |
|
|
356 | res = -PSICONV_E_PARSE; |
|
|
357 | } else { |
|
|
358 | temp = psiconv_read_u8(config,buf,lev+3,off+len+datanr,&res); |
|
|
359 | if (res) |
|
|
360 | goto ERROR5; |
|
|
361 | for (i = 0; i <= marker; i++) { |
|
|
362 | if (decode_byte(config,lev+2,off+len+datanr,*result,&pixelnr,temp, |
|
|
363 | bits_per_pixel,linelen,&linepos,picsize)) { |
|
|
364 | res = -PSICONV_E_PARSE; |
|
|
365 | break; |
|
|
366 | } |
|
|
367 | } |
|
|
368 | datanr ++; |
|
|
369 | } |
|
|
370 | } |
|
|
371 | } |
|
|
372 | } |
|
|
373 | |
|
|
374 | if (linepos >= ((*result)->xsize + (8/bits_per_pixel) - 1) / |
|
|
375 | (8/bits_per_pixel)) |
|
|
376 | datanr += (linelen - linepos); |
|
|
377 | |
|
|
378 | if (res || (datanr != datasize) || (pixelnr != picsize)) { |
|
|
379 | psiconv_warn(config,lev+2,off+len,"Corrupted picture data!"); |
|
|
380 | psiconv_debug(config,lev+3,off+len+datanr, |
|
|
381 | "Picsize: %08x, Datasize: %08x, Pixelnr: %08x," |
|
|
382 | "Datanr: %08x",picsize,datasize,pixelnr,datanr); |
|
|
383 | goto ERROR5; |
343 | goto ERROR4; |
384 | } |
344 | |
|
|
345 | (*result)->red = floats.red; |
|
|
346 | (*result)->green = floats.green; |
|
|
347 | (*result)->blue = floats.blue; |
385 | |
348 | |
386 | len += datanr; |
349 | psiconv_list_free(bytes); |
|
|
350 | psiconv_list_free(pixels); |
|
|
351 | |
387 | |
352 | |
388 | if (length) |
353 | if (length) |
389 | *length = len; |
354 | *length = len; |
390 | |
355 | |
391 | psiconv_progress(config,lev+1,off+len-1,"End of paint data section " |
356 | psiconv_progress(config,lev,off+len-1, |
392 | "(total length: %08x)", len); |
357 | "End of Paint Data Section (total length: %08x)", len); |
393 | |
358 | |
394 | return res; |
359 | return 0; |
395 | |
360 | |
396 | ERROR5: |
|
|
397 | free((*result)->blue); |
|
|
398 | ERROR4: |
361 | ERROR4: |
399 | free((*result)->green); |
362 | psiconv_list_free(pixels); |
400 | ERROR3: |
363 | ERROR3: |
401 | free((*result)->red); |
364 | psiconv_list_free(bytes); |
402 | ERROR2: |
365 | ERROR2: |
403 | free (*result); |
366 | free(*result); |
404 | ERROR1: |
367 | ERROR1: |
405 | psiconv_warn(config,lev+1,off,"Reading of Paint Data Section failed"); |
368 | psiconv_error(config,lev+1,off,"Reading of Paint Data Section failed"); |
406 | if (length) |
369 | if (length) |
407 | *length = 0; |
370 | *length = 0; |
408 | if (!res) |
371 | if (!res) |
409 | return -PSICONV_E_NOMEM; |
372 | return -PSICONV_E_NOMEM; |
410 | else |
373 | else |
… | |
… | |
565 | ERROR3: |
528 | ERROR3: |
566 | psiconv_free_paint_data_section((*result)->picture); |
529 | psiconv_free_paint_data_section((*result)->picture); |
567 | ERROR2: |
530 | ERROR2: |
568 | free (*result); |
531 | free (*result); |
569 | ERROR1: |
532 | ERROR1: |
570 | psiconv_warn(config,lev+1,off,"Reading of Sketch Section failed"); |
533 | psiconv_error(config,lev+1,off,"Reading of Sketch Section failed"); |
571 | if (length) |
534 | if (length) |
572 | *length = 0; |
535 | *length = 0; |
573 | if (!res) |
536 | if (!res) |
574 | return -PSICONV_E_NOMEM; |
537 | return -PSICONV_E_NOMEM; |
575 | else |
538 | else |
… | |
… | |
668 | return 0; |
631 | return 0; |
669 | |
632 | |
670 | ERROR2: |
633 | ERROR2: |
671 | free (*result); |
634 | free (*result); |
672 | ERROR1: |
635 | ERROR1: |
673 | psiconv_warn(config,lev+1,off,"Reading of Font failed"); |
636 | psiconv_error(config,lev+1,off,"Reading of Font failed"); |
674 | if (length) |
637 | if (length) |
675 | *length = 0; |
638 | *length = 0; |
676 | if (!res) |
639 | if (!res) |
677 | return -PSICONV_E_NOMEM; |
640 | return -PSICONV_E_NOMEM; |
678 | else |
641 | else |
… | |
… | |
690 | psiconv_progress(config,lev+1,off,"Going to decode the RLE8 encoding"); |
653 | psiconv_progress(config,lev+1,off,"Going to decode the RLE8 encoding"); |
691 | if (!(*decoded = psiconv_list_new(sizeof(psiconv_u8)))) |
654 | if (!(*decoded = psiconv_list_new(sizeof(psiconv_u8)))) |
692 | goto ERROR1; |
655 | goto ERROR1; |
693 | |
656 | |
694 | for (i = 0; i < psiconv_list_length(encoded);) { |
657 | for (i = 0; i < psiconv_list_length(encoded);) { |
|
|
658 | #ifdef LOUD |
|
|
659 | psiconv_progress(config,lev+2,off,"Going to read marker byte at %04x",i); |
|
|
660 | #endif |
|
|
661 | if (!(marker = psiconv_list_get(encoded,i))) |
|
|
662 | goto ERROR2; |
|
|
663 | #ifdef LOUD |
|
|
664 | psiconv_debug(config,lev+2,off,"Marker byte: %02x",*marker); |
|
|
665 | #endif |
|
|
666 | if (*marker < 0x80) { |
|
|
667 | #ifdef LOUD |
|
|
668 | psiconv_debug(config,lev+2,off,"Marker: repeat value byte %02x times", |
|
|
669 | *marker+1); */ |
|
|
670 | psiconv_progress(config,lev+2,off,"Going to read value byte at %04x",i+1); |
|
|
671 | #endif |
|
|
672 | if (!(value = psiconv_list_get(encoded,i+1))) |
|
|
673 | goto ERROR2; |
|
|
674 | #ifdef LOUD |
|
|
675 | psiconv_debug(config,lev+2,off,"Value byte: %02x",*value); |
|
|
676 | psiconv_progress(config,lev+2,off,"Adding %02x pixels %02x", |
|
|
677 | *marker+1,*value); |
|
|
678 | #endif |
|
|
679 | for (j = 0; j < *marker + 1; j++) |
|
|
680 | if ((res = psiconv_list_add(*decoded,value))) |
|
|
681 | goto ERROR2; |
|
|
682 | i += 2; |
|
|
683 | } else { |
|
|
684 | #ifdef LOUD |
|
|
685 | psiconv_debug(config,lev+2,off,"Marker: %02x value bytes follow", |
|
|
686 | 0x100 - *marker); |
|
|
687 | #endif |
|
|
688 | for (j = 0; j < (0x100 - *marker); j++) { |
|
|
689 | #ifdef LOUD |
|
|
690 | psiconv_progress(config,lev+2,off,"Going to read value byte at %04x", |
|
|
691 | i+j+1); |
|
|
692 | #endif |
|
|
693 | if (!(value = psiconv_list_get(encoded,i+j+1))) |
|
|
694 | goto ERROR2; |
|
|
695 | #ifdef LOUD |
|
|
696 | psiconv_debug(config,lev+2,off,"Value: %02x",*value); |
|
|
697 | #endif |
|
|
698 | if ((res = psiconv_list_add(*decoded,value))) |
|
|
699 | goto ERROR2; |
|
|
700 | } |
|
|
701 | i += (0x100 - *marker) + 1; |
|
|
702 | } |
|
|
703 | } |
|
|
704 | psiconv_progress(config,lev,off, |
|
|
705 | "End of RLE8 decoding process"); |
|
|
706 | return 0; |
|
|
707 | |
|
|
708 | ERROR2: |
|
|
709 | psiconv_list_free(*decoded); |
|
|
710 | ERROR1: |
|
|
711 | psiconv_error(config,lev+1,off,"Decoding of RLE8 failed"); |
|
|
712 | if (!res) |
|
|
713 | return -PSICONV_E_NOMEM; |
|
|
714 | else |
|
|
715 | return res; |
|
|
716 | } |
|
|
717 | |
|
|
718 | int psiconv_decode_rle12 (const psiconv_config config, int lev, psiconv_u32 off, |
|
|
719 | const psiconv_pixel_bytes encoded, |
|
|
720 | psiconv_pixel_bytes *decoded) |
|
|
721 | { |
|
|
722 | int res=0; |
|
|
723 | psiconv_u8 *value0,*value1; |
|
|
724 | psiconv_u32 value,repeat; |
|
|
725 | int i,j; |
|
|
726 | |
|
|
727 | psiconv_progress(config,lev+1,off,"Going to decode the RLE12 encoding"); |
|
|
728 | if (!(*decoded = psiconv_list_new(sizeof(psiconv_u8)))) |
|
|
729 | goto ERROR1; |
|
|
730 | |
|
|
731 | for (i = 0; i < psiconv_list_length(encoded);) { |
|
|
732 | psiconv_progress(config,lev+2,off,"Going to read data word at %04x",i); |
|
|
733 | if (!(value0 = psiconv_list_get(encoded,i))) |
|
|
734 | goto ERROR2; |
|
|
735 | if (!(value1 = psiconv_list_get(encoded,i+1))) |
|
|
736 | goto ERROR2; |
|
|
737 | psiconv_debug(config,lev+2,off,"Data Word: %04x",*value0 + (*value1 << 8)); |
|
|
738 | value = *value0 + ((*value1 & 0x0f) << 8); |
|
|
739 | repeat = (*value1 >> 4) + 1; |
|
|
740 | psiconv_progress(config,lev+2,off,"Adding %02x pixels %03x", |
|
|
741 | repeat,value); |
|
|
742 | for (j = 0; j < repeat; j ++) |
|
|
743 | if ((res = psiconv_list_add(*decoded,&value))) |
|
|
744 | goto ERROR2; |
|
|
745 | i += 2; |
|
|
746 | } |
|
|
747 | psiconv_progress(config,lev,off, |
|
|
748 | "End of RLE12 decoding process"); |
|
|
749 | return 0; |
|
|
750 | |
|
|
751 | ERROR2: |
|
|
752 | psiconv_list_free(*decoded); |
|
|
753 | ERROR1: |
|
|
754 | psiconv_error(config,lev+1,off,"Decoding of RLE12 failed"); |
|
|
755 | if (!res) |
|
|
756 | return -PSICONV_E_NOMEM; |
|
|
757 | else |
|
|
758 | return res; |
|
|
759 | } |
|
|
760 | |
|
|
761 | int psiconv_decode_rle16 (const psiconv_config config, int lev, psiconv_u32 off, |
|
|
762 | const psiconv_pixel_bytes encoded, |
|
|
763 | psiconv_pixel_bytes *decoded) |
|
|
764 | { |
|
|
765 | int res=0; |
|
|
766 | psiconv_u8 *marker,*value0,*value1; |
|
|
767 | psiconv_u32 value; |
|
|
768 | int i,j; |
|
|
769 | |
|
|
770 | psiconv_progress(config,lev+1,off,"Going to decode the RLE16 encoding"); |
|
|
771 | if (!(*decoded = psiconv_list_new(sizeof(psiconv_u8)))) |
|
|
772 | goto ERROR1; |
|
|
773 | |
|
|
774 | for (i = 0; i < psiconv_list_length(encoded);) { |
695 | psiconv_progress(config,lev+2,off,"Going to read marker byte at %04x",i); |
775 | psiconv_progress(config,lev+2,off,"Going to read marker byte at %04x",i); |
696 | if (!(marker = psiconv_list_get(encoded,i))) |
776 | if (!(marker = psiconv_list_get(encoded,i))) |
697 | goto ERROR2; |
777 | goto ERROR2; |
698 | psiconv_debug(config,lev+2,off,"Marker byte: %02x",*marker); |
778 | psiconv_debug(config,lev+2,off,"Marker byte: %02x",*marker); |
699 | if (*marker < 0x80) { |
779 | if (*marker < 0x80) { |
700 | psiconv_debug(config,lev+2,off,"Marker: repeat value byte %02x times", |
780 | psiconv_debug(config,lev+2,off,"Marker: repeat value word %02x times", |
701 | *marker+1); |
781 | *marker+1); |
702 | psiconv_progress(config,lev+2,off,"Going to read value byte at %04x",i+1); |
782 | psiconv_progress(config,lev+2,off,"Going to read value word at %04x",i+1); |
703 | if (!(value = psiconv_list_get(encoded,i+1))) |
783 | if (!(value0 = psiconv_list_get(encoded,i+1))) |
704 | goto ERROR2; |
784 | goto ERROR2; |
|
|
785 | if (!(value1 = psiconv_list_get(encoded,i+2))) |
|
|
786 | goto ERROR2; |
|
|
787 | value = *value0 + (*value1 << 8); |
705 | psiconv_debug(config,lev+2,off,"Value byte: %02x",*value); |
788 | psiconv_debug(config,lev+2,off,"Value word: %02x",value); |
706 | psiconv_progress(config,lev+2,off,"Adding %02x bytes %02x", |
789 | psiconv_progress(config,lev+2,off,"Adding %02x pixels %04x", |
707 | *marker+1,*value); |
790 | *marker+1,value); |
708 | for (j = 0; j < *marker + 1; j++) |
791 | for (j = 0; j < *marker + 1; j++) |
709 | if ((res = psiconv_list_add(*decoded,value))) |
792 | if ((res = psiconv_list_add(*decoded,&value))) |
710 | goto ERROR2; |
793 | goto ERROR2; |
711 | i += 2; |
794 | i += 3; |
712 | } else { |
795 | } else { |
713 | psiconv_debug(config,lev+2,off,"Marker: %02x value bytes follow", |
796 | psiconv_debug(config,lev+2,off,"Marker: %02x value words follow", |
714 | 0x100 - *marker); |
797 | 0x100 - *marker); |
715 | for (j = 0; j < (0x100 - *marker); j++) { |
798 | for (j = 0; j < (0x100 - *marker); j++) { |
716 | psiconv_progress(config,lev+2,off,"Going to read value byte at %04x", |
799 | psiconv_progress(config,lev+2,off,"Going to read value word at %04x", |
717 | i+j+1); |
800 | i+j*2+1); |
718 | if (!(value = psiconv_list_get(encoded,i+j+1))) |
801 | if (!(value0 = psiconv_list_get(encoded,i+j*2+1))) |
719 | goto ERROR2; |
802 | goto ERROR2; |
|
|
803 | if (!(value1 = psiconv_list_get(encoded,i+j*2+2))) |
|
|
804 | goto ERROR2; |
|
|
805 | value = *value0 + (*value1 << 8); |
720 | psiconv_debug(config,lev+2,off,"Value: %02x",*value); |
806 | psiconv_debug(config,lev+2,off,"Value: %04x",value); |
721 | if ((res = psiconv_list_add(*decoded,value))) |
807 | if ((res = psiconv_list_add(*decoded,&value))) |
722 | goto ERROR2; |
808 | goto ERROR2; |
723 | } |
809 | } |
724 | i += (0x100 - *marker) + 1; |
810 | i += (0x100 - *marker)*2 + 1; |
725 | } |
811 | } |
726 | } |
812 | } |
727 | psiconv_progress(config,lev,off, |
813 | psiconv_progress(config,lev,off, |
728 | "End of RLE8 decoding process"); |
814 | "End of RLE16 decoding process"); |
729 | return 0; |
815 | return 0; |
730 | |
816 | |
731 | ERROR2: |
817 | ERROR2: |
732 | psiconv_list_free(*decoded); |
818 | psiconv_list_free(*decoded); |
733 | ERROR1: |
819 | ERROR1: |
734 | psiconv_warn(config,lev+1,off,"Decoding of RLE8 failed"); |
820 | psiconv_error(config,lev+1,off,"Decoding of RLE16 failed"); |
|
|
821 | if (!res) |
|
|
822 | return -PSICONV_E_NOMEM; |
|
|
823 | else |
|
|
824 | return res; |
|
|
825 | } |
|
|
826 | |
|
|
827 | int psiconv_decode_rle24 (const psiconv_config config, int lev, psiconv_u32 off, |
|
|
828 | const psiconv_pixel_bytes encoded, |
|
|
829 | psiconv_pixel_bytes *decoded) |
|
|
830 | { |
|
|
831 | int res=0; |
|
|
832 | psiconv_u8 *marker,*value0,*value1,*value2; |
|
|
833 | psiconv_u32 value; |
|
|
834 | int i,j; |
|
|
835 | |
|
|
836 | psiconv_progress(config,lev+1,off,"Going to decode the RLE24 encoding"); |
|
|
837 | if (!(*decoded = psiconv_list_new(sizeof(psiconv_u8)))) |
|
|
838 | goto ERROR1; |
|
|
839 | |
|
|
840 | for (i = 0; i < psiconv_list_length(encoded);) { |
|
|
841 | psiconv_progress(config,lev+2,off,"Going to read marker byte at %04x",i); |
|
|
842 | if (!(marker = psiconv_list_get(encoded,i))) |
|
|
843 | goto ERROR2; |
|
|
844 | psiconv_debug(config,lev+2,off,"Marker byte: %02x",*marker); |
|
|
845 | if (*marker < 0x80) { |
|
|
846 | psiconv_debug(config,lev+2,off,"Marker: repeat value byte triplet %02x times", |
|
|
847 | *marker+1); |
|
|
848 | psiconv_progress(config,lev+2,off,"Going to read value byte triplet at %04x",i+1); |
|
|
849 | if (!(value0 = psiconv_list_get(encoded,i+1))) |
|
|
850 | goto ERROR2; |
|
|
851 | if (!(value1 = psiconv_list_get(encoded,i+2))) |
|
|
852 | goto ERROR2; |
|
|
853 | if (!(value2 = psiconv_list_get(encoded,i+3))) |
|
|
854 | goto ERROR2; |
|
|
855 | value = *value0 + (*value1 << 8) + (*value2 << 16); |
|
|
856 | psiconv_debug(config,lev+2,off,"Value byte triplet: %06x",value); |
|
|
857 | psiconv_progress(config,lev+2,off,"Adding %02x pixels %06x", |
|
|
858 | *marker+1,value); |
|
|
859 | for (j = 0; j < *marker + 1; j++) |
|
|
860 | if ((res = psiconv_list_add(*decoded,&value))) |
|
|
861 | goto ERROR2; |
|
|
862 | i += 4; |
|
|
863 | } else { |
|
|
864 | psiconv_debug(config,lev+2,off,"Marker: %02x value byte triplets follow", |
|
|
865 | 0x100 - *marker); |
|
|
866 | for (j = 0; j < (0x100 - *marker); j++) { |
|
|
867 | psiconv_progress(config,lev+2,off,"Going to read value byte triplets at %04x", |
|
|
868 | i+j*3+1); |
|
|
869 | if (!(value0 = psiconv_list_get(encoded,i+j*3+1))) |
|
|
870 | goto ERROR2; |
|
|
871 | if (!(value1 = psiconv_list_get(encoded,i+j*3+2))) |
|
|
872 | goto ERROR2; |
|
|
873 | if (!(value2 = psiconv_list_get(encoded,i+j*3+3))) |
|
|
874 | goto ERROR2; |
|
|
875 | value = *value0 + (*value1 << 8) + (*value2 << 16); |
|
|
876 | psiconv_debug(config,lev+2,off,"Value: %06x",value); |
|
|
877 | if ((res = psiconv_list_add(*decoded,&value))) |
|
|
878 | goto ERROR2; |
|
|
879 | } |
|
|
880 | i += (0x100 - *marker)*3 + 1; |
|
|
881 | } |
|
|
882 | } |
|
|
883 | psiconv_progress(config,lev,off, |
|
|
884 | "End of RLE24 decoding process"); |
|
|
885 | return 0; |
|
|
886 | |
|
|
887 | ERROR2: |
|
|
888 | psiconv_list_free(*decoded); |
|
|
889 | ERROR1: |
|
|
890 | psiconv_error(config,lev+1,off,"Decoding of RLE24 failed"); |
735 | if (!res) |
891 | if (!res) |
736 | return -PSICONV_E_NOMEM; |
892 | return -PSICONV_E_NOMEM; |
737 | else |
893 | else |
738 | return res; |
894 | return res; |
739 | } |
895 | } |
… | |
… | |
760 | while (nr % 4) |
916 | while (nr % 4) |
761 | nr ++; |
917 | nr ++; |
762 | input = 0; |
918 | input = 0; |
763 | ibits = 0; |
919 | ibits = 0; |
764 | for (x= 0; x < xsize; x++) { |
920 | for (x= 0; x < xsize; x++) { |
|
|
921 | #ifdef LOUD |
765 | psiconv_progress(config,lev+2,off, |
922 | psiconv_progress(config,lev+2,off, |
766 | "Processing pixel at (x,y) = (%04x,%04x)",x,y); |
923 | "Processing pixel at (x,y) = (%04x,%04x)",x,y); |
|
|
924 | #endif |
767 | output = 0; |
925 | output = 0; |
768 | obits = 0; |
926 | obits = 0; |
769 | while (obits < colordepth) { |
927 | while (obits < colordepth) { |
770 | if (ibits == 0) { |
928 | if (ibits == 0) { |
|
|
929 | #ifdef LOUD |
771 | psiconv_progress(config,lev+3,off, |
930 | psiconv_progress(config,lev+3,off, |
772 | "Going to read byte %08x",nr); |
931 | "Going to read byte %08x",nr); |
|
|
932 | #endif |
773 | if (!(ientry = psiconv_list_get(bytes,nr))) |
933 | if (!(ientry = psiconv_list_get(bytes,nr))) |
774 | goto ERROR2; |
934 | goto ERROR2; |
|
|
935 | #ifdef LOUD |
775 | psiconv_debug(config,lev+3,off,"Byte value: %02x",*ientry); |
936 | psiconv_debug(config,lev+3,off,"Byte value: %02x",*ientry); |
|
|
937 | #endif |
776 | input = *ientry; |
938 | input = *ientry; |
777 | ibits = 8; |
939 | ibits = 8; |
778 | nr ++; |
940 | nr ++; |
779 | } |
941 | } |
780 | bits = ibits + obits > colordepth?colordepth-obits:ibits; |
942 | bits = ibits + obits > colordepth?colordepth-obits:ibits; |
… | |
… | |
782 | output |= input & ((1 << bits) - 1); |
944 | output |= input & ((1 << bits) - 1); |
783 | input = input >> bits; |
945 | input = input >> bits; |
784 | ibits -= bits; |
946 | ibits -= bits; |
785 | obits += bits; |
947 | obits += bits; |
786 | } |
948 | } |
|
|
949 | #ifdef LOUD |
787 | psiconv_debug(config,lev+2,off,"Pixel value: %08x",output); |
950 | psiconv_debug(config,lev+2,off,"Pixel value: %08x",output); |
|
|
951 | #endif |
788 | if ((res = psiconv_list_add(*pixels,&output))) |
952 | if ((res = psiconv_list_add(*pixels,&output))) |
789 | goto ERROR2; |
953 | goto ERROR2; |
790 | } |
954 | } |
791 | } |
955 | } |
792 | |
956 | |
… | |
… | |
796 | |
960 | |
797 | |
961 | |
798 | ERROR2: |
962 | ERROR2: |
799 | psiconv_list_free(*pixels); |
963 | psiconv_list_free(*pixels); |
800 | ERROR1: |
964 | ERROR1: |
801 | psiconv_warn(config,lev+1,off,"Converting bytes to pixels failed"); |
965 | psiconv_error(config,lev+1,off,"Converting bytes to pixels failed"); |
802 | if (!res) |
966 | if (!res) |
803 | return -PSICONV_E_NOMEM; |
967 | return -PSICONV_E_NOMEM; |
804 | else |
968 | else |
805 | return res; |
969 | return res; |
806 | } |
970 | } |
… | |
… | |
830 | (*floats).length = psiconv_list_length(pixels); |
994 | (*floats).length = psiconv_list_length(pixels); |
831 | |
995 | |
832 | for (i = 0; i < psiconv_list_length(pixels); i++) { |
996 | for (i = 0; i < psiconv_list_length(pixels); i++) { |
833 | if (!(pixel = psiconv_list_get(pixels,i))) |
997 | if (!(pixel = psiconv_list_get(pixels,i))) |
834 | goto ERROR4; |
998 | goto ERROR4; |
|
|
999 | #ifdef LOUD |
835 | psiconv_progress(config,lev+2,off, "Handling pixel %04x (%04x)",i,*pixel); |
1000 | psiconv_progress(config,lev+2,off, "Handling pixel %04x (%04x)",i,*pixel); |
|
|
1001 | #endif |
836 | if (!palet.length) { |
1002 | if (!palet.length) { |
837 | if (color) { |
1003 | if (color) { |
838 | (*floats).blue[i] = (*pixel & ((1 << bluebits) - 1)) / |
1004 | (*floats).blue[i] = ((float) (*pixel & ((1 << bluebits) - 1))) / |
839 | (1 << bluebits); |
1005 | ((1 << bluebits) - 1); |
840 | (*floats).green[i] = ((*pixel >> bluebits) & ((1 << greenbits) - 1)) / |
1006 | (*floats).green[i] = ((float) ((*pixel >> bluebits) & |
841 | (1 << greenbits); |
1007 | ((1 << greenbits) - 1))) / ((1 << greenbits) - 1); |
842 | (*floats).red[i] = ((*pixel >> (bluebits+greenbits)) & |
1008 | (*floats).red[i] = ((float) ((*pixel >> (bluebits+greenbits)) & |
843 | ((1 << redbits) - 1)) / (1 << redbits); |
1009 | ((1 << redbits) - 1))) / ((1 << redbits) - 1); |
844 | } else { |
1010 | } else { |
845 | (*floats).red[i] = (*floats).green[i] = |
1011 | (*floats).red[i] = (*floats).green[i] = |
846 | (*floats).blue[i] = *pixel / (1 << colordepth); |
1012 | (*floats).blue[i] = ((float) *pixel) / |
|
|
1013 | ((1 << colordepth) - 1); |
847 | } |
1014 | } |
848 | } else { |
1015 | } else { |
849 | if (*pixel >= palet.length) { |
1016 | if (*pixel >= palet.length) { |
850 | psiconv_warn(config,lev+2,off, |
1017 | psiconv_warn(config,lev+2,off, |
851 | "Invalid palet color found (using color 0x00)"); |
1018 | "Invalid palet color found (using color 0x00)"); |
… | |
… | |
856 | (*floats).red[i] = palet.red[*pixel]; |
1023 | (*floats).red[i] = palet.red[*pixel]; |
857 | (*floats).green[i] = palet.green[*pixel]; |
1024 | (*floats).green[i] = palet.green[*pixel]; |
858 | (*floats).blue[i] = palet.blue[*pixel]; |
1025 | (*floats).blue[i] = palet.blue[*pixel]; |
859 | } |
1026 | } |
860 | } |
1027 | } |
|
|
1028 | #ifdef LOUD |
861 | psiconv_debug(config,lev+2,off, "Pixel: Red (%f), green (%f), blue (%f)", |
1029 | psiconv_debug(config,lev+2,off, "Pixel: Red (%f), green (%f), blue (%f)", |
862 | (*floats).red[i],(*floats).green[i],(*floats).blue[i]); |
1030 | (*floats).red[i],(*floats).green[i],(*floats).blue[i]); |
|
|
1031 | #endif |
863 | } |
1032 | } |
864 | psiconv_progress(config,lev+1,off,"Finished converting pixels to floats"); |
1033 | psiconv_progress(config,lev+1,off,"Finished converting pixels to floats"); |
865 | return 0; |
1034 | return 0; |
866 | |
1035 | |
867 | ERROR4: |
1036 | ERROR4: |
… | |
… | |
869 | ERROR3: |
1038 | ERROR3: |
870 | free((*floats).green); |
1039 | free((*floats).green); |
871 | ERROR2: |
1040 | ERROR2: |
872 | free((*floats).red); |
1041 | free((*floats).red); |
873 | ERROR1: |
1042 | ERROR1: |
874 | psiconv_warn(config,lev+1,off,"Converting pixels to floats failed"); |
1043 | psiconv_error(config,lev+1,off,"Converting pixels to floats failed"); |
875 | if (!res) |
1044 | if (!res) |
876 | return -PSICONV_E_NOMEM; |
1045 | return -PSICONV_E_NOMEM; |
877 | else |
1046 | else |
878 | return res; |
1047 | return res; |
879 | } |
1048 | } |