X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fpng2swf.c;h=d3247d8d263090954a67fd5a0c44b3336c1e9805;hb=f03de7ce28ee2c39fdb9f658359359429135c862;hp=47369398a122f4b69e7670b63ae74089ac883b26;hpb=287d3c4c457dcbe7b7dc1ddc3a63cc80cd390e71;p=swftools.git

diff --git a/src/png2swf.c b/src/png2swf.c
index 4736939..d3247d8 100644
--- a/src/png2swf.c
+++ b/src/png2swf.c
@@ -42,7 +42,7 @@ TAG *MovieStart(SWF * swf, int framerate, int dx, int dy)
 
     memset(swf, 0x00, sizeof(SWF));
 
-    swf->fileVersion = 4;
+    swf->fileVersion = 5;
     swf->frameRate = (25600 / framerate);
     swf->movieSize.xmax = dx * 20;
     swf->movieSize.ymax = dy * 20;
@@ -50,6 +50,7 @@ TAG *MovieStart(SWF * swf, int framerate, int dx, int dy)
     t = swf->firstTag = swf_InsertTag(NULL, ST_SETBACKGROUNDCOLOR);
 
     rgb.r = rgb.g = rgb.b = rgb.a = 0x00;
+    //rgb.g = 0xff; <--- handy for testing alpha conversion
     swf_SetRGB(t, &rgb);
 
     return t;
@@ -65,7 +66,7 @@ int MovieFinish(SWF * swf, TAG * t, char *sname)
     else {
 	if (!sname)
 	    sname = "output.swf";
-	handle = open(sname, O_RDWR | O_CREAT | O_TRUNC, 0666);
+	handle = open(sname, O_BINARY | O_RDWR | O_CREAT | O_TRUNC, 0666);
     }
     if FAILED
 	(swf_WriteSWF(handle, swf)) if (VERBOSE(1))
@@ -149,11 +150,11 @@ int png_read_header(FILE*fi, struct png_header*header)
 	    f = data[11];     // filter mode (0)
 	    i = data[12];     // interlace mode (0)
 
