X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Frfxswf.c;h=ca87274c6113fa644307e687bd71f118ea7a36ef;hb=cc29df1f6cd189f1a5845f1813ca47aa7cbf960a;hp=441e19dd74eb4a278a73449e74233f37ca8287e2;hpb=1b376de4a5d3ee2905cf962ecbde7766616d5347;p=swftools.git

diff --git a/lib/rfxswf.c b/lib/rfxswf.c
index 441e19d..ca87274 100644
--- a/lib/rfxswf.c
+++ b/lib/rfxswf.c
@@ -65,11 +65,6 @@ U32   swf_GetTagLen(TAG * t) { return t->len; }
 U8*   swf_GetTagLenPtr(TAG * t) { return &(t->data[t->len]); }
 U32   swf_GetTagPos(TAG * t)   { return t->pos; }
 
-// Basic Data Access Functions
-
-#define swf_ResetReadBits(tag)   if (tag->readBit)  { tag->pos++; tag->readBit = 0; }
-#define swf_ResetWriteBits(tag)  if (tag->writeBit) { tag->writeBit = 0; }
-
 // for future purpose: avoid high level lib functions to change tagpos/bitpos
 
 #define swf_SaveTagPos(tag)
@@ -422,6 +417,14 @@ int swf_SetRect(TAG * t,SRECT * r)
 
 void swf_ExpandRect(SRECT*src, SPOINT add)
 {
+    if((src->xmin | src->ymin | src->xmax | src->ymax)==0) {
+	src->xmin = add.x;
+	src->ymin = add.y;
+	src->xmax = add.x;
+	src->ymax = add.y;
+	if((add.x|add.y) == 0) src->xmax++; //make sure the bbox is not NULL anymore
+	return;
+    }
     if(add.x < src->xmin)
 	src->xmin = add.x;
     if(add.x > src->xmax)
@@ -446,6 +449,25 @@ void swf_ExpandRect2(SRECT*src, SRECT*add)
     if(add->ymax > src->ymax)
 	src->ymax = add->ymax;
 }
+void swf_ExpandRect3(SRECT*src, SPOINT center, int radius)
+{
+    if((src->xmin | src->ymin | src->xmax | src->ymax)==0) {
+	src->xmin = center.x-radius;
+	src->ymin = center.y-radius;
+	src->xmax = center.x+radius;
+	src->ymax = center.y+radius;
+	if((center.x|center.y|radius) == 0) src->xmax++; //make sure the bbox is not NULL anymore
+	return;
+    }
+    if(center.x - radius < src->xmin)
+	src->xmin = center.x - radius;
+    if(center.x + radius > src->xmax)
+	src->xmax = center.x - radius;
+    if(center.y - radius < src->ymin)
+	src->ymin = center.y - radius;
+    if(center.y + radius > src->ymax)
+	src->ymax = center.y - radius;
+}
 SPOINT swf_TurnPoint(SPOINT p, MATRIX* m)
 {
     SPOINT r;
@@ -865,7 +887,7 @@ int swf_WriteTag2(struct writer_t*writer, TAG * t)
 
   len = (t->id==ST_DEFINESPRITE)?swf_DefineSprite_GetRealSize(t):t->len;
 
-  short_tag = len<0x3f;
+  short_tag = len<0x3f&&(t->id!=ST_DEFINEBITSLOSSLESS&&t->id!=ST_DEFINEBITSLOSSLESS2);
 
   if (writer)
   { if (short_tag)
@@ -1042,7 +1064,7 @@ void swf_FoldSprite(TAG * t)
 
   do
   { 
-    if(t->len<0x3f) {
+    if(t->len<0x3f&&t->id!=ST_DEFINEBITSLOSSLESS&&t->id!=ST_DEFINEBITSLOSSLESS2) {
 	swf_SetU16(sprtag,t->len|(t->id<<6));
     } else {
 	swf_SetU16(sprtag,0x3f|(t->id<<6));