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