U32 oldTagPos;
U16 id = 0;
SRECT b1,b2;
+ memset(&b1, 0, sizeof(b1));
oldTagPos = swf_GetTagPos(t);
swf_SetTagPos(t,0);
}
num = swf_GetNumUsedIDs(tag);
- ptr = rfx_alloc(sizeof(int)*num);
- swf_GetUsedIDs(tag, ptr);
-
- for(t=0;t<num;t++) {
- int id = GET16(&tag->data[ptr[t]]);
- if(slaveids[id]<0) {
- fprintf(stderr, "swf_Relocate: Mapping id never encountered before: %d\n", id);
- return ;
+ if(num) {
+ ptr = rfx_alloc(sizeof(int)*num);
+ swf_GetUsedIDs(tag, ptr);
+
+ for(t=0;t<num;t++) {
+ int id = GET16(&tag->data[ptr[t]]);
+ if(slaveids[id]<0) {
+ fprintf(stderr, "swf_Relocate: Mapping id never encountered before: %d\n", id);
+ return ;
+ }
+ id = slaveids[id];
+ PUT16(&tag->data[ptr[t]], id);
}
- id = slaveids[id];
- PUT16(&tag->data[ptr[t]], id);
}
tag=tag->next;
}
a >>= 8;
a += tag->data[t]*0xefbc35a5*b*(t+1);
}
- return a&0x7fffffff; //always return unsigned
+ return a&0x7fffffff; //always return positive number
}
void swf_Optimize(SWF*swf)
FIXME: a better way would be to compare
the helper tags, too.
*/
- if(swf_isPseudoDefiningTag(tag)) {
- //dontremap[swf_GetDefineID(tag)] = 1; //FIXME
+ if(swf_isPseudoDefiningTag(tag) &&
+ tag->id != ST_NAMECHARACTER) {
+ dontremap[swf_GetDefineID(tag)] = 1;
}
tag=tag->next;
}
int doremap=1;
TAG*next = tag->next;
-
+
+ /* remap the tag */
+ int num = swf_GetNumUsedIDs(tag);
+ int*positions = rfx_alloc(sizeof(int)*num);
+ int t;
+ swf_GetUsedIDs(tag, positions);
+ for(t=0;t<num;t++) {
+ int id = GET16(&tag->data[positions[t]]);
+ id = remap[id];
+ PUT16(&tag->data[positions[t]], id);
+ }
+ rfx_free(positions);
+ tag = tag->next;
+
+ /* now look for previous tags with the same
+ content */
if(swf_isDefiningTag(tag)) {
TAG*tag2;
int id = swf_GetDefineID(tag);
}
}
- if(doremap)
- {
- int num = swf_GetNumUsedIDs(tag);
- int*positions = rfx_alloc(sizeof(int)*num);
- int t;
- swf_GetUsedIDs(tag, positions);
- for(t=0;t<num;t++) {
- int id = GET16(&tag->data[positions[t]]);
- id = remap[id];
- PUT16(&tag->data[positions[t]], id);
- }
- rfx_free(positions);
- tag = tag->next;
- }
-
tag = next;
}
rfx_free(dontremap);