X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Frfxswf.c;h=adbdc5a329c9f2de84347d007bc787b4bd8a3c80;hb=30b68dc4d9d219f77e73bbd1db59dd41fd27d1eb;hp=4b64b83d4c3caf006a5413552450d7795bf1e192;hpb=0e6deb35dd62be9cb5b56af78c08fa3842030040;p=swftools.git diff --git a/lib/rfxswf.c b/lib/rfxswf.c index 4b64b83..adbdc5a 100644 --- a/lib/rfxswf.c +++ b/lib/rfxswf.c @@ -268,8 +268,9 @@ 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 = (f-(int)f)*65536; + swf_SetU16(t, fr); + swf_SetU16(t, (U16)f - (f<0 && fr!=0)); } float swf_GetFixed8(TAG * t) { @@ -279,8 +280,9 @@ float swf_GetFixed8(TAG * t) } void swf_SetFixed8(TAG * t, float f) { - swf_SetU8(t, (U8)((f-(int)f)*256)); - swf_SetU8(t, (U8)f); + U8 fr = (f-(int)f)*256; + swf_SetU8(t, fr); + swf_SetU8(t, (U8)f - (f<0 && fr!=0)); } int swf_SetRGB(TAG * t,RGBA * col) @@ -1282,15 +1284,6 @@ int swf_WriteSWF2(writer_t*writer, SWF * swf) // Writes SWF to file, return if(writer) writer_lastpos = writer->pos; - if(swf->fileVersion >= 8) { - if ((swf->firstTag && swf->firstTag->id != ST_FILEATTRIBUTES) && - (!swf->firstTag->next || swf->firstTag->next->id != ST_FILEATTRIBUTES)) - { - U32 flags = 0; // | 128 = usenetwork, | 8 = hasmetadata - swf_SetU32(swf_InsertTagBefore(swf, swf->firstTag,ST_FILEATTRIBUTES),flags); - } - } - // Insert REFLEX Tag #ifdef INSERT_RFX_TAG @@ -1303,6 +1296,29 @@ int swf_WriteSWF2(writer_t*writer, SWF * swf) // Writes SWF to file, return #endif // INSERT_RFX_TAG + if(swf->fileVersion >= 9) { + if ((!swf->firstTag || swf->firstTag->id != ST_SCENEDESCRIPTION) && + (!swf->firstTag || + !swf->firstTag->next || swf->firstTag->next->id != ST_SCENEDESCRIPTION) && + (!swf->firstTag || + !swf->firstTag->next || + !swf->firstTag->next->next || swf->firstTag->next->next->id != ST_SCENEDESCRIPTION)) + { + TAG*scene = swf_InsertTagBefore(swf, swf->firstTag,ST_SCENEDESCRIPTION); + swf_SetU16(scene, 1); + swf_SetString(scene, "Scene 1"); + swf_SetU8(scene, 0); + } + } + + if(swf->fileVersion >= 9) { + if (swf->firstTag && swf->firstTag->id != ST_FILEATTRIBUTES) + { + U32 flags = 0x8; // | 128 = usenetwork, | 16 = Actionscript3 | 8 = hasmetadata + swf_SetU32(swf_InsertTagBefore(swf, swf->firstTag,ST_FILEATTRIBUTES),flags); + } + } + // Count Frames + File Size len = 0; @@ -1516,6 +1532,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"