X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fpng2swf.c;h=e8a2c7c2f72b45d23502d6308df53ee8ce41aa97;hb=add03ee7161255cb8ff1da5dcd9fddd7d93b3026;hp=d2e495ad87071ec4bee1c14321ccd7e6e7c7e4fe;hpb=06f07675a6134fed4f3b3d7bf19978ed22df2e9c;p=swftools.git

diff --git a/src/png2swf.c b/src/png2swf.c
index d2e495a..e8a2c7c 100644
--- a/src/png2swf.c
+++ b/src/png2swf.c
@@ -478,6 +478,8 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
     int alphapalettelen = 0;
     struct png_header header;
     int bypp;
+    U8 alphacolor[3];
+    int hasalphacolor=0;
 
     FILE *fi;
     U8 *scanline;
@@ -511,7 +513,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
 	}
 	if(!strncmp(tagid, "PLTE", 4)) {
 	    palette = data;
-	    palettelen = len/3;
+	    palettelen = len/bypp;
 	    data = 0; //don't free data
 	    if(VERBOSE(2))
 		printf("%d colors in palette\n", palettelen);
@@ -523,6 +525,21 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
 		data = 0; //don't free data
 		if(VERBOSE(2))
 		    printf("found %d alpha colors\n", alphapalettelen);
+	    } else if(header.mode == 0) {
+		int t;
+		if(header.mode == 3) { // palette or grayscale?
+		    alphacolor[0] = data[1];
+		    alphacolor[1] = data[3];
+		    alphacolor[2] = data[5];
+		} else {
+		    alphacolor[0] = alphacolor[1] = alphacolor[2] = data[1];
+		}
+		if(VERBOSE(2))
+		    printf("found alpha color: %02x%02x%02x\n", alphacolor[0], alphacolor[1], alphacolor[2]);
+		hasalphacolor = 1;
+	    } else {
+		if(VERBOSE(2))
+		    printf("ignoring tRNS %d entry (%d bytes)\n", header.mode, len);
 	    }
 	}
 	if(!strncmp(tagid, "IDAT", 4)) {
@@ -548,7 +565,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
     }
     free(zimagedata);
 
-    if(alphapalette)
+    if(alphapalette || hasalphacolor)
 	t = swf_InsertTag(t, ST_DEFINEBITSLOSSLESS2);
     else
 	t = swf_InsertTag(t, ST_DEFINEBITSLOSSLESS);
@@ -647,6 +664,16 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
 		} else {
 		    rgba[i].a = 255;
 		}
+		if(hasalphacolor) {
+		    if(rgba[i].r == alphacolor[0] &&
+		       rgba[i].g == alphacolor[1] &&
+		       rgba[i].b == alphacolor[2]) {
+			rgba[i].r = 0;
+			rgba[i].g = 0;
+			rgba[i].b = 0;
+			rgba[i].a = 0;
+		    }
+		}
 	    }
 	} else {
             int mult = (0x1ff>>header.bpp);
@@ -656,6 +683,15 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
 		rgba[i].r = i*mult;
 		rgba[i].g = i*mult;
 		rgba[i].b = i*mult;
+		rgba[i].a = 255;
+		if(hasalphacolor) {
+		    if(rgba[i].r == alphacolor[0]) {
+			rgba[i].r = 0;
+			rgba[i].g = 0;
+			rgba[i].b = 0;
+			rgba[i].a = 0;
+		    }
+		}
 	    }
 	}
 
@@ -824,7 +860,8 @@ int args_callback_option(char *arg, char *val)
 	    break;
 
 	case 'z':
-	    global.version = 6;
+	    if(global.version<6)
+		global.version = 6;
 	    res = 0;
 	    break;
 
@@ -860,7 +897,7 @@ int args_callback_option(char *arg, char *val)
 		global.force_height = atoi(val);
 	    res = 1;
 	    break;
-
+	
 	case 'V':
 	    printf("png2swf - part of %s %s\n", PACKAGE, VERSION);
 	    exit(0);
@@ -921,12 +958,14 @@ static struct options_t options[] = {
 {"r", "rate"},
 {"o", "output"},
 {"z", "zlib"},
+{"T", "flashversion"},
 {"X", "pixel"},
 {"Y", "pixel"},
 {"v", "verbose"},
 {"q", "quiet"},
 {"C", "cgi"},
 {"V", "version"},
+{"s", "scale"},
 {0,0}
 };
 
@@ -962,12 +1001,14 @@ void args_callback_usage(char *name)
     printf("-r , --rate <framerate>        Set movie framerate (frames per second)\n");
     printf("-o , --output <filename>       Set name for SWF output file.\n");
     printf("-z , --zlib <zlib>             Enable Flash 6 (MX) Zlib Compression\n");
+    printf("-T , --flashversion            Set the flash version to generate\n");
     printf("-X , --pixel <width>           Force movie width to <width> (default: autodetect)\n");
     printf("-Y , --pixel <height>          Force movie height to <height> (default: autodetect)\n");
-    printf("-v , --verbose                 Be verbose. Use more than one -v for greater effect \n");
+    printf("-v , --verbose <level>         Set verbose level (0=quiet, 1=default, 2=debug)\n");
     printf("-q , --quiet                   Omit normal log messages, only log errors\n");
     printf("-C , --cgi                     For use as CGI- prepend http header, write to stdout\n");
     printf("-V , --version                 Print version information and exit\n");
+    printf("-s , --scale <percent>         Scale image to <percent>% size.\n");
     printf("\n");
 }