X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Frfxswf.c;h=061010b0d83a0a6dad55d3e8776aef2fea78cbc8;hb=1f9f467ef90391c81c31da7f6b5ed2131443a1fe;hp=9b3c51ed6be0cbc571afaf216326b83f4304327d;hpb=bb3b7773036c333bc4179b8f415a886c8c53c42e;p=swftools.git

diff --git a/lib/rfxswf.c b/lib/rfxswf.c
index 9b3c51e..061010b 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)
@@ -184,6 +179,13 @@ int swf_SetU16(TAG * t,U16 v)
   t->data[t->len++] = a[1];
   return 0;
 }
+void swf_SetS16(TAG * t,int v)
+{
+    if(v>32767 || v<-32768) {
+	fprintf(stderr, "Warning: S16 overflow: %d\n", v);
+    }
+    swf_SetU16(t, (S16)v);
+}
 
 int swf_SetU32(TAG * t,U32 v)
 { U8 a[4];
@@ -422,6 +424,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 +456,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;
@@ -1232,7 +1261,7 @@ int  swf_WriteSWF2(struct writer_t*writer, SWF * swf)     // Writes SWF to file,
 
   while(t) {
       len += swf_WriteTag(-1,t);
-      if(t->id == ST_DEFINESPRITE) inSprite++;
+      if(t->id == ST_DEFINESPRITE && !swf_IsFolded(t)) inSprite++;
       else if(t->id == ST_END && inSprite) inSprite--;
       else if(t->id == ST_SHOWFRAME && !inSprite) frameCount++;
       t = swf_NextTag(t);