return l;
}
-int swf_SetBlock(TAG * t,U8 * b,int l)
+int swf_SetBlock(TAG * t,const U8 * b,int l)
// Appends Block to the end of Tagdata, returns size
{ U32 newlen = t->len + l;
swf_ResetWriteBits(t);
}
void swf_SetFixed(TAG * t, double f)
{
- U16 fr = (U16)(f-(int)f)*65536;
+ U16 fr = (U16)((f-(int)f)*65536);
swf_SetU16(t, fr);
swf_SetU16(t, (U16)f - (f<0 && fr!=0));
}
}
void swf_SetFixed8(TAG * t, float f)
{
- U8 fr = (U8)(f-(int)f)*256;
+ U8 fr = (U8)((f-(int)f)*256);
swf_SetU8(t, fr);
swf_SetU8(t, (U8)f - (f<0 && fr!=0));
}
return 0;
}
+SRECT swf_ClipRect(SRECT border, SRECT r)
+{
+ if(r.xmax > border.xmax) r.xmax = border.xmax;
+ if(r.ymax > border.ymax) r.ymax = border.ymax;
+ if(r.xmax < border.xmin) r.xmax = border.xmin;
+ if(r.ymax < border.ymin) r.ymax = border.ymin;
+
+ if(r.xmin > border.xmax) r.xmin = border.xmax;
+ if(r.ymin > border.ymax) r.ymin = border.ymax;
+ if(r.xmin < border.xmin) r.xmin = border.xmin;
+ if(r.ymin < border.ymin) r.ymin = border.ymin;
+ return r;
+}
+
void swf_ExpandRect(SRECT*src, SPOINT add)
{
if((src->xmin | src->ymin | src->xmax | src->ymax)==0) {
return tag;
}
-int swf_DeleteTag(TAG * t)
-{ if (!t) return -1;
+TAG* swf_DeleteTag(SWF*swf, TAG * t)
+{
+ TAG*next = t->next;
+ if (swf && swf->firstTag==t)
+ swf->firstTag = t->next;
if (t->prev) t->prev->next = t->next;
if (t->next) t->next->prev = t->prev;
if (t->data) rfx_free(t->data);
rfx_free(t);
- return 0;
+ return next;
}
TAG * swf_ReadTag(reader_t*reader, TAG * prev)
t->id!=ST_DEFINEBITSJPEG&&t->id!=ST_DEFINEBITSJPEG2&&t->id!=ST_DEFINEBITSJPEG3);
if (writer)
- { if (short_tag)
+ {
+#ifdef MEASURE
+ int oldpos = writer->pos;
+#endif
+
+ if (short_tag)
{ raw[0] = SWAP16(len|((t->id&0x3ff)<<6));
if (writer->write(writer,raw,2)!=2)
{
#ifdef DEBUG_RFXSWF
else if (t->len) fprintf(stderr,"WriteTag(): Tag Data Error, id=%i\n",t->id);
#endif
+
+#ifdef MEASURE
+ writer->flush(writer);
+ printf("TAG %s costs %d bytes\n", swf_TagGetName(t), writer->pos-oldpos);
+#endif
}
return t->len+(short_tag?2:6);
if(t->id == ST_END)
level--;
t = swf_NextTag(t);
- swf_DeleteTag(tmp);
+ swf_DeleteTag(0, tmp);
}
while (t && level);
if(level)
#ifdef INSERT_RFX_TAG
if ((swf->firstTag && swf->firstTag->id != ST_REFLEX) &&
- (!swf->firstTag->next || swf->firstTag->next->id != ST_REFLEX))
+ (!swf->firstTag->next || (swf->firstTag->next->id != ST_REFLEX &&
+ (!swf->firstTag->next->next || (swf->firstTag->next->next->id!=ST_REFLEX)))))
{
swf_SetBlock(swf_InsertTagBefore(swf, swf->firstTag,ST_REFLEX),(U8*)"rfx",3);
}