X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fmodules%2Fswfbits.c;h=c2dcf254e14f7be3e25f1c8ac746b538d206076c;hp=57350da5455773dc333d58b6d60d1ff84819f4d4;hb=c3cacee02d5a26355bccc9865dc213e47eeb5370;hpb=62464bfc865c26edcdaec364ec9743018cadfd5a

diff --git a/lib/modules/swfbits.c b/lib/modules/swfbits.c
index 57350da..c2dcf25 100644
--- a/lib/modules/swfbits.c
+++ b/lib/modules/swfbits.c
@@ -21,6 +21,30 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <memory.h>
+#include "../../config.h"
+#ifdef HAVE_ZLIB
+#include <zconf.h>
+#include <zlib.h>
+#endif
+#include <fcntl.h>
+#include <ctype.h>
+
+#ifdef HAVE_JPEGLIB
+#define HAVE_BOOLEAN
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include <jpeglib.h>
+#ifdef __cplusplus
+}
+#endif
+#endif // HAVE_JPEGLIB
+
+#include "../rfxswf.h"
+
 #define OUTBUFFER_SIZE 0x8000
 
 int swf_ImageHasAlpha(RGBA*img, int width, int height)
@@ -36,37 +60,116 @@ int swf_ImageHasAlpha(RGBA*img, int width, int height)
     }
     return hasalpha;
 }
-   
-int swf_ImageGetNumberOfPaletteEntries(RGBA*img, int width, int height, RGBA*palette)
+
+/*int swf_ImageGetNumberOfPaletteEntries(RGBA*img, int width, int height, RGBA*palette)
 {
     int len = width*height;
     int t;
     int palsize = 0;
-    RGBA pal[256];
+    RGBA pal[512];
+    U32*pal32=(U32*)pal;
     int palette_overflow = 0;
-    for(t=0;t<len;t++) {
+    U32 lastcol32 = 0;
+
+    if(sizeof(RGBA)!=sizeof(U32))
+	fprintf(stderr, "rfxswf: sizeof(RGBA)!=sizeof(U32))");
+
+    lastcol32 = pal32[palsize++] = *(U32*)&img[0];
+
+    for(t=1;t<len;t++) {
 	RGBA col = img[t];
 	U32 col32 = *(U32*)&img[t];
-	int i=0;
+	int i;
+	if(col32==lastcol32)
+	    continue;
 	for(i=0;i<palsize;i++) {
-	    if(col32 == *(U32*)&pal[i])
+	    if(col32 == pal32[i])
 		break;
 	}
 	if(i==palsize) {
-	    if(palsize==256) {
+	    if(palsize==512) {
 		palette_overflow = 1;
 		break;
 	    }
-	    pal[palsize++] = col;
+	    pal32[palsize++] = col32;
 	}
+	lastcol32 = col32;
     }
     if(palette_overflow)
 	return width*height;
     if(palette)
 	memcpy(palette, pal, palsize*sizeof(RGBA));
     return palsize;
+}*/
+
+int swf_ImageGetNumberOfPaletteEntries(RGBA*img, int width, int height, RGBA*palette)
+{
+    int len = width*height;
+    int t;
+    int palsize = 0;
+    U32* pal;
+    int size[256];
+    int palette_overflow = 0;
+    U32 lastcol32 = 0;
+
+    pal = (U32*)malloc(65536*sizeof(U32));
+
+    memset(size, 0, sizeof(size));
+
+    if(sizeof(RGBA)!=sizeof(U32))
+	fprintf(stderr, "rfxswf: sizeof(RGBA)!=sizeof(U32))");
+
+    lastcol32 = (*(U32*)&img[0])^0xffffffff; // don't match
+
+    for(t=0;t<len;t++) {
+	RGBA col = img[t];
+	U32 col32 = *(U32*)&img[t];
+	int i;
+	int csize;
+	U32 hash;
+	U32* cpal;
+	if(col32 == lastcol32)
+	    continue;
+	hash = (col32 >> 17) ^ col32;
+	hash ^= ((hash>>8) + 1) ^ hash;
+	hash &= 255;
+
+	csize = size[hash];
+	cpal = &pal[hash*256];
+	for(i=0;i<csize;i++) {
+	    if(col32 == cpal[i])
+		break;
+	}
+	if(i==csize) {
+	    if(palsize==256) {
+		palette_overflow = 1;
+		break;
+	    }
+	    cpal[size[hash]++] = col32;
+	    palsize++;
+	}
+	lastcol32 = col32;
+    }
+    if(palette_overflow) {
+	free(pal);
+	return width*height;
+    }
+    if(palette) {
+	int i = 0;
+	for(t=0;t<256;t++) {
+	    int s;
+	    int csize = size[t];
+	    U32* cpal = &pal[t*256];
+	    for(s=0;s<csize;s++)
+		palette[i++] = *(RGBA*)(&cpal[s]);
+	}
+    }
+    free(pal);
+    return palsize;
 }
 
