X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Frfxswf.c;h=f560f9586558f622b743088cc5cd5d890359ce7a;hb=bee56ee5d28188f2abb09c50c0624f7cc4f4098a;hp=d0f776bd42b0db6a30aea2b3e6dde56dfb0d945a;hpb=e84c91d31743e801cea76cdb2fd7144666509786;p=swftools.git

diff --git a/lib/rfxswf.c b/lib/rfxswf.c
index d0f776b..f560f95 100644
--- a/lib/rfxswf.c
+++ b/lib/rfxswf.c
@@ -16,6 +16,7 @@
 
 #ifdef HAVE_LIBJPEG
 #ifdef HAVE_JPEGLIB_H
+#define HAVE_BOOLEAN
 #include <jpeglib.h>
 #define _JPEGLIB_INCLUDED_
 #endif // HAVE_JPEGLIB_H
@@ -52,8 +53,8 @@ TAG * swf_NextTag(TAG * t) { return t->next; }
 TAG * swf_PrevTag(TAG * t) { return t->prev; }
 int   swf_GetFrameNo(TAG * t)  { return t->frame; }
 U16   swf_GetTagID(TAG * t)    { return t->id; }
-U32   swf_GetDataSize(TAG * t) { return t->len; }
-U8*   swf_GetDataSizePtr(TAG * t) { return &(t->data[t->len]); }
+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
@@ -354,6 +355,10 @@ int swf_SetMatrix(TAG * t,MATRIX * m)
   { swf_SetBits(t,1,1);
     nbits = swf_CountBits(m->sx,0);
     nbits = swf_CountBits(m->sy,nbits);
+    if(nbits>=32) {
+	fprintf(stderr,"rfxswf: Error: matrix values too large\n");
+	nbits = 31;
+    }
     swf_SetBits(t,nbits,5);
     swf_SetBits(t,m->sx,nbits);
     swf_SetBits(t,m->sy,nbits);
@@ -364,6 +369,10 @@ int swf_SetMatrix(TAG * t,MATRIX * m)
   { swf_SetBits(t,1,1);
     nbits = swf_CountBits(m->r0,0);
     nbits = swf_CountBits(m->r1,nbits);
+    if(nbits>=32) {
+	fprintf(stderr,"rfxswf: Error: matrix values too large\n");
+	nbits = 31;
+    }
     swf_SetBits(t,nbits,5);
     swf_SetBits(t,m->r0,nbits);
     swf_SetBits(t,m->r1,nbits);
@@ -371,6 +380,10 @@ int swf_SetMatrix(TAG * t,MATRIX * m)
 
   nbits = swf_CountBits(m->tx,0);
   nbits = swf_CountBits(m->ty,nbits);
+  if(nbits>=32) {
+      fprintf(stderr,"rfxswf: Error: matrix values too large\n");
+      nbits = 31;
+  }
   swf_SetBits(t,nbits,5);
   swf_SetBits(t,m->tx,nbits);
   swf_SetBits(t,m->ty,nbits);
@@ -498,7 +511,6 @@ TAG * swf_InsertTag(TAG * after,U16 id)     // updates frames, if nescessary
   if (t)
   { memset(t,0x00,sizeof(TAG));
     t->id = id;
-    t->writeBit = 0x80;
     
     if (after)
     { t->frame = after->frame;
@@ -533,12 +545,15 @@ TAG * RFXSWF_ReadTag(int handle,TAG * prev)
   int id;
 
   if (read(handle,&raw,2)!=2) return NULL;
+  raw = SWAP16(raw);
 
   len = raw&0x3f;
   id  = raw>>6;
 
   if (len==0x3f)
-  { if (read(handle,&len,4)!=4) return NULL;
+  {
+      if (read(handle,&len,4)!=4) return NULL;
+      len = SWAP32(len);
   }
 
   if (id==ST_DEFINESPRITE) len = 2*sizeof(U16);
@@ -598,7 +613,7 @@ int RFXSWF_WriteTag(int handle,TAG * t)
 
   if (handle>=0)
   { if (short_tag)
-    { raw[0] = len|((t->id&0x3ff)<<6);
+    { raw[0] = SWAP16(len|((t->id&0x3ff)<<6));
       if (write(handle,raw,2)!=2)
       {
         #ifdef DEBUG_RFXSWF
@@ -608,13 +623,21 @@ int RFXSWF_WriteTag(int handle,TAG * t)
       }
     }
     else
-    { raw[0] = (t->id<<6)|0x3f;
-      raw[1] = (U16)(len&0xffff);
-      raw[2] = (U16)(len>>16);
-      if (write(handle,raw,6)!=6)
+    {
+      raw[0] = SWAP16((t->id<<6)|0x3f);
+      if (write(handle,raw,2)!=2)
+      {
+#ifdef DEBUG_RFXSWF
+          fprintf(stderr,"WriteTag() failed: Long Header (1).\n");
+#endif
+	  return -1;
+      }
+      
+      len = SWAP32(len);
+      if (write(handle,&len,4)!=4)
       {
         #ifdef DEBUG_RFXSWF
-          fprintf(stderr,"WriteTag() failed: Long Header.\n");
+          fprintf(stderr,"WriteTag() failed: Long Header (2).\n");
         #endif
         return -1;
       }
@@ -637,6 +660,11 @@ int RFXSWF_WriteTag(int handle,TAG * t)
   return t->len+(short_tag?2:6);
 }
 
+int swf_WriteTag(int handle,TAG * t)
+{
+    return RFXSWF_WriteTag(handle, t);
+}
+
 int RFXSWF_DefineSprite_GetRealSize(TAG * t)
 // Sprite Handling: Helper function to pack DefineSprite-Tag
 { U32 len = t->len;
@@ -649,10 +677,43 @@ int RFXSWF_DefineSprite_GetRealSize(TAG * t)
 }
 
 #define swf_ReadTag(a,b)  RFXSWF_ReadTag(a,b)
-#define swf_WriteTag(a,b) RFXSWF_WriteTag(a,b)
+#define swf_WriteTag(a,b)  RFXSWF_WriteTag(a,b)
 
 // Movie Functions
 
+int swf_InitSWF(void*data, int length, SWF * swf) /* copy a swf in memory into SWF struct */
+{
+  TAG reader;
+    /* 
+	unfinished!
+     */
+  *(int*)0=0xDEAD;
+  if (!swf) return -1;
+  memset(swf,0x00,sizeof(SWF));
+  memset(&reader,0x00,sizeof(TAG));
+  reader.data = data;
+  reader.len = reader.memsize = length;
+
+  { char b[32];                         // read Header
+    TAG * t;
+    
+    if (swf_GetU8(&reader)!=(U8)'F') return -1;
+    if (swf_GetU8(&reader)!=(U8)'W') return -1;
+    if (swf_GetU8(&reader)!=(U8)'S') return -1;
+
+    swf->fileVersion = swf_GetU8(&reader);
+    swf->fileSize    = swf_GetU32(&reader);
+    swf_GetRect(&reader,&swf->movieSize);
+    swf->frameRate   = swf_GetU16(&reader);
+    swf->frameCount  = swf_GetU16(&reader);
+
+    /*t = &t1;
+    while (t) t = swf_ReadTag(handle,t);
+    swf->firstTag = t1.next;
+    t1.next->prev = NULL;*/
+  }
+}
+
 int swf_ReadSWF(int handle,SWF * swf)   // Reads SWF to memory (malloc'ed), returns length or <0 if fails
 {     
   if (!swf) return -1;
@@ -689,6 +750,7 @@ int swf_ReadSWF(int handle,SWF * swf)   // Reads SWF to memory (malloc'ed), retu
   
   return 0;
 }
+
 int  swf_WriteSWF(int handle,SWF * swf)     // Writes SWF to file, returns length or <0 if fails
 { U32 len;
   TAG * t;
@@ -699,7 +761,7 @@ int  swf_WriteSWF(int handle,SWF * swf)     // Writes SWF to file, returns lengt
 
 #ifdef INSERT_RFX_TAG
 
-  if (swf_NextTag(swf->firstTag))
+  if (swf->firstTag && swf_NextTag(swf->firstTag))
     if (swf_GetTagID(swf_NextTag(swf->firstTag))!=ST_REFLEX)
       swf_SetBlock(swf_InsertTag(swf->firstTag,ST_REFLEX),"rfx",3);
 
@@ -730,15 +792,17 @@ int  swf_WriteSWF(int handle,SWF * swf)     // Writes SWF to file, returns lengt
     swf_SetU8(&t1,'S');
     swf_SetU8(&t1,swf->fileVersion);
     
-    swf_SetU32(&t1,0);                      // Keep space for filesize
+    swf_SetU32(&t1,swf->fileSize);         // Keep space for filesize
     swf_SetRect(&t1,&swf->movieSize);
     swf_SetU16(&t1,swf->frameRate);
     swf_SetU16(&t1,swf->frameCount);
 
-    l = swf_GetDataSize(&t1);
+    l = swf_GetTagLen(&t1);
     swf->fileSize = l+len;
-    t1.len = 4;                         // bad & ugly trick !
-    swf_SetU32(&t1,swf->fileSize);
+    if(swf->firstTag) {
+	t1.len = 4;                         // bad & ugly trick !
+	swf_SetU32(&t1,swf->fileSize);
+    }
 
     if (handle>=0)
     { 
@@ -763,6 +827,14 @@ int  swf_WriteSWF(int handle,SWF * swf)     // Writes SWF to file, returns lengt
   return (int)swf->fileSize;
 }
 
+int swf_WriteHeader(int handle,SWF * swf)
+{
+    SWF myswf;
+    memcpy(&myswf,swf,sizeof(SWF));
+    myswf.firstTag = 0;
+    swf_WriteSWF(handle, &myswf);
+}
+
 int swf_WriteCGI(SWF * swf)
 { int len;
   char s[1024];
@@ -805,6 +877,7 @@ void swf_FreeTags(SWF * swf)                 // Frees all malloc'ed memory for t
 #include "modules\swfcgi.c"
 #include "modules\swfbits.c"
 #include "modules\swfaction.c"
+#include "modules\swfsound.c"
 
 #else
 
@@ -817,6 +890,7 @@ void swf_FreeTags(SWF * swf)                 // Frees all malloc'ed memory for t
 #include "modules/swfcgi.c"
 #include "modules/swfbits.c"
 #include "modules/swfaction.c"
+#include "modules/swfsound.c"
 
 #endif