-	    if(b!=2 && b!=3) {
+	    if(b!=2 && b!=3 && b!=6) {
 		fprintf(stderr, "Image mode %d not supported!\n", b);
 		exit(1);
 	    }
-	    if(a!=8 && b==2) {
+	    if(a!=8 && (b==2 || b==6)) {
 		fprintf(stderr, "Bpp %d in mode %d not supported!\n", a);
 		exit(1);
 	    }
@@ -199,7 +200,7 @@ byte inline PaethPredictor (byte a,byte b,byte c)
         else return c;
 }
 
-void applyfilter(int mode, U8*src, U8*old, U8*dest, int width)
+void applyfilter3(int mode, U8*src, U8*old, U8*dest, int width)
 {
     int x;
     unsigned char lastr=0;
@@ -277,6 +278,89 @@ void applyfilter(int mode, U8*src, U8*old, U8*dest, int width)
 
 }
 
+void applyfilter4(int mode, U8*src, U8*old, U8*dest, int width)
+{
+    int x;
+    unsigned char lastr=0;
+    unsigned char lastg=0;
+    unsigned char lastb=0;
+    unsigned char lasta=0;
+    unsigned char upperlastr=0;
+    unsigned char upperlastg=0;
+    unsigned char upperlastb=0;
+    unsigned char upperlasta=0;
+
+    if(mode==0) {
+	for(x=0;x<width;x++) {
+	    dest[0] = src[3];
+	    dest[1] = src[0];
+	    dest[2] = src[1];
+	    dest[3] = src[2];
+	    dest+=4;
+	    src+=4;
+	}
+    }
+    else if(mode==1) {
+	for(x=0;x<width;x++) {
+	    dest[0] = src[3]+lasta;
+	    dest[1] = src[0]+lastr;
+	    dest[2] = src[1]+lastg;
+	    dest[3] = src[2]+lastb;
+	    lasta = dest[0];
+	    lastr = dest[1];
+	    lastg = dest[2];
+	    lastb = dest[3];
+	    dest+=4;
+	    src+=4;
+	}
+    }
+    else if(mode==2) {
+	for(x=0;x<width;x++) {
+	    dest[0] = src[3]+old[0];
+	    dest[1] = src[0]+old[1];
+	    dest[2] = src[1]+old[2];
+	    dest[3] = src[2]+old[3];
+	    dest+=4;
+	    old+=4;
+	    src+=4;
+	}
+    }
+    else if(mode==3) {
+	for(x=0;x<width;x++) {
+	    dest[0] = src[3]+(old[0]+lasta)/2;
+	    dest[1] = src[0]+(old[1]+lastr)/2;
+	    dest[2] = src[1]+(old[2]+lastg)/2;
+	    dest[3] = src[2]+(old[3]+lastb)/2;
+	    lastr = dest[1];
+	    lastg = dest[2];
+	    lastb = dest[3];
+	    dest+=4;
+	    old+=4;
+	    src+=4;
+	}
+    }
+    else if(mode==4) {
+	for(x=0;x<width;x++) {
+	    dest[0] = src[3]+PaethPredictor(lasta,old[0],upperlasta);
+	    dest[1] = src[0]+PaethPredictor(lastr,old[1],upperlastr);
+	    dest[2] = src[1]+PaethPredictor(lastg,old[2],upperlastg);
+	    dest[3] = src[2]+PaethPredictor(lastb,old[3],upperlastb);
+	    lasta = dest[0];
+	    lastr = dest[1];
+	    lastg = dest[2];
+	    lastb = dest[3];
+	    upperlasta = old[0];
+	    upperlastr = old[1];
+	    upperlastg = old[2];
+	    upperlastb = old[3];
+	    dest+=4;
+	    old+=4;
+	    src+=4;
+	}
+    }    
+
+}
+
 void applyfilter1(int mode, U8*src, U8*old, U8*dest, int width)
 {
     int x;
@@ -364,6 +448,8 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
     else
     if(header.mode == 2) bypp = 3;
     else
+    if(header.mode == 6) bypp = 4;
+    else
 	return 0;
     imagedatalen = bypp * header.width * header.height + 65536;
     imagedata = malloc(imagedatalen);
@@ -421,12 +507,14 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
 	t = swf_InsertTag(t, ST_DEFINEBITSLOSSLESS);
 
     swf_SetU16(t, id);		// id
-    if(header.mode == 2) {
+    if(header.mode == 2 || header.mode == 6) {
 	U8*data2 = malloc(header.width*header.height*4);
 	int i,s=0;
 	int x,y;
 	int pos=0;
-	/* 24->32 bit conversion */
+	int opaque=0;
+	int transparent=0;
+	/* in case for mode 2, the following also performs 24->32 bit conversion */
 	for(y=0;y<header.height;y++) {
 	    int mode = imagedata[pos++]; //filter mode
 	    U8*src;
@@ -438,7 +526,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
 	    {
 		/* one byte per pixel */
 		src = &imagedata[pos];
-		pos+=header.width*3;
+		pos+=header.width*(header.mode==6?4:3);
 	    } else {
 		/* not implemented yet */
 		exit(1);
@@ -450,9 +538,42 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
 	    } else {
 		old = &data2[(y-1)*header.width*4];
 	    }
-	    applyfilter(mode, src, old, dest, header.width);
+	    if(header.mode==6)
+		applyfilter4(mode, src, old, dest, header.width);
+	    else
+		applyfilter3(mode, src, old, dest, header.width);
+	}
+
+#ifdef HAVE_LIBJPEG
+	/* the image is now compressed and stored in data. Now let's take
+	   a look at the alpha values to determine which bitmap type we
+	   should write */
+	if(header.mode == 6)
+	for(y=0;y<header.height;y++) {
+	    U8*l = &data2[(y*header.width)*4];
+	    for(x=0;x<header.width;x++) {
+		if(l[x*4+0]==255) transparent++;
+		if(l[x*4+0]==0) opaque++;
+	    }
+	}
+	/* mode 6 images which are not fully opaque or fully transparent
+	   will be stored as definejpeg3 */
+	if(header.mode == 6 && transparent != header.width*header.height
+		            && opaque != header.width*header.height) {
+	   
+	    printf("Image has transparency information. Storing as DefineBitsJpeg3 Tag (jpeg+alpha)\n");
+
+	    // we always use quality 100, since png2swf is expected to
+	    // use more or less lossless compression
+	    
+	    swf_SetJPEGBits3(t, header.width, header.height, (RGBA*)data2, 100);
+	    t->id = ST_DEFINEBITSJPEG3;
+	} 
+	else
+#endif
+	{
+	    swf_SetLosslessBits(t, header.width, header.height, data2, BMF_32BIT);
 	}
-	swf_SetLosslessBits(t, header.width, header.height, data2, BMF_32BIT);
 	free(data2);
     }
     else {
@@ -522,7 +643,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
 	free(data2);
     }
 
-    t = swf_InsertTag(t, ST_DEFINESHAPE);
+    t = swf_InsertTag(t, ST_DEFINESHAPE3);
 
     swf_ShapeNew(&s);
     swf_GetMatrix(NULL, &m);
@@ -548,14 +669,14 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, char *sname, int id)
     swf_ShapeSetEnd(t);
 
     t = swf_InsertTag(t, ST_REMOVEOBJECT2);
-    swf_SetU16(t, 1);		// depth
+    swf_SetU16(t, 50);		// depth
 
     t = swf_InsertTag(t, ST_PLACEOBJECT2);
 
     swf_GetMatrix(NULL, &m);
     m.tx = (swf->movieSize.xmax - (int) header.width * 20) / 2;
     m.ty = (swf->movieSize.ymax - (int) header.height * 20) / 2;
-    swf_ObjectPlace(t, id + 1, 1, &m, NULL, NULL);
+    swf_ObjectPlace(t, id + 1, 50, &m, NULL, NULL);
 
     t = swf_InsertTag(t, ST_SHOWFRAME);