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