#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);
+{ 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");
+ return result;
}
SFIXED RFXSWF_QFIX(int zaehler,int nenner) // bildet Quotient von zwei INTs in SFIXED
{ S64 z = zaehler<<16;
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);
{ case ST_DEFINESHAPE:
case ST_DEFINESHAPE2:
case ST_DEFINESHAPE3:
+ case ST_DEFINESHAPE4:
case ST_DEFINEMORPHSHAPE:
case ST_DEFINEEDITTEXT:
case ST_DEFINEBITS:
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:
{ST_DEFINESHAPE,
ST_DEFINESHAPE2,
ST_DEFINESHAPE3,
+ ST_DEFINESHAPE4,
ST_DEFINEMORPHSHAPE,
ST_DEFINEFONT,
ST_DEFINEFONT2,
+ ST_DEFINEFONT3,
ST_DEFINETEXT,
ST_DEFINETEXT2,
ST_DEFINEEDITTEXT,
-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,
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
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);
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.
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++) {
}
}
} break;
- case ST_DEFINEBUTTONSOUND:
+ case ST_DEFINEBUTTONCXFORM:
callback(tag, tag->pos + base, callback_data); //button id
break;
}
} 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:
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;
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;
}
+ case ST_DEFINEFONTALIGNZONES:
+ case ST_DEFINESCALINGGRID:
case ST_GLYPHNAMES:
+ case ST_CSMTEXTSETTINGS:
case ST_DEFINEFONTINFO:
case ST_DEFINEFONTINFO2:
case ST_VIDEOFRAME:
break;
case ST_DEFINEMORPHSHAPE:
+ case ST_DEFINESHAPE4:
+ num++;
case ST_DEFINESHAPE3:
num++; //fallthrough
case ST_DEFINESHAPE2:
}
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
}
}
}
+/* 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;
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) {
{
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;
}
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;
}
}
tag = swf->firstTag;
while(tag) {
- int doremap=1;
-
TAG*next = tag->next;
/* remap the tag */
PUT16(&tag->data[positions[t]], id);
}
rfx_free(positions);
- tag = tag->next;
/* now look for previous tags with the same
content */
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++;
}
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);
swf_DeleteTag(tag);
if(tag == swf->firstTag)
swf->firstTag = next;
- doremap = 0;
}
}
tag = next;
}
+
rfx_free(dontremap);
rfx_free(remap);
rfx_free(id2tag);
git.asbjorn.biz / swftools.git / blobdiff