X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fmodules%2Fswftools.c;h=63943c73d0ae1cdbe00b9f9f843ea18f3374f05e;hb=965fb2d8ab551a8544f85bf1ab7441bcd0c7c2c5;hp=3aadf8d2c171d325a4ab3bca586b8af4e757c992;hpb=22e7dba47e27d130a2720ea9ca256867fa67ee21;p=swftools.git

diff --git a/lib/modules/swftools.c b/lib/modules/swftools.c
index 3aadf8d..63943c7 100644
--- a/lib/modules/swftools.c
+++ b/lib/modules/swftools.c
@@ -25,8 +25,7 @@
 
 #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)>>16;
+{ S64 a = ((S64)a1*(S64)b1+(S64)a2*(S64)b2)>>16;
   SFIXED result = (SFIXED)(a);
   if(a!=result) 
       fprintf(stderr, "Warning: overflow in matrix multiplication");
@@ -99,6 +98,7 @@ U16 swf_GetDefineID(TAG * t)
   { case ST_DEFINESHAPE:
     case ST_DEFINESHAPE2:
     case ST_DEFINESHAPE3:
+    case ST_DEFINESHAPE4:
     case ST_DEFINEMORPHSHAPE:
     case ST_DEFINEEDITTEXT:
     case ST_DEFINEBITS:
@@ -106,14 +106,18 @@ U16 swf_GetDefineID(TAG * t)
     case ST_DEFINEBITSJPEG3:
     case ST_DEFINEBITSLOSSLESS:
     case ST_DEFINEBITSLOSSLESS2:
+    case ST_DEFINESCALINGGRID: //pseudodefine
     case ST_DEFINEBUTTON:
     case ST_DEFINEBUTTON2:
     case ST_DEFINEBUTTONCXFORM: //pseudodefine
     case ST_DEFINEBUTTONSOUND: //pseudodefine
+    case ST_CSMTEXTSETTINGS: //pseudodefine
     case ST_DEFINEFONT:
     case ST_DEFINEFONT2:
+    case ST_DEFINEFONT3:
     case ST_DEFINEFONTINFO: //pseudodefine
     case ST_DEFINEFONTINFO2: //pseudodefine
+    case ST_DEFINEFONTALIGNZONES: //pseudodefine
     case ST_DEFINETEXT:
     case ST_DEFINETEXT2:
     case ST_DEFINESOUND:
@@ -211,9 +215,11 @@ static int swf_definingtagids[] =
 {ST_DEFINESHAPE,
  ST_DEFINESHAPE2,
  ST_DEFINESHAPE3,
+ ST_DEFINESHAPE4,
  ST_DEFINEMORPHSHAPE,
  ST_DEFINEFONT,
  ST_DEFINEFONT2,
+ ST_DEFINEFONT3,
  ST_DEFINETEXT,
  ST_DEFINETEXT2,
  ST_DEFINEEDITTEXT,
@@ -248,12 +254,16 @@ static int swf_spritetagids[] =
  -1
 };
 
+/* tags which add content or information to a character with a given ID */
 static int swf_pseudodefiningtagids[] = 
 {
  ST_DEFINEFONTINFO,
  ST_DEFINEFONTINFO2,
+ ST_DEFINEFONTALIGNZONES,
  ST_DEFINEBUTTONCXFORM,
  ST_DEFINEBUTTONSOUND,
+ ST_DEFINESCALINGGRID,
+ ST_CSMTEXTSETTINGS,
  ST_NAMECHARACTER,
  ST_DOINITACTION,
  ST_VIDEOFRAME,
@@ -363,8 +373,11 @@ char* swf_GetName(TAG * t)
         case ST_FRAMELABEL:
             name = &t->data[swf_GetTagPos(t)];
         break;
+        case ST_PLACEOBJECT3:
         case ST_PLACEOBJECT2: {   
             U8 flags = swf_GetU8(t);
+	    if(t->id == ST_PLACEOBJECT3)
+		swf_GetU8(t);
             swf_GetU16(t); //depth;
             if(flags&PF_CHAR) 
               swf_GetU16(t); //id
@@ -433,7 +446,7 @@ void enumerateUsedIDs_styles(TAG * tag, void (*callback)(TAG*, int, void*), void
 	    else 
 		{swf_GetRGB(tag, NULL);if(morph) swf_GetRGB(tag, NULL);}
 	}
-	else if(type == 0x10 || type == 0x12)
+	else if(type == 0x10 || type == 0x12 || type == 0x13)
 	{
 	    swf_ResetReadBits(tag);
 	    swf_GetMatrix(tag, NULL);
@@ -445,7 +458,7 @@ void enumerateUsedIDs_styles(TAG * tag, void (*callback)(TAG*, int, void*), void
 	    else
 		swf_GetGradient(tag, NULL, /*alpha*/ num>=3?1:0);
 	}
-	else if(type == 0x40 || type == 0x41)
+	else if(type == 0x40 || type == 0x41 || type == 0x42 || type == 0x43)
 	{
 	    swf_ResetReadBits(tag);
 	    // we made it.
@@ -527,6 +540,20 @@ void enumerateUsedIDs(TAG * tag, int base, void (*callback)(TAG*, int, void*), v
 	    }
 	} break;
 
+	case ST_IMPORTASSETS: 
+	case ST_IMPORTASSETS2: {
+	    swf_GetString(tag); //count
+	    swf_GetU8(tag); //reserved
+	    swf_GetU8(tag); //reserved
+	    int num =  swf_GetU16(tag); //url
+	    int t;
+	    for(t=0;t<num;t++) {
+		callback(tag, tag->pos + base, callback_data); //button id
+		swf_GetU16(tag); //id
+		while(swf_GetU8(tag)); //name
+	    }
+	} break;
+
 	case ST_FREECHARACTER: /* unusual tags, which all start with an ID */
 	case ST_NAMECHARACTER:
 	case ST_GENERATORTEXT:
@@ -541,6 +568,12 @@ void enumerateUsedIDs(TAG * tag, int base, void (*callback)(TAG*, int, void*), v
 		break;
 	    callback(tag, 3 + base, callback_data);
         break;
+	case ST_PLACEOBJECT3:
+	    // only if placeflaghascharacter
+	    if(!(tag->data[0]&2))
+		break;
+	    callback(tag, 4 + base, callback_data);
+        break;
 	case ST_REMOVEOBJECT:
 	    callback(tag, tag->pos + base, callback_data);
 	break;
@@ -666,7 +699,10 @@ void enumerateUsedIDs(TAG * tag, int base, void (*callback)(TAG*, int, void*), v
 	    }
 	    break;
 	}
+	case ST_DEFINEFONTALIGNZONES:
+	case ST_DEFINESCALINGGRID:
 	case ST_GLYPHNAMES:
+	case ST_CSMTEXTSETTINGS:
 	case ST_DEFINEFONTINFO:
 	case ST_DEFINEFONTINFO2:
 	case ST_VIDEOFRAME:
@@ -680,6 +716,8 @@ void enumerateUsedIDs(TAG * tag, int base, void (*callback)(TAG*, int, void*), v
 	break;
 
 	case ST_DEFINEMORPHSHAPE:
+	case ST_DEFINESHAPE4:
+	num++;
 	case ST_DEFINESHAPE3:
 	num++; //fallthrough
 	case ST_DEFINESHAPE2:
@@ -696,10 +734,18 @@ void enumerateUsedIDs(TAG * tag, int base, void (*callback)(TAG*, int, void*), v
 	    }
 
 	    id = swf_GetU16(tag); // id;
-	    swf_GetRect(tag, NULL); // bounds
+	    swf_GetRect(tag, NULL); // shape bounds
 	    if(morph) {
 		swf_ResetReadBits(tag);
-		swf_GetRect(tag, NULL); // bounds2
+		swf_GetRect(tag, NULL); // shape bounds2
+		if(num==4)
+		    swf_GetRect(tag, NULL); // edge bounds1
+	    }
+	    if(num>=4) {
+		swf_GetRect(tag, NULL); // edge bounds
+		swf_GetU8(tag); // flags, &1: contains scaling stroke, &2: contains non-scaling stroke
+	    }
+	    if(morph) {
 		swf_GetU32(tag); //offset to endedges
 	    }
    
@@ -868,6 +914,36 @@ void swf_Relocate (SWF*swf, char*bitmap)
     }
 }
 
+/* untested */
+void swf_Relocate2(SWF*swf, int*id2id)
+{
+    TAG*tag;
+    tag = swf->firstTag;
+    while(tag) {
+	if(swf_isDefiningTag(tag)) {
+	    int id = swf_GetDefineID(tag);
+	    id = id2id[id];
+	    if(id>=0) {
+		swf_SetDefineID(tag, id);
+	    }
+	}
+	int num = swf_GetNumUsedIDs(tag);
+	if(num) {
+	    int *ptr;
+	    int t;
+	    ptr = rfx_alloc(sizeof(int)*num);
+	    swf_GetUsedIDs(tag, ptr);
+	    for(t=0;t<num;t++) {
+		int id = GET16(&tag->data[ptr[t]]);
+		id = id2id[id];
+		if(id>=0) {
+		    PUT16(&tag->data[ptr[t]], id);
+		}
+	    }
+	}
+    }
+}
+
 void swf_RelocateDepth(SWF*swf, char*bitmap)
 {
     TAG*tag;
@@ -883,10 +959,27 @@ void swf_RelocateDepth(SWF*swf, char*bitmap)
 
     while(tag)
     {
+	int depth;
 	/* TODO * clip depths 
 	        * sprites
 	 */
-	int depth = swf_GetDepth(tag);
+	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);
+	}
+
+	depth = swf_GetDepth(tag);
 	if(depth>=0) {
 	    int newdepth = depth+nr;
 	    if(newdepth>65535) {
@@ -903,7 +996,8 @@ U8 swf_isShapeTag(TAG*tag)
 {
     if(tag->id == ST_DEFINESHAPE ||
        tag->id == ST_DEFINESHAPE2 ||
-       tag->id == ST_DEFINESHAPE3) 
+       tag->id == ST_DEFINESHAPE3 ||
+       tag->id == ST_DEFINESHAPE4) 
         return 1;
     return 0;
 }
@@ -911,7 +1005,8 @@ U8 swf_isShapeTag(TAG*tag)
 U8 swf_isPlaceTag(TAG*tag)
 {
     if(tag->id == ST_PLACEOBJECT ||
-       tag->id == ST_PLACEOBJECT2)
+       tag->id == ST_PLACEOBJECT2 ||
+       tag->id == ST_PLACEOBJECT3)
         return 1;
     return 0;
 }
@@ -1029,8 +1124,6 @@ void swf_Optimize(SWF*swf)
     }
     tag = swf->firstTag;
     while(tag) {
-        int doremap=1;
-        
         TAG*next = tag->next;
 
         /* remap the tag */
@@ -1044,7 +1137,6 @@ void swf_Optimize(SWF*swf)
             PUT16(&tag->data[positions[t]], id);
         }
         rfx_free(positions);
-        tag = tag->next;
 
         /* now look for previous tags with the same
            content */
@@ -1055,22 +1147,11 @@ void swf_Optimize(SWF*swf)
             int match=0;
             if(!dontremap[id]) 
             while((tag2 = hashmap[hash%hash_size])) {
-                if(tag2 != (TAG*)(-1) && tag->len == tag2->len) {
-                    int t;
-                    /* start at pos 2, as 0 and 1 are the id */
-                    for(t=2;t<tag->len;t++) {
-                        if(tag->data[t] != tag2->data[t])
-                            break;
-                    }
-                    if(t == tag->len) {
-                        match=1;
-                    }
-                }
-                if(match) {
-                    /* we found two identical tags- remap one
-                       of them */
-                    remap[id] = swf_GetDefineID(tag2);
-                    break;
+                if(tag2 != (TAG*)0 && tag->len == tag2->len) {
+		    if(memcmp(&tag->data[2],&tag2->data[2],tag->len-2) == 0) {
+			match = 1;
+			break;
+		    }
                 }
                 hash++;
             }
@@ -1078,10 +1159,12 @@ void swf_Optimize(SWF*swf)
                 while(hashmap[hash%hash_size]) hash++;
                 hashmap[hash%hash_size] = tag;
             } else {
+		/* we found two identical tags- remap one
+		   of them */
+                remap[id] = swf_GetDefineID(tag2);
                 swf_DeleteTag(tag);
                 if(tag == swf->firstTag)
                     swf->firstTag = next;
-                doremap = 0;
             }
         } else if(swf_isPseudoDefiningTag(tag)) {
             int id = swf_GetDefineID(tag);
@@ -1092,12 +1175,12 @@ void swf_Optimize(SWF*swf)
                 swf_DeleteTag(tag);
                 if(tag == swf->firstTag)
                     swf->firstTag = next;
-                doremap = 0;
             }
         }
 
         tag = next;
     }
+    
     rfx_free(dontremap);
     rfx_free(remap);
     rfx_free(id2tag);