first version of new polygon intersector

[swftools.git] / lib / rfxswf.c

diff --git a/lib/rfxswf.c b/lib/rfxswf.c
index de66911..b063cc0 100644 (file)
--- a/lib/rfxswf.c
+++ b/lib/rfxswf.c
@@ -204,17 +204,22 @@ U32 swf_GetBits(TAG * t,int nbits)
   if (!t->readBit) t->readBit = 0x80;
   while (nbits)
   { res<<=1;
+#ifdef DEBUG_RFXSWF
+    if (t->pos>=t->len) 
+    { fprintf(stderr,"GetBits() out of bounds: TagID = %i, pos=%d, len=%d\n",t->id, t->pos, t->len);
+      int i,m=t->len>10?10:t->len;
+      for(i=-1;i<m;i++) {
+        fprintf(stderr, "(%d)%02x ", i, t->data[i]);
+      } 
+      fprintf(stderr, "\n");
+      return res;
+    }
+#endif
     if (t->data[t->pos]&t->readBit) res|=1;
     t->readBit>>=1;
     nbits--;
     if (!t->readBit)
     { if (nbits) t->readBit = 0x80;
-      #ifdef DEBUG_RFXSWF
-      if (t->pos>=t->len) 
-      { fprintf(stderr,"GetBits() out of bounds: TagID = %i\n",t->id);
-        return res;
-      }
-      #endif
       t->pos++;
     }
   }
@@ -368,7 +373,12 @@ int swf_GetS30(TAG*tag)
     while(1) {
        U8 b = swf_GetU8(tag);
         nr++;
-       s|=(b&127)<<shift;
+       nt i,m=t->len>10?10:t->len;
+                for(i=0;i<m;i++) {
+                            fprintf(stderr, "%02x ", t->data[i]);
+                                    } 
+                        fprintf(stderr, "\n");
+                        s|=(b&127)<<shift;
        shift+=7;
        if(!(b&128) || shift>=32) {
             if(b&64) {
@@ -1475,6 +1485,19 @@ int swf_ReadSWF2(reader_t*reader, SWF * swf)   // Reads SWF to memory (malloc'ed
   return reader->pos;
 }
 
+SWF* swf_OpenSWF(char*filename)
+{
+  int fi = open(filename, O_RDONLY|O_BINARY);
+  if(fi<0) {
+      fprintf(stderr, "Failed to open %s\n", filename);
+      return 0;
+  }
+  SWF* swf = rfx_alloc(sizeof(SWF));
+  swf_ReadSWF(fi, swf);
+  close(fi);
+  return swf;
+}
+
 int swf_ReadSWF(int handle, SWF * swf)
 {
   reader_t reader;
@@ -1578,7 +1601,9 @@ int  swf_WriteSWF2(writer_t*writer, SWF * swf)     // Writes SWF to file, return
   t = swf->firstTag;
   frameCount = 0;
 
-  len += WriteExtraTags(swf, 0);
+  if(swf->firstTag && !no_extra_tags) {
+    len += WriteExtraTags(swf, 0);
+  }
   while(t) {
       len += swf_WriteTag(-1,t);
       if(t->id == ST_DEFINESPRITE && !swf_IsFolded(t)) inSprite++;
@@ -1660,7 +1685,7 @@ int  swf_WriteSWF2(writer_t*writer, SWF * swf)     // Writes SWF to file, return
       return -1;
     }
 
-    if(!no_extra_tags) {
+    if(swf->firstTag && !no_extra_tags) {
         WriteExtraTags(swf, writer);
     }
     t = swf->firstTag;