X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fpng2swf.c;h=ffca258823efb6edfb244d82ced91f532cfa14d3;hb=ac8c6f00fbaa94b3136457caf1a24d8f4f0c12cc;hp=0d7e1a6d9882a8754da72c806790e396d46b07c4;hpb=25e39f1bcfd11604dcb56791301248878b720d70;p=swftools.git

diff --git a/src/png2swf.c b/src/png2swf.c
index 0d7e1a6..ffca258 100644
--- a/src/png2swf.c
+++ b/src/png2swf.c
@@ -26,6 +26,7 @@
 #include <zlib.h>
 #include "../lib/rfxswf.h"
 #include "../lib/args.h"
+#include "../lib/png.h"
 
 #define MAX_INPUT_FILES 1024
 #define VERBOSE(x) (global.verbose>=x)
@@ -41,6 +42,7 @@ struct {
     int do_cgi;
     int version;
     char *outfile;
+    int mkjpeg;
     float scale;
 } global;
 
@@ -98,13 +100,8 @@ int MovieFinish(SWF * swf, TAG * t, char *sname)
     if(global.do_cgi) {
 	if FAILED(swf_WriteCGI(swf)) fprintf(stderr,"WriteCGI() failed.\n");
     } else {
-	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 (swf_WriteSWF(f, swf)<0) 
+            fprintf(stderr, "Unable to write output file: %s\n", sname);
 	if (f != so)
 	    close(f);
     }
@@ -179,7 +176,7 @@ int png_read_header(FILE*fi, struct png_header*header)
 	    header->width = REVERSESWAP32(*(U32*)&data[0]);
 	    header->height = REVERSESWAP32(*(U32*)&data[4]);
 	    a = data[8];      // should be 8
-	    b = data[9];      // should be 3(indexed) or 2(rgb)
+	    b = data[9];      // should be 3(indexed), 2(rgb), 0(grayscale) or 6(truecolor+alpha)
 
 	    c = data[10];     // compression mode (0)
 	    f = data[11];     // filter mode (0)
@@ -320,7 +317,6 @@ void applyfilter3(int mode, U8*src, U8*old, U8*dest, int width)
 	    src+=3;
 	}
     }    
-
 }
 
 void applyfilter4(int mode, U8*src, U8*old, U8*dest, int width)
@@ -458,15 +454,9 @@ void applyfilter1(int mode, U8*src, U8*old, U8*dest, int width)
 
 }
 
-TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
+TAG* PNG2Image(TAG*t, U16 id, char*filename, int*width, int*height)
 {
-    SHAPE *s;
-    SRECT r;
-    MATRIX m;
-    int fs;
-
     char tagid[4];
-    int len;
     U8*data;
     U8*imagedata;
     U8*zimagedata=0;
@@ -480,19 +470,24 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
     int bypp;
     U8 alphacolor[3];
     int hasalphacolor=0;
+    int len;
+
 
     FILE *fi;
     U8 *scanline;
 
-    if ((fi = fopen(sname, "rb")) == NULL) {
+    if ((fi = fopen(filename, "rb")) == NULL) {
 	if (VERBOSE(1))
-	    fprintf(stderr, "Read access failed: %s\n", sname);
+	    fprintf(stderr, "Read access failed: %s\n", filename);
 	return t;
     }
 
     if(!png_read_header(fi, &header))
 	return 0;
 
+    *width = header.width;
+    *height = header.height;
+
     if(header.mode == 3 || header.mode == 0) bypp = 1;
     else
     if(header.mode == 2) bypp = 3;
@@ -513,7 +508,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
 	}
 	if(!strncmp(tagid, "PLTE", 4)) {
 	    palette = data;
-	    palettelen = len/bypp;
+	    palettelen = len/3;
 	    data = 0; //don't free data
 	    if(VERBOSE(2))
 		printf("%d colors in palette\n", palettelen);
@@ -525,9 +520,9 @@ 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) {
+	    } else if(header.mode == 0 || header.mode == 2) {
 		int t;
-		if(header.mode == 3) { // palette or grayscale?
+		if(header.mode == 2) { // palette or grayscale?
 		    alphacolor[0] = data[1];
 		    alphacolor[1] = data[3];
 		    alphacolor[2] = data[5];
@@ -558,7 +553,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
     }
     
     if(!zimagedata || uncompress(imagedata, &imagedatalen, zimagedata, zimagedatalen) != Z_OK) {
-	fprintf(stderr, "Couldn't uncompress %s!\n", sname);
+	fprintf(stderr, "Couldn't uncompress IDAT chunk (%d bytes) in %s!\n", imagedatalen, filename);
 	if(zimagedata)
 	    free(zimagedata);
 	return 0;
@@ -605,10 +600,22 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
 	    } else {
 		old = &data2[(y-1)*header.width*4];
 	    }
-	    if(header.mode==6)
+	    if(header.mode==6) {
 		applyfilter4(mode, src, old, dest, header.width);
-	    else if(header.mode==2)
+	    } else if(header.mode==2) {
 		applyfilter3(mode, src, old, dest, header.width);
+		/* replace alpha color */
+		if(hasalphacolor) {
+		    int x;
+		    for(x=0;x<header.width;x++) {
+			if(dest[x*4+1] == alphacolor[0] &&
+			   dest[x*4+2] == alphacolor[1] &&
+			   dest[x*4+3] == alphacolor[2]) {
+			    *(U32*)&dest[x*4] = 0;
+			}
+		    }
+		}
+	    }
 	}
 	free(firstline);
 
@@ -731,6 +738,45 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
 	free(rgba);
 	free(data2);
     }
+    fclose(fi);
+    return t;
+}
+
+TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
+{
+    SHAPE *s;
+    SRECT r;
+    MATRIX m;
+    int fs;
+
+    int width=0, height=0;
+
+    if(global.mkjpeg) {
+	RGBA*data = 0;
+	getPNG(sname, &width, &height, (unsigned char**)&data);
+	if(!data) 
+	    exit(1);
+	if(swf_ImageHasAlpha(data, width, height)) {
+	    t = swf_InsertTag(t, ST_DEFINEBITSJPEG3);
+	    swf_SetU16(t, id);
+	    swf_SetJPEGBits3(t, width,height,data,global.mkjpeg);
+	} else {
+	    t = swf_InsertTag(t, ST_DEFINEBITSJPEG2);
+	    swf_SetU16(t, id);
+	    swf_SetJPEGBits2(t, width,height,data,global.mkjpeg);
+	}
+    } else if(1) {
+	RGBA*data = 0;
+	getPNG(sname, &width, &height, (unsigned char**)&data);
+	if(!data) 
+	    exit(1);
+	t = swf_InsertTag(t, ST_DEFINEBITSLOSSLESS);
+	swf_SetU16(t, id);
+	swf_SetLosslessImage(t, data,width,height);
+    } else {
+	/* old code: transform PNG encoding 1:1 to SWF */
+	t = PNG2Image(t, id, sname, &width, &height);
+    }
 
     t = swf_InsertTag(t, ST_DEFINESHAPE3);
 
@@ -745,8 +791,8 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
     swf_SetU16(t, id + 1);	// id
 
     r.xmin = r.ymin = 0;
-    r.xmax = header.width * 20;
-    r.ymax = header.height * 20;
+    r.xmax = width * 20;
+    r.ymax = height * 20;
     swf_SetRect(t, &r);
 
     swf_SetShapeHeader(t, s);
@@ -772,15 +818,13 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
 	m.tx = move_x*20;
 	m.ty = move_y*20;
     } else {
-	m.tx = (swf->movieSize.xmax - (int) (header.width * global.scale * 20)) / 2;
-	m.ty = (swf->movieSize.ymax - (int) (header.height * global.scale * 20)) / 2;
+	m.tx = (swf->movieSize.xmax - (int) (width * global.scale * 20)) / 2;
+	m.ty = (swf->movieSize.ymax - (int) (height * global.scale * 20)) / 2;
     }
     swf_ObjectPlace(t, id + 1, 50, &m, NULL, NULL);
 
     t = swf_InsertTag(t, ST_SHOWFRAME);
 
-    fclose(fi);
-
     return t;
 }
 
@@ -860,10 +904,16 @@ int args_callback_option(char *arg, char *val)
 	    break;
 
 	case 'z':
-	    global.version = 6;
+	    if(global.version<6)
+		global.version = 6;
 	    res = 0;
 	    break;
 
+	case 'j':
+	    global.mkjpeg = atoi(val);
+	    res = 1;
+	    break;
+
 	case 'T':
 	    global.version = atoi(val);
 	    res = 1;
@@ -896,7 +946,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);
@@ -956,7 +1006,9 @@ int args_callback_option(char *arg, char *val)
 static struct options_t options[] = {
 {"r", "rate"},
 {"o", "output"},
+{"j", "jpeg"},
 {"z", "zlib"},
+{"T", "flashversion"},
 {"X", "pixel"},
 {"Y", "pixel"},
 {"v", "verbose"},
@@ -998,14 +1050,16 @@ 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("-j , --jpeg <quality>          Generate a lossy jpeg bitmap inside the SWF, with a given quality (1-100)\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 <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("-s , --scale <percent>         Scale image to <percent>%% size.\n");
     printf("\n");
 }
 
@@ -1018,7 +1072,7 @@ int main(int argc, char **argv)
 
     global.framerate = 1.0;
     global.verbose = 1;
-    global.version = 4;
+    global.version = 6;
     global.scale = 1.0;
 
     processargs(argc, argv);