}
lastcol32 = col32;
}
- if(palette_overflow)
+ if(palette_overflow) {
+ free(pal);
return width*height;
+ }
if(palette) {
int i = 0;
for(t=0;t<256;t++) {
static void tag_init_source(struct jpeg_decompress_struct *cinfo)
{
TAG *tag = (TAG *) cinfo->client_data;
- swf_SetTagPos(tag, 2);
+ if (tag->id == ST_DEFINEBITSJPEG3) {
+ swf_SetTagPos(tag, 6);
+ } else {
+ swf_SetTagPos(tag, 2);
+ }
cinfo->src->bytes_in_buffer = 0;
}
static boolean tag_fill_input_buffer(struct jpeg_decompress_struct *cinfo)
struct jpeg_source_mgr mgr;
RGBA *dest;
int y;
+ int offset = 0;
+ int oldtaglen = 0;
*width = 0;
*height = 0;
if (tag->id == ST_DEFINEBITSJPEG) {
- fprintf(stderr,
- "rfxswf: extracting from definebitsjpeg not yet supported");
+ fprintf(stderr, "rfxswf: extracting from definebitsjpeg not yet supported\n");
return 0;
}
if (tag->id == ST_DEFINEBITSJPEG3) {
- fprintf(stderr,
- "rfxswf: extracting from definebitsjpeg3 not yet supported");
+#ifdef HAVE_ZLIB
+ offset = swf_GetU32(tag);
+ oldtaglen = tag->len;
+ tag->len = offset+6;
+#else
+ fprintf(stderr, "rfxswf: extracting from definebitsjpeg3 not possible: no zlib\n");
return 0;
+#endif
}
cinfo.err = jpeg_std_error(&jerr);
jpeg_finish_decompress(&cinfo);
jpeg_destroy_decompress(&cinfo);
+
+#ifdef HAVE_ZLIB
+ if(offset) {
+ U32 datalen = cinfo.output_width*cinfo.output_height;
+ U8* alphadata = (U8*)rfx_alloc(datalen);
+ int error;
+ tag->len = oldtaglen;
+ swf_SetTagPos(tag, 6+offset);
+ error = uncompress(alphadata, &datalen, &tag->data[tag->pos], tag->len - tag->pos);
+ if (error != Z_OK) {
+ fprintf(stderr, "rfxswf: Zlib error %d while extracting definejpeg3\n", error);
+ return 0;
+ }
+ for(y=0;y<cinfo.output_height;y++) {
+ RGBA*line = &dest[y*cinfo.output_width];
+ U8*aline = &alphadata[y*cinfo.output_width];
+ int x;
+ for(x=0;x<cinfo.output_width;x++) {
+ line[x].a = aline[x];
+ }
+ }
+ free(alphadata);
+ }
+#endif
return dest;
}
dest[pos2].r = data[pos + 1];
dest[pos2].g = data[pos + 2];
dest[pos2].b = data[pos + 3];*/
- dest[pos2].r = ((int)data[pos + 1]*255)/(int)data[pos+0];
- dest[pos2].g = ((int)data[pos + 2]*255)/(int)data[pos+0];
- dest[pos2].b = ((int)data[pos + 3]*255)/(int)data[pos+0];
+ int alpha = data[pos+0];
+ if(alpha) {
+ dest[pos2].r = ((int)data[pos + 1]*255)/alpha;
+ dest[pos2].g = ((int)data[pos + 2]*255)/alpha;
+ dest[pos2].b = ((int)data[pos + 3]*255)/alpha;
+ } else {
+ dest[pos2].r = data[pos + 1];
+ dest[pos2].g = data[pos + 2];
+ dest[pos2].b = data[pos + 3];
+ }
dest[pos2].a = data[pos + 0]; //alpha
pos2++;
pos += 4;
RGBA *swf_ExtractImage(TAG * tag, int *dwidth, int *dheight)
{
RGBA *img;
+
+ swf_SetTagPos(tag, 2); // id is 2 bytes
+
if (tag->id == ST_DEFINEBITSJPEG ||
tag->id == ST_DEFINEBITSJPEG2 || tag->id == ST_DEFINEBITSJPEG3) {
#ifdef HAVE_JPEGLIB