+
+
 #ifdef HAVE_JPEGLIB
 
 typedef struct _JPEGDESTMGR {
@@ -167,18 +270,19 @@ int swf_SetJPEGBitsFinish(JPEGBITS * jpegbits)
     if (!jpeg)
 	return -1;
     jpeg_finish_compress(&jpeg->cinfo);
+    jpeg_destroy_compress(&jpeg->cinfo);
     rfx_free(jpeg);
     return 0;
 }
 
-void swf_SetJPEGBits2(TAG * tag, U16 width, U16 height, RGBA * bitmap,
-		      int quality)
+#if defined(HAVE_JPEGLIB)
+void swf_SetJPEGBits2(TAG * tag, U16 width, U16 height, RGBA * bitmap, int quality)
 {
     JPEGBITS *jpeg;
     int y;
     jpeg = swf_SetJPEGBitsStart(tag, width, height, quality);
+	U8 *scanline = (U8*)rfx_alloc(3 * width);
     for (y = 0; y < height; y++) {
-	U8 scanline[3 * width];
 	int x, p = 0;
 	for (x = 0; x < width; x++) {
 	    scanline[p++] = bitmap[width * y + x].r;
@@ -187,10 +291,18 @@ void swf_SetJPEGBits2(TAG * tag, U16 width, U16 height, RGBA * bitmap,
 	}
 	swf_SetJPEGBitsLine(jpeg, scanline);
     }
+    rfx_free(scanline);
     swf_SetJPEGBitsFinish(jpeg);
 }
+#else
+void swf_SetJPEGBits2(TAG * tag, U16 width, U16 height, RGBA * bitmap, int quality)
+{
+    fprintf(stderr, "Error: swftools compiled without jpeglib\n");
+    return -1;
+}
+#endif
 
-void swf_GetJPEGSize(char *fname, int *width, int *height)
+void swf_GetJPEGSize(const char *fname, int *width, int *height)
 {
     struct jpeg_decompress_struct cinfo;
     struct jpeg_error_mgr jerr;
@@ -211,7 +323,7 @@ void swf_GetJPEGSize(char *fname, int *width, int *height)
     fclose(fi);
 }
 
-int swf_SetJPEGBits(TAG * t, char *fname, int quality)
+int swf_SetJPEGBits(TAG * t, const char *fname, int quality)
 {
     struct jpeg_decompress_struct cinfo;
     struct jpeg_error_mgr jerr;
@@ -290,6 +402,7 @@ int swf_SetJPEGBits(TAG * t, char *fname, int quality)
 	}
     }
 
+    rfx_free(scanline);
     swf_SetJPEGBitsFinish(out);
     jpeg_finish_decompress(&cinfo);
     fclose(f);
@@ -297,17 +410,135 @@ int swf_SetJPEGBits(TAG * t, char *fname, int quality)
     return 0;
 }
 
