X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswfbits.c;h=eda68297e2818306fa536c500d4cac9715dbd5ae;hb=0784a8a882e7b98299fb6a90f0f9a7ebb322562b;hp=a24b5703c9cc3bc408188be6b7e9f17506d21614;hpb=e8491d8b2680d0392fe2e6ac86b8abb821492b85;p=swftools.git

diff --git a/lib/modules/swfbits.c b/lib/modules/swfbits.c
index a24b570..eda6829 100644
--- a/lib/modules/swfbits.c
+++ b/lib/modules/swfbits.c
@@ -21,6 +21,14 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include "jpeglib.h"
+#ifdef __cplusplus
+}
+#endif
+
 #define OUTBUFFER_SIZE 0x8000
 
 int swf_ImageHasAlpha(RGBA*img, int width, int height)
@@ -112,7 +120,7 @@ int swf_ImageGetNumberOfPaletteEntries(RGBA*img, int width, int height, RGBA*pal
     int palette_overflow = 0;
     U32 lastcol32 = 0;
 
-    pal = malloc(65536*sizeof(U32));
+    pal = (U32*)malloc(65536*sizeof(U32));
 
     memset(size, 0, sizeof(size));
 
@@ -150,8 +158,10 @@ int swf_ImageGetNumberOfPaletteEntries(RGBA*img, int width, int height, RGBA*pal
 	}
 	lastcol32 = col32;
     }
-    if(palette_overflow)
+    if(palette_overflow) {
+	free(pal);
 	return width*height;
+    }
     if(palette) {
 	int i = 0;
 	for(t=0;t<256;t++) {
@@ -268,6 +278,7 @@ int swf_SetJPEGBitsFinish(JPEGBITS * jpegbits)
     if (!jpeg)
 	return -1;
     jpeg_finish_compress(&jpeg->cinfo);
+    jpeg_destroy_compress(&jpeg->cinfo);
     rfx_free(jpeg);
     return 0;
 }
@@ -278,8 +289,8 @@ void swf_SetJPEGBits2(TAG * tag, U16 width, U16 height, RGBA * bitmap,
     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;
@@ -288,6 +299,7 @@ void swf_SetJPEGBits2(TAG * tag, U16 width, U16 height, RGBA * bitmap,
 	}
 	swf_SetJPEGBitsLine(jpeg, scanline);
     }
+    rfx_free(scanline);
     swf_SetJPEGBitsFinish(jpeg);
 }
 
@@ -391,6 +403,7 @@ int swf_SetJPEGBits(TAG * t, char *fname, int quality)
 	}
     }
 
+    rfx_free(scanline);
     swf_SetJPEGBitsFinish(out);
     jpeg_finish_decompress(&cinfo);
     fclose(f);
@@ -398,11 +411,128 @@ 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)
@@ -446,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);
@@ -475,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);
@@ -498,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;
 }
 
