X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Frfxswf.c;h=684c00209d244454e4693c8a99c66ca553183508;hb=0784a8a882e7b98299fb6a90f0f9a7ebb322562b;hp=e309be63c1a9e1f0ec4a466a51fb400851be7b1f;hpb=30d18fbbe53427135310896abd30dadb10d1f249;p=swftools.git

diff --git a/lib/rfxswf.c b/lib/rfxswf.c
index e309be6..684c002 100644
--- a/lib/rfxswf.c
+++ b/lib/rfxswf.c
@@ -29,7 +29,13 @@
 
 #ifdef HAVE_JPEGLIB
 #define HAVE_BOOLEAN
+#ifdef __cplusplus
+extern "C" {
+#endif
 #include <jpeglib.h>
+#ifdef __cplusplus
+}
+#endif
 #endif // HAVE_JPEGLIB
 
 #ifdef HAVE_ZLIB
@@ -46,6 +52,10 @@
 #include <time.h>
 #endif
 
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
+
 #include "./bitio.h"
 #include "./MD5.h"
 
@@ -268,19 +278,21 @@ double swf_GetFixed(TAG * t)
 }
 void swf_SetFixed(TAG * t, double f)
 {
-  swf_SetU16(t, (U16)((f-(int)f)*65536));
-  swf_SetU16(t, (U16)f);
+  U16 fr = (U16)(f-(int)f)*65536;
+  swf_SetU16(t, fr);
+  swf_SetU16(t, (U16)f - (f<0 && fr!=0));
 }
 float swf_GetFixed8(TAG * t)
 {
   U8 low =  swf_GetU8(t);
   U8 high = swf_GetU8(t);
-  return high + low*(1/256.0);
+  return (float)(high + low*(1/256.0));
 }
 void swf_SetFixed8(TAG * t, float f)
 {
-  swf_SetU8(t, (U8)((f-(int)f)*256));
-  swf_SetU8(t, (U8)f);
+  U8 fr = (U8)(f-(int)f)*256;
+  swf_SetU8(t, fr);
+  swf_SetU8(t, (U8)f - (f<0 && fr!=0));
 }
 
 int swf_SetRGB(TAG * t,RGBA * col)
@@ -326,7 +338,6 @@ void swf_GetRGBA(TAG * t, RGBA * col)
 
 void swf_GetGradient(TAG * tag, GRADIENT * gradient, char alpha)
 {
-    GRADIENT dummy;
     int t;
     if(!tag) {
       memset(gradient, 0, sizeof(GRADIENT));
@@ -335,8 +346,8 @@ void swf_GetGradient(TAG * tag, GRADIENT * gradient, char alpha)
     U8 num = swf_GetU8(tag) & 15;
     if(gradient) {
 	gradient->num = num;
-	gradient->rgba = rfx_calloc(sizeof(RGBA)*gradient->num);
-	gradient->ratios = rfx_calloc(sizeof(gradient->ratios[0])*gradient->num);
+	gradient->rgba = (RGBA*)rfx_calloc(sizeof(RGBA)*gradient->num);
+	gradient->ratios = (U8*)rfx_calloc(sizeof(gradient->ratios[0])*gradient->num);
     }
     for(t=0;t<num;t++)
     {
@@ -753,14 +764,14 @@ void  swf_SetPassword(TAG * t, const char * password)
     md5string = crypt_md5(password, salt);
 
     swf_SetU16(t,0);
-    swf_SetString(t, md5string);
+    swf_SetString(t, (U8*)md5string);
 }
 
 int swf_VerifyPassword(TAG * t, const char * password)
 {
     char*md5string1, *md5string2;
     char*x;
-    char*md5, *salt;
+    char*salt;
     int n;
 
     if(t->len >= 5 && t->pos==0 && 
@@ -1060,7 +1071,7 @@ void swf_UnFoldSprite(TAG * t)
 void swf_FoldSprite(TAG * t)
 {
   TAG*sprtag=t,*tmp;
-  U16 id,frames,tmpid;
+  U16 id,frames;
   int level;
   if(t->id!=ST_DEFINESPRITE)
       return;
@@ -1289,7 +1300,7 @@ int  swf_WriteSWF2(writer_t*writer, SWF * swf)     // Writes SWF to file, return
   if ((swf->firstTag && swf->firstTag->id != ST_REFLEX) &&
       (!swf->firstTag->next || swf->firstTag->next->id != ST_REFLEX)) 
   {
-      swf_SetBlock(swf_InsertTagBefore(swf, swf->firstTag,ST_REFLEX),"rfx",3);
+      swf_SetBlock(swf_InsertTagBefore(swf, swf->firstTag,ST_REFLEX),(U8*)"rfx",3);
   }
 
 #endif // INSERT_RFX_TAG
@@ -1304,15 +1315,15 @@ int  swf_WriteSWF2(writer_t*writer, SWF * swf)     // Writes SWF to file, return
     {
 	TAG*scene = swf_InsertTagBefore(swf, swf->firstTag,ST_SCENEDESCRIPTION);
 	swf_SetU16(scene, 1);
-	swf_SetString(scene, "Scene 1");
+	swf_SetString(scene, (U8*)"Scene 1");
 	swf_SetU8(scene, 0);
     }
   }
   
-  if(swf->fileVersion >= 8) {
+  if(swf->fileVersion >= 9) {
       if (swf->firstTag && swf->firstTag->id != ST_FILEATTRIBUTES)
       {
-	  U32 flags = 0; // | 128 = usenetwork, | 8 = hasmetadata
+	  U32 flags = 0x8; // | 128 = usenetwork, | 16 = Actionscript3 | 8 = hasmetadata
 	  swf_SetU32(swf_InsertTagBefore(swf, swf->firstTag,ST_FILEATTRIBUTES),flags);
       }
   }
@@ -1491,7 +1502,7 @@ int swf_WriteCGI(SWF * swf)
 
 SWF* swf_CopySWF(SWF*swf)
 {
-    SWF*nswf = rfx_alloc(sizeof(SWF));
+    SWF*nswf = (SWF*)rfx_alloc(sizeof(SWF));
     TAG*tag, *ntag;
     memcpy(nswf, swf, sizeof(SWF));
     nswf->firstTag = 0;
@@ -1530,6 +1541,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/swfabc.c"
 #include "modules/swfsound.c"
 #include "modules/swfdraw.c"
 #include "modules/swfrender.c"