+typedef struct _JPEGFILEMGR {
+    struct jpeg_destination_mgr mgr;
+    JOCTET *buffer;
+    struct jpeg_compress_struct* cinfo;
+    struct jpeg_error_mgr* jerr;
+    FILE*fi;
+} JPEGFILEMGR;
+
+static void file_init_destination(j_compress_ptr cinfo) 
+{ 
+    JPEGFILEMGR*fmgr = (JPEGFILEMGR*)(cinfo->dest);
+    struct jpeg_destination_mgr*dmgr = &fmgr->mgr;
+
+    fmgr->buffer = (JOCTET*)rfx_alloc(OUTBUFFER_SIZE);
+    if(!fmgr->buffer) {
+	perror("malloc");
+	fprintf(stderr, "Out of memory!\n");
+	exit(1);
+    }
+
+    dmgr->next_output_byte = fmgr->buffer;
+    dmgr->free_in_buffer = OUTBUFFER_SIZE;
+}
+
+static boolean file_empty_output_buffer(j_compress_ptr cinfo)
+{ 
+    JPEGFILEMGR*fmgr = (JPEGFILEMGR*)(cinfo->dest);
+    struct jpeg_destination_mgr*dmgr = &fmgr->mgr;
+
+    if(fmgr->fi)
+	fwrite(fmgr->buffer, OUTBUFFER_SIZE, 1, fmgr->fi);
+
+    dmgr->next_output_byte = fmgr->buffer;
+    dmgr->free_in_buffer = OUTBUFFER_SIZE;
+    return 1;
+}
+
+static void file_term_destination(j_compress_ptr cinfo) 
+{ 
+    JPEGFILEMGR*fmgr = (JPEGFILEMGR*)(cinfo->dest);
+    struct jpeg_destination_mgr*dmgr = &fmgr->mgr;
+
+    if(fmgr->fi)
+        fwrite(fmgr->buffer, OUTBUFFER_SIZE-dmgr->free_in_buffer, 1, fmgr->fi);
+
+    rfx_free(fmgr->buffer);
+    fmgr->buffer = 0;
+    dmgr->free_in_buffer = 0;
+    dmgr->next_output_byte = 0;
+}
+
+void swf_SaveJPEG(char*filename, RGBA*pixels, int width, int height, int quality)
+{
+    JPEGFILEMGR fmgr;
+    struct jpeg_compress_struct cinfo;
+    struct jpeg_error_mgr jerr;
+    unsigned char*data2 = 0;
+    int y;
+
+    FILE*fi = fopen(filename, "wb");
+    if(!fi) {
+	char buf[256];
+	sprintf(buf, "rfxswf: Couldn't create %s", filename);
+	perror(buf);
+	return;
+    }
+    data2 = (unsigned char *)rfx_calloc(width*3);
+
+    memset(&cinfo, 0, sizeof(cinfo));
+    memset(&jerr, 0, sizeof(jerr));
+    memset(&fmgr, 0, sizeof(fmgr));
+    cinfo.err = jpeg_std_error(&jerr);
+    jpeg_create_compress(&cinfo);
+
+    fmgr.mgr.init_destination = file_init_destination;
+    fmgr.mgr.empty_output_buffer = file_empty_output_buffer;
+    fmgr.mgr.term_destination = file_term_destination;
+    fmgr.fi = fi;
+    fmgr.cinfo = &cinfo;
+    fmgr.jerr = &jerr;
+    cinfo.dest = (struct jpeg_destination_mgr*)&fmgr;
+
+    // init compression
+
+    cinfo.image_width  = width;
+    cinfo.image_height = height;
+    cinfo.input_components = 3;
+    cinfo.in_color_space = JCS_RGB;
+    jpeg_set_defaults(&cinfo);
+    cinfo.dct_method = JDCT_IFAST;
+    jpeg_set_quality(&cinfo,quality,TRUE);
+
+    //jpeg_write_tables(&cinfo);
+    //jpeg_suppress_tables(&cinfo, TRUE);
+    jpeg_start_compress(&cinfo, FALSE);
+
+    for(y=0;y<height;y++) {
+	int x;
+	RGBA*src = &pixels[y*width];
+	for(x=0;x<width;x++) {
+	    data2[x*3+0] = src[x].r;
+	    data2[x*3+1] = src[x].g;
+	    data2[x*3+2] = src[x].b;
+	}
+        jpeg_write_scanlines(&cinfo, &data2, 1);
+    }
+    rfx_free(data2);
+    jpeg_finish_compress(&cinfo);
+    jpeg_destroy_compress(&cinfo);
+
+    fclose(fi);
+}
+
 /*  jpeg_source_mgr functions */
 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)
 {
     TAG *tag = (TAG *) cinfo->client_data;
-    if (tag->data[tag->pos + 0] == 0xff &&
+    if (tag->pos + 4 <= tag->len &&
+	tag->data[tag->pos + 0] == 0xff &&
 	tag->data[tag->pos + 1] == 0xd9 &&
 	tag->data[tag->pos + 2] == 0xff &&
 	tag->data[tag->pos + 3] == 0xd8) {
@@ -345,18 +576,24 @@ RGBA *swf_JPEG2TagToImage(TAG * tag, int *width, int *height)
     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);
@@ -374,7 +611,7 @@ RGBA *swf_JPEG2TagToImage(TAG * tag, int *width, int *height)
     jpeg_read_header(&cinfo, TRUE);
     *width = cinfo.image_width;
     *height = cinfo.image_height;
-    dest =
+    dest = (RGBA*)
 	rfx_alloc(sizeof(RGBA) * cinfo.image_width * cinfo.image_height);
 
     jpeg_start_decompress(&cinfo);
@@ -397,6 +634,30 @@ RGBA *swf_JPEG2TagToImage(TAG * tag, int *width, int *height)
     jpeg_finish_decompress(&cinfo);
 
     jpeg_destroy_decompress(&cinfo);
+
+#ifdef HAVE_ZLIB
+    if(offset) {
+	uLongf 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;
 }
 
@@ -408,7 +669,7 @@ RGBA *swf_JPEG2TagToImage(TAG * tag, int *width, int *height)
 
 int RFXSWF_deflate_wraper(TAG * t, z_stream * zs, boolean finish)
 {
-    U8 *data = rfx_alloc(OUTBUFFER_SIZE);
+    U8 *data = (U8*)rfx_alloc(OUTBUFFER_SIZE);
     zs->next_out = data;
     zs->avail_out = OUTBUFFER_SIZE;
     while (1) {
@@ -464,7 +725,7 @@ int swf_SetLosslessBits(TAG * t, U16 width, U16 height, void *bitmap, U8 bitmap_
 
     switch (bitmap_flags) {
     case BMF_8BIT:
-	return swf_SetLosslessBitsIndexed(t, width, height, bitmap, NULL, 256);
+	return swf_SetLosslessBitsIndexed(t, width, height, (U8*)bitmap, NULL, 256);
     case BMF_16BIT:
 	bps = BYTES_PER_SCANLINE(sizeof(U16) * width);
 	break;
@@ -489,7 +750,7 @@ int swf_SetLosslessBits(TAG * t, U16 width, U16 height, void *bitmap, U8 bitmap_
 
 	if (deflateInit(&zs, Z_DEFAULT_COMPRESSION) == Z_OK) {
 	    zs.avail_in = bps * height;
-	    zs.next_in = bitmap;
+	    zs.next_in = (Bytef *)bitmap;
 
 	    if (RFXSWF_deflate_wraper(t, &zs, TRUE) < 0)
 		res = -3;
@@ -510,7 +771,7 @@ int swf_SetLosslessBitsIndexed(TAG * t, U16 width, U16 height, U8 * bitmap, RGBA
     if (!pal)			// create default palette for grayscale images
     {
 	int i;
-	pal = rfx_alloc(256 * sizeof(RGBA));
+	pal = (RGBA*)rfx_alloc(256 * sizeof(RGBA));
 	for (i = 0; i < 256; i++) {
 	    pal[i].r = pal[i].g = pal[i].b = i;
 	    pal[i].a = 0xff;
@@ -538,7 +799,7 @@ int swf_SetLosslessBitsIndexed(TAG * t, U16 width, U16 height, U8 * bitmap, RGBA
 
 	if (deflateInit(&zs, Z_DEFAULT_COMPRESSION) == Z_OK) {
 	    U8 *zpal;		// compress palette
-	    if ((zpal = rfx_alloc(ncolors * 4))) {
+	    if ((zpal = (U8*)rfx_alloc(ncolors * 4))) {
 		U8 *pp = zpal;
 		int i;
 
@@ -606,24 +867,38 @@ int swf_SetLosslessBitsGrayscale(TAG * t, U16 width, U16 height, U8 * bitmap)
     return swf_SetLosslessBitsIndexed(t, width, height, bitmap, NULL, 256);
 }
 
+void swf_PreMultiplyAlpha(RGBA*data, int width, int height)
+{
+    int num = width*height;
+    int t;
+    for(t=0;t<num;t++) {
+	data[t].r = ((int)data[t].r*data[t].a)/255;
+	data[t].g = ((int)data[t].g*data[t].a)/255;
+	data[t].b = ((int)data[t].b*data[t].a)/255;
+    }
+}
+
+/* expects mem to be non-premultiplied */
 void swf_SetLosslessImage(TAG*tag, RGBA*data, int width, int height)
 {
     int hasalpha = swf_ImageHasAlpha(data, width, height);
+    int num;
     if(!hasalpha) {
 	tag->id = ST_DEFINEBITSLOSSLESS;
     } else {
 	tag->id = ST_DEFINEBITSLOSSLESS2;
-	/* TODO: premultiply alpha? */
+	/* FIXME: we're destroying the callers data here */
+	swf_PreMultiplyAlpha(data, width, height);
     }
-    int num = swf_ImageGetNumberOfPaletteEntries(data, width, height, 0);
+    num = swf_ImageGetNumberOfPaletteEntries(data, width, height, 0);
     if(num>1 && num<=256) {
 	RGBA*palette = (RGBA*)malloc(sizeof(RGBA)*num);
-	swf_ImageGetNumberOfPaletteEntries(data, width, height, palette);
 	int width2 = BYTES_PER_SCANLINE(width);
 	U8*data2 = (U8*)malloc(width2*height);
 	int len = width*height;
 	int x,y;
 	int r;
+	swf_ImageGetNumberOfPaletteEntries(data, width, height, palette);
 	for(y=0;y<height;y++) {
 	    RGBA*src = &data[width*y];
 	    U8*dest = &data2[width2*y];
@@ -653,7 +928,7 @@ void swf_SetLosslessImage(TAG*tag, RGBA*data, int width, int height)
 RGBA *swf_DefineLosslessBitsTagToImage(TAG * tag, int *dwidth, int *dheight)
 {
     int id, format, height, width, pos;
-    U32 datalen, datalen2;
+    uLongf datalen, datalen2;
     int error;
     int bpp = 1;
     int cols = 0;
@@ -691,7 +966,7 @@ RGBA *swf_DefineLosslessBitsTagToImage(TAG * tag, int *dwidth, int *dheight)
     *dwidth = width = swf_GetU16(tag);
     *dheight = height = swf_GetU16(tag);
 
-    dest = rfx_alloc(sizeof(RGBA) * width * height);
+    dest = (RGBA*)rfx_alloc(sizeof(RGBA) * width * height);
 
     if (format == 3)
 	cols = swf_GetU8(tag) + 1;
@@ -704,7 +979,7 @@ RGBA *swf_DefineLosslessBitsTagToImage(TAG * tag, int *dwidth, int *dheight)
 	if (data)
 	    rfx_free(data);
 	datalen += 4096;
-	data = rfx_alloc(datalen);
+	data = (U8*)rfx_alloc(datalen);
 	error =
 	    uncompress(data, &datalen, &tag->data[tag->pos],
 		       tag->len - tag->pos);
@@ -723,6 +998,8 @@ RGBA *swf_DefineLosslessBitsTagToImage(TAG * tag, int *dwidth, int *dheight)
 	    palette[t].b = data[pos++];
 	    if (alpha) {
 		palette[t].a = data[pos++];
+	    } else {
+		palette[t].a = 255;
 	    }
 	}
     }
@@ -742,10 +1019,13 @@ RGBA *swf_DefineLosslessBitsTagToImage(TAG * tag, int *dwidth, int *dheight)
 		}
 	    } else {
 		for (x = 0; x < width; x++) {
-		    /* TODO: un-premultiply alpha? */
-		    dest[pos2].r = data[pos + 1];
-		    dest[pos2].g = data[pos + 2];
-		    dest[pos2].b = data[pos + 3];
+		    /* remove premultiplication */
+		    int alpha = data[pos+0];
+		    if(alpha)
+			alpha = 0xff0000/alpha;
+		    dest[pos2].r = (data[pos + 1]*alpha)>>16;
+		    dest[pos2].g = (data[pos + 2]*alpha)>>16;
+		    dest[pos2].b = (data[pos + 3]*alpha)>>16;
 		    dest[pos2].a = data[pos + 0];	//alpha
 		    pos2++;
 		    pos += 4;
@@ -768,6 +1048,8 @@ RGBA *swf_DefineLosslessBitsTagToImage(TAG * tag, int *dwidth, int *dheight)
 #endif				// HAVE_ZLIB
 
 #if defined(HAVE_ZLIB) && defined(HAVE_JPEGLIB)
+
+/* expects bitmap to be non-premultiplied */
 int swf_SetJPEGBits3(TAG * tag, U16 width, U16 height, RGBA * bitmap, int quality)
 {
     JPEGBITS *jpeg;
@@ -780,20 +1062,29 @@ int swf_SetJPEGBits3(TAG * tag, U16 width, U16 height, RGBA * bitmap, int qualit
     pos = tag->len;
     swf_SetU32(tag, 0);		//placeholder
     jpeg = swf_SetJPEGBitsStart(tag, width, height, quality);
+	U8 *scanline = (U8*)rfx_alloc(3 * width);
     for (y = 0; y < height; y++) {
-	U8 scanline[3 * width];
 	int x, p = 0;
 	for (x = 0; x < width; x++) {
+	    //int ia = bitmap[width*y+x].a;
+	    //if(ia) {
+	    //    /* remove premultiplication */
+	    //    ia = 0xff0000/ia;
+	    //}
+	    //scanline[p++] = (bitmap[width * y + x].r*ia)>>16;
+	    //scanline[p++] = (bitmap[width * y + x].g*ia)>>16;
+	    //scanline[p++] = (bitmap[width * y + x].b*ia)>>16;
 	    scanline[p++] = bitmap[width * y + x].r;
 	    scanline[p++] = bitmap[width * y + x].g;
 	    scanline[p++] = bitmap[width * y + x].b;
 	}
 	swf_SetJPEGBitsLine(jpeg, scanline);
     }
+    rfx_free(scanline);
     swf_SetJPEGBitsFinish(jpeg);
     PUT32(&tag->data[pos], tag->len - pos - 4);
 
-    data = rfx_alloc(OUTBUFFER_SIZE);
+    data = (U8*)rfx_alloc(OUTBUFFER_SIZE);
     memset(&zs, 0x00, sizeof(z_stream));
 
     if (deflateInit(&zs, Z_DEFAULT_COMPRESSION) != Z_OK) {
@@ -804,8 +1095,8 @@ int swf_SetJPEGBits3(TAG * tag, U16 width, U16 height, RGBA * bitmap, int qualit
     zs.next_out = data;
     zs.avail_out = OUTBUFFER_SIZE;
 
+	scanline = (U8*)rfx_alloc(width);
     for (y = 0; y < height; y++) {
-	U8 scanline[width];
 	int x, p = 0;
 	for (x = 0; x < width; x++) {
 	    scanline[p++] = bitmap[width * y + x].a;
@@ -829,6 +1120,8 @@ int swf_SetJPEGBits3(TAG * tag, U16 width, U16 height, RGBA * bitmap, int qualit
 	}
     }
 
+    rfx_free(scanline);
+
     while (1) {
 	int ret = deflate(&zs, Z_FINISH);
 	if (ret != Z_OK && ret != Z_STREAM_END) {
@@ -850,17 +1143,35 @@ int swf_SetJPEGBits3(TAG * tag, U16 width, U16 height, RGBA * bitmap, int qualit
     return 0;
 }
 
+#else
+int swf_SetJPEGBits3(TAG * tag, U16 width, U16 height, RGBA * bitmap, int quality)
+{
+    fprintf(stderr, "Error: swftools compiled without jpeglib\n");
+    return -1;
+}
+#endif
+
+
+/* expects mem to be non-premultiplied */
 TAG* swf_AddImage(TAG*tag, int bitid, RGBA*mem, int width, int height, int quality)
 {
     TAG *tag1 = 0, *tag2 = 0;
     int has_alpha = swf_ImageHasAlpha(mem,width,height);
 
     /* try lossless image */
+
+#ifdef NO_LOSSLESS
+    tag1 = swf_InsertTag(0, /*ST_DEFINEBITSLOSSLESS1/2*/0);
+    tag1->len = 0x7fffffff;
+#else
     tag1 = swf_InsertTag(0, /*ST_DEFINEBITSLOSSLESS1/2*/0);
     swf_SetU16(tag1, bitid);
     swf_SetLosslessImage(tag1, mem, width, height);
+#endif
 
-    /* try jpeg image */
+#if defined(HAVE_JPEGLIB)
+    /* try jpeg image. Notice that if (and only if) we tried the lossless compression
+       above, the data will now be premultiplied with alpha. */
     if(has_alpha) {
 	tag2 = swf_InsertTag(0, ST_DEFINEBITSJPEG3);
 	swf_SetU16(tag2, bitid);
@@ -870,28 +1181,30 @@ TAG* swf_AddImage(TAG*tag, int bitid, RGBA*mem, int width, int height, int quali
 	swf_SetU16(tag2, bitid);
 	swf_SetJPEGBits2(tag2, width, height, mem, quality);
     }
+#endif
 
-    if(tag1 && tag1->len < tag2->len) {
+    if(quality>100 || !tag2 || (tag1 && tag1->len < tag2->len)) {
 	/* use the zlib version- it's smaller */
 	tag1->prev = tag;
 	if(tag) tag->next = tag1;
 	tag = tag1;
-	swf_DeleteTag(tag2);
+	swf_DeleteTag(0, tag2);
     } else {
 	/* use the jpeg version- it's smaller */
 	tag2->prev = tag;
 	if(tag) tag->next = tag2;
 	tag = tag2;
-	swf_DeleteTag(tag1);
+	swf_DeleteTag(0, tag1);
     }
     return tag;
 }
 
-#endif
-
 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
@@ -935,146 +1248,19 @@ void swf_RemoveJPEGTables(SWF * swf)
     tag = swf->firstTag;
     while (tag) {
 	if (tag->id == ST_DEFINEBITSJPEG) {
-	    void *data = rfx_alloc(tag->len);
-	    swf_GetBlock(tag, data, tag->len);
+	    int len = tag->len;
+	    void *data = rfx_alloc(len);
+	    swf_GetBlock(tag, (U8*)data, tag->len);
 	    swf_ResetTag(tag, ST_DEFINEBITSJPEG2);
+	    swf_SetBlock(tag, &((U8*)data)[0], 2); //id
 	    swf_SetBlock(tag, tables_tag->data, tables_tag->len);
-	    swf_SetBlock(tag, data, tag->len);
+	    swf_SetBlock(tag, &((U8*)data)[2], len-2);
 	    free(data);
 	}
 	tag = tag->next;
     }
     if (swf->firstTag == tables_tag)
 	swf->firstTag = tables_tag->next;
-    swf_DeleteTag(tables_tag);
-}
-
-typedef struct scale_lookup {
-    int pos;
-    unsigned int weight;
-} scale_lookup_t;
-
-typedef struct rgba_int {
-    unsigned int r,g,b,a;
-} rgba_int_t;
-
-static int bicubic = 0;
-
-static scale_lookup_t**make_scale_lookup(int width, int newwidth)
-{
-    scale_lookup_t*lookupx = malloc((width>newwidth?width:newwidth)*2*sizeof(scale_lookup_t));
-    scale_lookup_t**lblockx = (scale_lookup_t**)malloc((newwidth+1)*sizeof(scale_lookup_t**));
-    double fx = ((double)width)/((double)newwidth);
-    double px = 0;
-    int x;
-    scale_lookup_t*p_x = lookupx;
-
-    if(newwidth<=width) {
-	for(x=0;x<newwidth;x++) {
-	    lblockx[x] = p_x;
-	    double ex = px + fx;
-	    int fromx = (int)px;
-	    int tox = (int)ex;
-	    double rem = fromx+1-px;
-	    int i = (int)(256/fx);
-	    int xweight = (int)(rem*256/fx);
-	    int xx;
-	    int w = 0;
-	    if(tox>=width) tox = width-1;
-	    for(xx=fromx;xx<=tox;xx++) {
-		if(xx==fromx && xx==tox) p_x->weight = 256;
-		else if(xx==fromx) p_x->weight = xweight;
-		else if(xx==tox) p_x->weight = 256-w;
-		else p_x->weight = i;
-		w+=p_x->weight;
-		p_x->pos = xx;
-		p_x++;
-	    }
-	    px = ex;
-	}
-    } else {
-	for(x=0;x<newwidth;x++) {
-	    lblockx[x] = p_x;
-	    int ix1 = (int)px;
-	    int ix2 = ((int)px)+1;
-	    if(ix2>=width) ix2=width-1;
-	    double r = px-ix1;
-	    if(bicubic)
-		r = -2*r*r*r+3*r*r;
-	    p_x[0].weight = (int)(256*(1-r));
-	    p_x[0].pos = ix1;
-	    p_x[1].weight = 256-p_x[0].weight;
-	    p_x[1].pos = ix2;
-	    p_x+=2;
-	    px += fx;
-	}
-    }
-    lblockx[newwidth] = p_x;
-    return lblockx;
-}
-
-RGBA* swf_ImageScale(RGBA*data, int width, int height, int newwidth, int newheight)
-{
-    if(newwidth<1 || newheight<1)
-	return 0;
-    int x,y;
-    RGBA* newdata= (RGBA*)malloc(newwidth*newheight*sizeof(RGBA));
-    scale_lookup_t *p, **lblockx,**lblocky;
-    rgba_int_t*tmpline = (rgba_int_t*)malloc(width*sizeof(rgba_int_t));
-  
-    lblockx = make_scale_lookup(width, newwidth);
-    lblocky = make_scale_lookup(height, newheight);
-
-    for(p=lblocky[0];p<lblocky[newheight];p++)
-	p->pos*=width;
-
-    for(y=0;y<newheight;y++) {
-	RGBA*destline = &newdata[y*newwidth];
-	
-	/* create lookup table for y */
-	rgba_int_t*l = tmpline;
-	scale_lookup_t*p_y;
-	memset(tmpline, 0, width*sizeof(rgba_int_t));
-	for(p_y=lblocky[y];p_y<lblocky[y+1];p_y++) {
-	    RGBA*line = &data[p_y->pos];
-	    scale_lookup_t*p_x;
-	    int weight = p_y->weight;
-	    for(x=0;x<width;x++) {
-		tmpline[x].r += line[x].r*weight;
-		tmpline[x].g += line[x].g*weight;
-		tmpline[x].b += line[x].b*weight;
-		tmpline[x].a += line[x].a*weight;
-	    }
-	}
-
-	/* process x direction */
-	scale_lookup_t*p_x = lblockx[0];
-	for(x=0;x<newwidth;x++) {
-	    unsigned int r=0,g=0,b=0,a=0;
-	    scale_lookup_t*p_x_to = lblockx[x+1];
-	    do { 
-		rgba_int_t* col = &tmpline[p_x->pos];
-		unsigned int weight = p_x->weight;
-		r += col->r*weight;
-		g += col->g*weight;
-		b += col->b*weight;
-		a += col->a*weight;
-		p_x++;
-	    } while (p_x<p_x_to);
-
-	    destline->r = r >> 16;
-	    destline->g = g >> 16;
-	    destline->b = b >> 16;
-	    destline->a = a >> 16;
-	   
-	    destline++;
-	}
-    }
-    free(tmpline);
-    free(*lblockx);
-    free(lblockx);
-    free(*lblocky);
-    free(lblocky);
-    return newdata;
+    swf_DeleteTag(swf, tables_tag);
 }