#ifdef HAVE_JPEGLIB
#define HAVE_BOOLEAN
+#ifdef __cplusplus
+extern "C" {
+#endif
#include <jpeglib.h>
+#ifdef __cplusplus
+}
+#endif
#endif // HAVE_JPEGLIB
#ifdef HAVE_ZLIB
#include <time.h>
#endif
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
+
#include "./bitio.h"
#include "./MD5.h"
}
void swf_SetFixed(TAG * t, double f)
{
- U16 fr = (f-(int)f)*65536;
+ U16 fr = (U16)(f-(int)f)*65536;
swf_SetU16(t, fr);
swf_SetU16(t, (U16)f - (f<0 && fr!=0));
}
{
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)
{
- U8 fr = (f-(int)f)*256;
+ U8 fr = (U8)(f-(int)f)*256;
swf_SetU8(t, fr);
swf_SetU8(t, (U8)f - (f<0 && fr!=0));
}
void swf_GetGradient(TAG * tag, GRADIENT * gradient, char alpha)
{
- GRADIENT dummy;
int t;
if(!tag) {
memset(gradient, 0, sizeof(GRADIENT));
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++)
{
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 &&
void swf_FoldSprite(TAG * t)
{
TAG*sprtag=t,*tmp;
- U16 id,frames,tmpid;
+ U16 id,frames;
int level;
if(t->id!=ST_DEFINESPRITE)
return;
reader_init_zlibinflate(&zreader, reader);
reader = &zreader;
}
+ swf->compressed = 0; // derive from version number from now on
reader_GetRect(reader, &swf->movieSize);
reader->read(reader, &swf->frameRate, 2);
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
{
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);
}
}
It also means that we don't initialize our own zlib
writer, but assume the caller provided one.
*/
- if(swf->compressed) {
+ if(swf->compressed==1 || (swf->compressed==0 && swf->fileVersion>=6)) {
char*id = "CWS";
writer->write(writer, id, 3);
- }
- else {
+ } else {
char*id = "FWS";
writer->write(writer, id, 3);
}
PUT32(b4, swf->fileSize);
writer->write(writer, b4, 4);
- if(swf->compressed) {
+ if(swf->compressed==1 || (swf->compressed==0 && swf->fileVersion>=6)) {
writer_init_zlibdeflate(&zwriter, writer);
writer = &zwriter;
}
{ if (swf_WriteTag2(writer, t)<0) return -1;
t = swf_NextTag(t);
}
- if(swf->compressed) {
+ if(swf->compressed==1 || (swf->compressed==0 && swf->fileVersion>=6) || swf->compressed==8) {
if(swf->compressed != 8) {
zwriter.finish(&zwriter);
return writer->pos - writer_lastpos;
{
writer_t writer;
int len = 0;
- swf->compressed = 0;
if(handle<0) {
writer_init_nullwriter(&writer);
return len;
}
-int swf_WriteSWC(int handle, SWF * swf) // Writes SWF to file, returns length or <0 if fails
-{
- writer_t writer;
- int len = 0;
- swf->compressed = 1;
-
- if(handle<0) {
- writer_init_nullwriter(&writer);
- len = swf_WriteSWF2(&writer, swf);
- }
- writer_init_filewriter(&writer, handle);
- len = swf_WriteSWF2(&writer, swf);
- writer.finish(&writer);
- return len;
-}
-
int swf_WriteHeader2(writer_t*writer,SWF * swf)
{
SWF myswf;
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;