X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fpng2swf.c;h=b03a11dee6f2dfc351b0a3f08682544438523ad2;hb=3b178e342242bbacc6c9d620f4129b6acb6478ed;hp=6e04212a4cd0e3aa35fbe5e7bb65d8266c6ce055;hpb=202babdc64693506daa042c25b76eab46835c94e;p=swftools.git

diff --git a/src/png2swf.c b/src/png2swf.c
index 6e04212..b03a11d 100644
--- a/src/png2swf.c
+++ b/src/png2swf.c
@@ -39,6 +39,7 @@ struct {
     int nfiles;
     int verbose;
     int do_cgi;
+    int version;
     char *outfile;
 } global;
 
@@ -53,7 +54,7 @@ TAG *MovieStart(SWF * swf, float framerate, int dx, int dy)
 
     memset(swf, 0x00, sizeof(SWF));
 
-    swf->fileVersion = 5;
+    swf->fileVersion = global.version;
     swf->frameRate = (int)(256.0 * framerate);
     swf->movieSize.xmax = dx * 20;
     swf->movieSize.ymax = dy * 20;
@@ -83,7 +84,13 @@ int MovieFinish(SWF * swf, TAG * t, char *sname)
     if(global.do_cgi) {
 	if FAILED(swf_WriteCGI(swf)) fprintf(stderr,"WriteCGI() failed.\n");
     } else {
-	if FAILED(swf_WriteSWF(f,swf)) fprintf(stderr,"WriteSWF() failed.\n");
+	if(global.version >= 6) {
+	    if (swf_WriteSWC(f, swf)<0) 
+		    fprintf(stderr, "Unable to write output file: %s\n", sname);
+	} else {
+	    if (swf_WriteSWF(f, swf)<0) 
+		    fprintf(stderr, "Unable to write output file: %s\n", sname);
+	}
 	if (f != so)
 	    close(f);
     }
@@ -308,11 +315,11 @@ void applyfilter4(int mode, U8*src, U8*old, U8*dest, int width)
     unsigned char lastr=0;
     unsigned char lastg=0;
     unsigned char lastb=0;
-    unsigned char lasta=0;
+    unsigned char lasta=0; //TODO: 255?
     unsigned char upperlastr=0;
     unsigned char upperlastg=0;
     unsigned char upperlastb=0;
-    unsigned char upperlasta=0;
+    unsigned char upperlasta=0; //TODO: 255?
 
     if(mode==0) {
 	for(x=0;x<width;x++) {
@@ -563,7 +570,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
 
 	    if(!y) {
 		old = firstline;
-		memset(old, 0, header.width*4);
+		memset(old, 0, header.width*4); //TODO: fill alpha with 255?
 	    } else {
 		old = &data2[(y-1)*header.width*4];
 	    }
@@ -628,12 +635,13 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
 		}
 	    }
 	} else {
-	    palettelen = 256;
+            int mult = (0x1ff>>header.bpp);
+	    palettelen = 1<<header.bpp;
 	    rgba = (RGBA*)malloc(palettelen*sizeof(RGBA));
-	    for(i=0;i<256;i++) {
-		rgba[i].r = i;
-		rgba[i].g = i;
-		rgba[i].b = i;
+	    for(i=0;i<palettelen;i++) {
+		rgba[i].r = i*mult;
+		rgba[i].g = i*mult;
+		rgba[i].b = i*mult;
 	    }
 	}
 
@@ -674,17 +682,15 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
 	free(data2);
     }
 
-    while(t->len < 64) {
-	swf_SetU8(t, 0); //fix for flash player bug- see ../lib/modules/swfbits.c
-    }
-
     t = swf_InsertTag(t, ST_DEFINESHAPE3);
 
     swf_ShapeNew(&s);
     swf_GetMatrix(NULL, &m);
     m.sx = 20 * 0x10000;
     m.sy = 20 * 0x10000;
-    fs = swf_ShapeAddBitmapFillStyle(s, &m, id, 0);
+    m.tx = -10;
+    m.ty = -10;
+    fs = swf_ShapeAddBitmapFillStyle(s, &m, id, 1);
 
     swf_SetU16(t, id + 1);	// id
 
@@ -740,9 +746,10 @@ int CheckInputFile(char *fname, char **realname)
 	    sprintf(s, "%s.PNG", fname);
 	    if ((fi = fopen(s, "rb")) == NULL) {
 		sprintf(s, "%s.Png", fname);
-		if ((fi = fopen(s, "rb")) == NULL)
+		if ((fi = fopen(s, "rb")) == NULL) {
 		    fprintf(stderr, "Couldn't open %s!\n", fname);
 		    return -1;
+		}
 	    }
 	}
     }
@@ -772,7 +779,9 @@ int args_callback_option(char *arg, char *val)
 	case 'r':
 	    if (val)
 		global.framerate = atof(val);
-	    if ((global.framerate < 1.0/256) ||(global.framerate >= 256.0)) {
+	    /* removed framerate>0 restriction in order to make
+	       Flash Communication Server compatible SWFs */
+	    if ((global.framerate < 0) ||(global.framerate >= 256.0)) {
 		if (VERBOSE(1))
 		    fprintf(stderr,
 			    "Error: You must specify a valid framerate between 1/256 and 255.\n");
@@ -787,14 +796,25 @@ int args_callback_option(char *arg, char *val)
 	    res = 1;
 	    break;
 
+	case 'z':
+	    global.version = 6;
+	    res = 0;
+	    break;
+
 	case 'C':
 	    global.do_cgi = 1;
 	    break;
 
 	case 'v':
-	    if (val)
-		global.verbose = atoi(val);
-	    res = 1;
+	    global.verbose++;
+	    res = 0;
+	    break;
+
+	case 'q':
+	    global.verbose--;
+	    if(global.verbose<0)
+		global.verbose = 0;
+	    res = 0;
 	    break;
 
 	case 'X':
@@ -830,9 +850,11 @@ int args_callback_option(char *arg, char *val)
 static struct options_t options[] = {
 {"r", "rate"},
 {"o", "output"},
+{"z", "zlib"},
 {"X", "pixel"},
 {"Y", "pixel"},
 {"v", "verbose"},
+{"q", "quiet"},
 {"C", "cgi"},
 {"V", "version"},
 {0,0}
@@ -869,9 +891,11 @@ void args_callback_usage(char *name)
     printf("\n");
     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("-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 <level>         Set verbose level (0=quiet, 1=default, 2=debug)\n");
+    printf("-v , --verbose                 Be verbose. Use more than one -v for greater effect \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("\n");
@@ -886,11 +910,14 @@ int main(int argc, char **argv)
 
     global.framerate = 1.0;
     global.verbose = 1;
+    global.version = 4;
 
     processargs(argc, argv);
-
-    if(global.nfiles<=0)
+    
+    if(global.nfiles<=0) {
+	fprintf(stderr, "No png files found in arguments\n");
 	return 1;
+    }
 
     if (VERBOSE(2))
 	fprintf(stderr, "Processing %i file(s)...\n", global.nfiles);