gave names to fileattribute bits

[swftools.git] / lib / rfxswf.c

diff --git a/lib/rfxswf.c b/lib/rfxswf.c
index 57c93a7..de66911 100644 (file)
--- a/lib/rfxswf.c
+++ b/lib/rfxswf.c
@@ -46,6 +46,7 @@
 
 #include "./bitio.h"
 #include "./MD5.h"
+#include "./os.h"
 
 // internal constants
 
@@ -300,10 +301,6 @@ U32 swf_GetU30(TAG*tag)
 
 int swf_SetU30(TAG*tag, U32 u)
 {
-    if(u&0x80000000) {
-      fprintf(stderr, "Error: Bit 31 set in U30 value\n");
-      u&=0x7fffffff;
-    }
     int nr = 0;
     do {
         if(tag)
@@ -391,9 +388,8 @@ int swf_GetS30(TAG*tag)
 }
 #endif
 
-int swf_SetU30String(TAG*tag, const char*str)
+int swf_SetU30String(TAG*tag, const char*str, int l)
 {
-    int l = strlen(str);
     int len=0;
     len+=swf_SetU30(tag, l);
     len+=l;
@@ -1486,6 +1482,17 @@ int swf_ReadSWF(int handle, SWF * swf)
   return swf_ReadSWF2(&reader, swf);
 }
 
+void swf_ReadABCfile(char*filename, SWF*swf)
+{
+    memset(swf, 0, sizeof(SWF));
+    swf->fileVersion=9;
+    swf->fileAttributes=FILEATTRIBUTE_AS3; //as3
+    TAG*tag = swf->firstTag = swf_InsertTag(0, ST_RAWABC);
+    memfile_t*file = memfile_open(filename);
+    swf_SetBlock(tag, file->data, file->len);
+    memfile_close(file);
+}
+
 int no_extra_tags = 0;
 
 int WriteExtraTags(SWF*swf, writer_t*writer)
@@ -1516,9 +1523,9 @@ int WriteExtraTags(SWF*swf, writer_t*writer)
 
     if(swf->fileVersion >= 9) {
         if(!has_fileattributes) {
-            U32 flags = swf->fileAttributes|0x08; // 16 = has symbolclass tag | 8 = actionscript3 | 1 = usenetwork
+            U32 flags = swf->fileAttributes|FILEATTRIBUTE_AS3; // 16 = has symbolclass tag | 8 = actionscript3 | 1 = usenetwork
             if(has_version_8_action && !has_version_9_action)
-                flags &= ~0x08;
+                flags &= ~FILEATTRIBUTE_AS3;
             TAG*fileattrib = swf_InsertTag(0, ST_FILEATTRIBUTES);
             swf_SetU32(fileattrib, flags);
             if(writer) {
@@ -1532,7 +1539,7 @@ int WriteExtraTags(SWF*swf, writer_t*writer)
             if(swf_WriteTag2(writer, has_fileattributes)<0) 
                 return -1;
         }
-        if(!has_scenedescription) {
+        if(0 && !has_scenedescription) {
             TAG*scene = swf_InsertTag(0, ST_SCENEDESCRIPTION);
             swf_SetU16(scene, 1);
             swf_SetString(scene, (U8*)"Scene 1");