X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfc.c;h=009a21564ef70e0d4037b15d53df3146202deec2;hb=3b178e342242bbacc6c9d620f4129b6acb6478ed;hp=40f011f5b4cc7b5e30ff025872f5f239b0b279ab;hpb=207ff1e0876ef04db4ab3e3cc34e49150aa33093;p=swftools.git

diff --git a/src/swfc.c b/src/swfc.c
index 40f011f..009a215 100644
--- a/src/swfc.c
+++ b/src/swfc.c
@@ -34,6 +34,7 @@
 #include "../lib/q.h"
 #include "parser.h"
 #include "wav.h"
+#include "../lib/png.h"
 
 //#define DEBUG
 
@@ -727,11 +728,13 @@ void s_frame(int nr, int cut, char*name)
 	if(t==nr-1 && name && *name) {
 	    tag = swf_InsertTag(tag, ST_FRAMELABEL);
 	    swf_SetString(tag, name);
+	    swf_SetU8(tag, 1); //make this an anchor
 	}
     }
     if(nr == 0 && currentframe == 0 && name) {
         tag = swf_InsertTag(tag, ST_FRAMELABEL);
         swf_SetString(tag, name);
+	swf_SetU8(tag, 1); //make this an anchor
     }
 
     if(cut) {
@@ -1020,12 +1023,7 @@ void s_image(char*name, char*type, char*filename, int quality)
     SRECT r;
     int imageID = id;
     int width, height;
-    if(type=="png") {
-	warning("image type \"png\" not supported yet!");
-	s_box(name, 0, 0, black, 20, 0);
-	return;
-    }
-    if(type=="jpeg") {
+    if(!strcmp(type,"jpeg")) {
 #ifndef HAVE_LIBJPEG
 	warning("no jpeg support compiled in");
 	s_box(name, 0, 0, black, 20, 0);
@@ -1048,6 +1046,31 @@ void s_image(char*name, char*type, char*filename, int quality)
 	s_addimage(name, id, tag, r);
 	incrementid();
 #endif
+    } else if(!strcmp(type,"png")) {
+	RGBA*data = 0;
+	swf_SetU16(tag, imageID);
+
+	getPNG(filename, &width, &height, (unsigned char**)&data);
+
+	if(!data) {
+	    syntaxerror("Image \"%s\" not found, or contains errors", filename);
+	}
+
+	/*tag = swf_AddImage(tag, imageID, data, width, height, quality)*/
+	tag = swf_InsertTag(tag, ST_DEFINEBITSLOSSLESS);
+	swf_SetU16(tag, imageID);
+	swf_SetLosslessImage(tag, data, width, height);
+
+	r.xmin = 0;
+	r.ymin = 0;
+	r.xmax = width*20;
+	r.ymax = height*20;
+	s_addimage(name, id, tag, r);
+	incrementid();
+    } else {
+	warning("image type \"%s\" not supported yet!", type);
+	s_box(name, 0, 0, black, 20, 0);
+	return;
     }
 
     /* step 2: the character */
@@ -1156,6 +1179,10 @@ void s_font(char*name, char*filename)
     font->id = id;
     tag = swf_InsertTag(tag, ST_DEFINEFONT2);
     swf_FontSetDefine2(tag, font);
+    tag = swf_InsertTag(tag, ST_EXPORTASSETS);
+    swf_SetU16(tag, 1);
+    swf_SetU16(tag, id);
+    swf_SetString(tag, name);
     incrementid();
 
     if(dictionary_lookup(&fonts, name))
@@ -1178,6 +1205,7 @@ void s_sound(char*name, char*filename)
     U16*samples;
     int numsamples;
     int t;
+    int blocksize = 1152;
 
     if(!readWAV(filename, &wav)) {
 	warning("Couldn't read wav file \"%s\"", filename);
@@ -1195,6 +1223,20 @@ void s_sound(char*name, char*filename)
 	}
 #endif
     }
+    
+    if(numsamples%blocksize != 0)
+    {
+	// apply padding, so that block is a multiple of blocksize
+	int numblocks = (numsamples+blocksize-1)/blocksize;
+	int numsamples2;
+	U16* samples2;
+	numsamples2 = numblocks * blocksize;
+	samples2 = malloc(sizeof(U16)*numsamples2);
+	memcpy(samples2, samples, numsamples*sizeof(U16));
+	memset(&samples2[numsamples], 0, sizeof(U16)*(numsamples2 - numsamples));
+	numsamples = numsamples2;
+	samples = samples2;
+    }
 
     tag = swf_InsertTag(tag, ST_DEFINESOUND);
     swf_SetU16(tag, id); //id