X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswfbits.c;h=01ee654bf85e42452a95ce3856aa9ade9a441690;hb=e9dc83904a5df2c24cc62004be16cecdaea83797;hp=30f2e421fe5a8abbb0aa84b3836ffa22a901f087;hpb=936d8c21660ee7949b13989f7aa498465239f083;p=swftools.git

diff --git a/lib/modules/swfbits.c b/lib/modules/swfbits.c
index 30f2e42..01ee654 100644
--- a/lib/modules/swfbits.c
+++ b/lib/modules/swfbits.c
@@ -150,8 +150,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++) {
@@ -450,10 +452,10 @@ RGBA *swf_JPEG2TagToImage(TAG * tag, int *width, int *height)
     struct jpeg_source_mgr mgr;
     RGBA *dest;
     int y;
-    *width = 0;
-    *height = 0;
     int offset = 0;
     int oldtaglen = 0;
+    *width = 0;
+    *height = 0;
 
     if (tag->id == ST_DEFINEBITSJPEG) {
 	fprintf(stderr, "rfxswf: extracting from definebitsjpeg not yet supported\n");
@@ -895,9 +897,16 @@ RGBA *swf_DefineLosslessBitsTagToImage(TAG * tag, int *dwidth, int *dheight)
 		       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;
@@ -1169,6 +1178,7 @@ static scale_lookup_t**make_scale_lookup(int width, int newwidth)
     lblockx[newwidth] = p_x;
     return lblockx;
 }
+static int monochrome_warning = 0;
 RGBA* swf_ImageScale(RGBA*data, int width, int height, int newwidth, int newheight)
 {
     int x,y;
@@ -1182,8 +1192,12 @@ RGBA* swf_ImageScale(RGBA*data, int width, int height, int newwidth, int newheig
     /* 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) {
+	if(!monochrome_warning) {
+	    fprintf(stderr, "Warning: scaling monochrome image\n");
+	    monochrome_warning = 1;
+	}
+    }
 
     tmpline = (rgba_int_t*)malloc(width*sizeof(rgba_int_t));
     newdata = (RGBA*)malloc(newwidth*newheight*sizeof(RGBA));