X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswftools.c;h=fbc6bb78ac0c90a71ed50cb220c8fe7d7c2f6128;hb=0389433248293338bb20bc0e2a2e62e38cbd0c1b;hp=163d85574288b1f057e69379d0920bf22180d83a;hpb=c4865209253f1606b0d4985e8fa6e4e33eaf1b8c;p=swftools.git

diff --git a/lib/modules/swftools.c b/lib/modules/swftools.c
index 163d855..fbc6bb7 100644
--- a/lib/modules/swftools.c
+++ b/lib/modules/swftools.c
@@ -26,8 +26,11 @@
 #define S64 long long
 SFIXED RFXSWF_SP(SFIXED a1,SFIXED a2,SFIXED b1,SFIXED b2)
 { S64 a;
-  a = (S64)a1*(S64)b1+(S64)a2*(S64)b2;
-  return (SFIXED)(a>>16);
+  a = ((S64)a1*(S64)b1+(S64)a2*(S64)b2)>>16;
+  SFIXED result = (SFIXED)(a);
+  if(a!=result) 
+      fprintf(stderr, "Warning: overflow in matrix multiplication");
+  return result;
 }
 SFIXED RFXSWF_QFIX(int zaehler,int nenner) // bildet Quotient von zwei INTs in SFIXED
 { S64 z = zaehler<<16;
@@ -42,8 +45,8 @@ MATRIX * swf_MatrixJoin(MATRIX * d,MATRIX * s1,MATRIX * s2)
   if (!s1) return (s2)?(MATRIX *)memcpy(d,s2,sizeof(MATRIX)):NULL;
   if (!s2) return (MATRIX *)memcpy(d,s1,sizeof(MATRIX));
   
-  d->tx = RFXSWF_SP(s1->sx,s1->r1,s2->tx,s2->ty);
-  d->ty = RFXSWF_SP(s1->r0,s1->sy,s2->tx,s2->ty);
+  d->tx = s1->tx + RFXSWF_SP(s1->sx,s1->r1,s2->tx,s2->ty);
+  d->ty = s1->ty + RFXSWF_SP(s1->r0,s1->sy,s2->tx,s2->ty);
   
   d->sx = RFXSWF_SP(s1->sx,s1->r1,s2->sx,s2->r0);
   d->r0 = RFXSWF_SP(s1->r0,s1->sy,s2->sx,s2->r0);
@@ -483,7 +486,7 @@ void enumerateUsedIDs(TAG * tag, int base, void (*callback)(TAG*, int, void*), v
     tag->pos = 0;
     switch(tag->id)
     {
-	case ST_DEFINEBUTTONCXFORM: {
+	case ST_DEFINEBUTTONSOUND: {
 	    int t;
 	    callback(tag, tag->pos + base, callback_data);
 	    for(t=0;t<4;t++) {
@@ -510,7 +513,7 @@ void enumerateUsedIDs(TAG * tag, int base, void (*callback)(TAG*, int, void*), v
 		}
 	    }
         } break;
-	case ST_DEFINEBUTTONSOUND:
+	case ST_DEFINEBUTTONCXFORM:
 	    callback(tag, tag->pos + base, callback_data); //button id
 	break;
 
@@ -626,39 +629,39 @@ void enumerateUsedIDs(TAG * tag, int base, void (*callback)(TAG*, int, void*), v
 	    advancebits = swf_GetU8(tag); //advancebits
 	    while(1) {
 		U16 flags;
+		int t;
 		swf_ResetReadBits(tag);
 		flags = swf_GetBits(tag, 8);
 		if(!flags) break;
-		if(flags & 128) // text style record
-		{
+		
+		swf_ResetReadBits(tag);
+		if(flags & 8) { // hasfont
+		    callback(tag, tag->pos + base, callback_data);
+		    id = swf_GetU16(tag);
+		}
+		if(flags & 4) { // hascolor
+		    if(num==1) swf_GetRGB(tag, NULL);
+		    else       swf_GetRGBA(tag, NULL);
+		}
+		if(flags & 2) { //has x offset
 		    swf_ResetReadBits(tag);
-		    if(flags & 8) { // hasfont
-			callback(tag, tag->pos + base, callback_data);
-			id = swf_GetU16(tag);
-		    }
-		    if(flags & 4) { // hascolor
-			if(num==1) swf_GetRGB(tag, NULL);
-			else       swf_GetRGBA(tag, NULL);
-		    }
-		    if(flags & 2) { //has x offset
-			swf_ResetReadBits(tag);
-			swf_GetU16(tag);
-		    }
-		    if(flags & 1) { //has y offset
-			swf_ResetReadBits(tag);
-			swf_GetU16(tag);
-		    }
-		    if(flags & 8) { //has height
-			swf_ResetReadBits(tag);
-			swf_GetU16(tag);
-		    }
-		} else { // glyph record
-		    int t;
+		    swf_GetU16(tag);
+		}
+		if(flags & 1) { //has y offset
 		    swf_ResetReadBits(tag);
-		    for(t=0;t<flags;t++) {
-			swf_GetBits(tag, glyphbits);
-			swf_GetBits(tag, advancebits);
-		    }
+		    swf_GetU16(tag);
+		}
+		if(flags & 8) { //has height
+		    swf_ResetReadBits(tag);
+		    swf_GetU16(tag);
+		}
+		
+		flags = swf_GetBits(tag, 8);
+		if(!flags) break;
+		swf_ResetReadBits(tag);
+		for(t=0;t<flags;t++) {
+		    swf_GetBits(tag, glyphbits);
+		    swf_GetBits(tag, advancebits);
 		}
 	    }
 	    break;
@@ -883,6 +886,22 @@ void swf_RelocateDepth(SWF*swf, char*bitmap)
 	/* TODO * clip depths 
 	        * sprites
 	 */
+	if(tag->id == ST_PLACEOBJECT2) {
+	    SWFPLACEOBJECT obj;
+	    swf_GetPlaceObject(tag, &obj);
+	    if(obj.clipdepth) {
+		int newdepth = obj.clipdepth+nr;
+		if(newdepth>65535) {
+		    fprintf(stderr, "Couldn't relocate depths: too large values\n");
+		    newdepth = 65535;
+		}
+		obj.clipdepth = newdepth;
+		swf_ResetTag(tag, ST_PLACEOBJECT2);
+		swf_SetPlaceObject(tag, &obj);
+	    }
+	    swf_PlaceObjectFree(&obj);
+	}
+
 	int depth = swf_GetDepth(tag);
 	if(depth>=0) {
 	    int newdepth = depth+nr;
@@ -920,6 +939,15 @@ U8 swf_isTextTag(TAG*tag)
     return 0;
 }
 
+U8 swf_isFontTag(TAG*tag)
+{
+    if(tag->id == ST_DEFINEFONT ||
+       tag->id == ST_DEFINEFONT2 ||
+       tag->id == ST_DEFINEFONTINFO)
+        return 1;
+    return 0;
+}
+
 U8  swf_isImageTag(TAG*tag)
 {
     if(tag->id == ST_DEFINEBITSJPEG ||