@@ -509,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) {
@@ -565,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;
@@ -590,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;
@@ -611,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;
@@ -639,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;
 
@@ -707,6 +867,18 @@ 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);
@@ -715,7 +887,7 @@ void swf_SetLosslessImage(TAG*tag, RGBA*data, int width, int height)
 	tag->id = ST_DEFINEBITSLOSSLESS;
     } else {
 	tag->id = ST_DEFINEBITSLOSSLESS2;
-	/* TODO: premultiply alpha? */
+	swf_PreMultiplyAlpha(data, width, height);
     }
     num = swf_ImageGetNumberOfPaletteEntries(data, width, height, 0);
     if(num>1 && num<=256) {
@@ -755,7 +927,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;
@@ -793,7 +965,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;
@@ -806,7 +978,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);
@@ -846,14 +1018,13 @@ RGBA *swf_DefineLosslessBitsTagToImage(TAG * tag, int *dwidth, int *dheight)
 		}
 	    } else {
 		for (x = 0; x < width; x++) {
-		    /* TODO: premultiply alpha? 
-		    dest[pos2].r = (data[pos + 1]*255)/data[pos+0];
-		    dest[pos2].g = (data[pos + 2]*255)/data[pos+0];
-		    dest[pos2].b = (data[pos + 3]*255)/data[pos+0];
-		    */
-		    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;
@@ -876,6 +1047,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;
@@ -888,20 +1061,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) {
@@ -912,8 +1094,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;
@@ -937,6 +1119,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) {
@@ -958,6 +1142,7 @@ int swf_SetJPEGBits3(TAG * tag, U16 width, U16 height, RGBA * bitmap, int qualit
     return 0;
 }
 
+/* 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;
@@ -979,7 +1164,7 @@ TAG* swf_AddImage(TAG*tag, int bitid, RGBA*mem, int width, int height, int quali
 	swf_SetJPEGBits2(tag2, width, height, mem, quality);
     }
 
-    if(tag1 && tag1->len < tag2->len) {
+    if(quality>100 || (tag1 && tag1->len < tag2->len)) {
 	/* use the zlib version- it's smaller */
 	tag1->prev = tag;
 	if(tag) tag->next = tag1;
@@ -1000,6 +1185,9 @@ TAG* swf_AddImage(TAG*tag, int bitid, RGBA*mem, int width, int height, int quali
 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
@@ -1045,7 +1233,7 @@ void swf_RemoveJPEGTables(SWF * swf)
 	if (tag->id == ST_DEFINEBITSJPEG) {
 	    int len = tag->len;
 	    void *data = rfx_alloc(len);
-	    swf_GetBlock(tag, data, tag->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);
@@ -1072,7 +1260,7 @@ 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*lookupx = (scale_lookup_t*)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;
@@ -1122,21 +1310,62 @@ static scale_lookup_t**make_scale_lookup(int width, int newwidth)
     lblockx[newwidth] = p_x;
     return lblockx;
 }
+
+static void encodeMonochromeImage(RGBA*data, int width, int height, RGBA*colors)
+{
+    int t;
+    int len = width*height;
+
+    U32* img = (U32*)data;
+    U32 color1 = img[0];
+    U32 color2 = 0;
+    for(t=1;t<len;t++) {
+	if(img[t] != color1) {
+	    color2 = img[t];
+	    break;
+	}
+    }
+    *(U32*)&colors[0] = color1;
+    *(U32*)&colors[1] = color2;
+    for(t=0;t<len;t++) {
+	if(img[t] == color1) {
+	    img[t] = 0;
+	} else {
+	    img[t] = 0xffffffff;
+	}
+    }
+}
+
+static void decodeMonochromeImage(RGBA*data, int width, int height, RGBA*colors)
+{
+    int t;
+    int len = width*height;
+
+    for(t=0;t<len;t++) {
+	U32 m = data[t].r;
+	data[t].r = (colors[0].r * (255-m) + colors[1].r * m) >> 8;
+	data[t].g = (colors[0].g * (255-m) + colors[1].g * m) >> 8;
+	data[t].b = (colors[0].b * (255-m) + colors[1].b * m) >> 8;
+	data[t].a = (colors[0].a * (255-m) + colors[1].a * m) >> 8;
+    }
+}
+
 RGBA* swf_ImageScale(RGBA*data, int width, int height, int newwidth, int newheight)
 {
     int x,y;
     RGBA* newdata; 
     scale_lookup_t *p, **lblockx,**lblocky;
     rgba_int_t*tmpline;
+    int monochrome = 0;
+    RGBA monochrome_colors[2];
     
     if(newwidth<1 || newheight<1)
 	return 0;
 
-    /* this is bad because this scaler doesn't yet handle monochrome
-       images with 2 colors in a way that the final image hasn't more
-       than 256 colors */
-    if(swf_ImageGetNumberOfPaletteEntries2(data, width, height) == 2)
-	fprintf(stderr, "Warning: scaling monochrome image\n");
+    if(swf_ImageGetNumberOfPaletteEntries2(data, width, height) == 2) {
+	monochrome=1;
+	encodeMonochromeImage(data, width, height, monochrome_colors);
+    }
 
     tmpline = (rgba_int_t*)malloc(width*sizeof(rgba_int_t));
     newdata = (RGBA*)malloc(newwidth*newheight*sizeof(RGBA));
@@ -1189,6 +1418,10 @@ RGBA* swf_ImageScale(RGBA*data, int width, int height, int newwidth, int newheig
 	    destline++;
 	}
     }
+
+    if(monochrome)
+	decodeMonochromeImage(newdata, newwidth, newheight, monochrome_colors);
+
     free(tmpline);
     free(*lblockx);
     free(lblockx);
@@ -1197,3 +1430,4 @@ RGBA* swf_ImageScale(RGBA*data, int width, int height, int newwidth, int newheig
     return newdata;
 }
 
+