along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+#include "mem.h"
#include "rfxswf.h"
#ifdef HAVE_JPEGLIB
#define MEMSIZE(l) (((l/MALLOC_SIZE)+1)*MALLOC_SIZE)
-
// inline wrapper functions
TAG * swf_NextTag(TAG * t) { return t->next; }
U8* swf_GetTagLenPtr(TAG * t) { return &(t->data[t->len]); }
U32 swf_GetTagPos(TAG * t) { return t->pos; }
-// Basic Data Access Functions
-
-#define swf_ResetReadBits(tag) if (tag->readBit) { tag->pos++; tag->readBit = 0; }
-#define swf_ResetWriteBits(tag) if (tag->writeBit) { tag->writeBit = 0; }
-
// for future purpose: avoid high level lib functions to change tagpos/bitpos
#define swf_SaveTagPos(tag)
void swf_SetTagPos(TAG * t,U32 pos)
{ swf_ResetReadBits(t);
if (pos<=t->len) t->pos = pos;
- #ifdef DEBUG_RFXSWF
- else fprintf(stderr,"SetTagPos() out of bounds: TagID = %i\n",t->id);
- #endif
+ else {
+#ifdef DEBUG_RFXSWF
+ fprintf(stderr,"SetTagPos(%d) out of bounds: TagID = %i\n",pos, t->id);
+#endif
+ }
}
char* swf_GetString(TAG*t)
{
char* str = ((char*)(&(t)->data[(t)->pos]));
- while(swf_GetU8(t));
+ while(t->pos < t->len && swf_GetU8(t));
+ /* make sure we always have a trailing zero byte */
+ if(t->pos == t->len) {
+ if(t->len == t->memsize) {
+ swf_ResetWriteBits(t);
+ swf_SetU8(t, 0);
+ t->len = t->pos;
+ }
+ t->data[t->len] = 0;
+ }
return str;
}
swf_ResetWriteBits(t);
if (newlen>t->memsize)
{ U32 newmem = MEMSIZE(newlen);
- U8 * newdata = (U8*)((t->data)?realloc(t->data,newmem):malloc(newmem));
- if (!newdata)
- {
- #ifdef DEBUG_RFXSWF
- fprintf(stderr,"Fatal Error: malloc()/realloc() failed (1). (%d bytes)\n", newmem);
- *(int*)0=0;
- #endif
- return 0;
- }
+ U8 * newdata = (U8*)(rfx_realloc(t->data,newmem));
t->memsize = newmem;
t->data = newdata;
}
t->data[t->len++] = a[1];
return 0;
}
+void swf_SetS16(TAG * t,int v)
+{
+ if(v>32767 || v<-32768) {
+ fprintf(stderr, "Warning: S16 overflow: %d\n", v);
+ }
+ swf_SetU16(t, (S16)v);
+}
int swf_SetU32(TAG * t,U32 v)
{ U8 a[4];
return (S32)res;
}
-U32 reader_GetBits(struct reader_t*reader, int nbits)
+U32 reader_GetBits(reader_t*reader, int nbits)
{ return reader_readbits(reader, nbits);
}
-S32 reader_GetSBits(struct reader_t*reader, int nbits)
+S32 reader_GetSBits(reader_t*reader, int nbits)
{ U32 res = reader_readbits(reader, nbits);
if (res&(1<<(nbits-1))) res|=(0xffffffff<<nbits);
return (S32)res;
void swf_GetRGBA(TAG * t, RGBA * col)
{
RGBA dummy;
- if(!col);
+ if(!col)
col = &dummy;
col->r = swf_GetU8(t);
col->g = swf_GetU8(t);
return 0;
}
-int reader_GetRect(struct reader_t*reader,SRECT * r)
+int reader_GetRect(reader_t*reader,SRECT * r)
{ int nbits;
SRECT dummy;
if (!r) r = &dummy;
void swf_ExpandRect(SRECT*src, SPOINT add)
{
+ if((src->xmin | src->ymin | src->xmax | src->ymax)==0) {
+ src->xmin = add.x;
+ src->ymin = add.y;
+ src->xmax = add.x;
+ src->ymax = add.y;
+ if((add.x|add.y) == 0) src->xmax++; //make sure the bbox is not NULL anymore
+ return;
+ }
if(add.x < src->xmin)
src->xmin = add.x;
if(add.x > src->xmax)
{
if((add->xmin | add->ymin | add->xmax | add->ymax)==0)
return;
+ if((src->xmin | src->ymin | src->xmax | src->ymax)==0)
+ *src = *add;
if(add->xmin < src->xmin)
src->xmin = add->xmin;
if(add->ymin < src->ymin)
if(add->ymax > src->ymax)
src->ymax = add->ymax;
}
+void swf_ExpandRect3(SRECT*src, SPOINT center, int radius)
+{
+ if((src->xmin | src->ymin | src->xmax | src->ymax)==0) {
+ src->xmin = center.x-radius;
+ src->ymin = center.y-radius;
+ src->xmax = center.x+radius;
+ src->ymax = center.y+radius;
+ if((center.x|center.y|radius) == 0) src->xmax++; //make sure the bbox is not NULL anymore
+ return;
+ }
+ if(center.x - radius < src->xmin)
+ src->xmin = center.x - radius;
+ if(center.x + radius > src->xmax)
+ src->xmax = center.x + radius;
+ if(center.y - radius < src->ymin)
+ src->ymin = center.y - radius;
+ if(center.y + radius > src->ymax)
+ src->ymax = center.y + radius;
+}
SPOINT swf_TurnPoint(SPOINT p, MATRIX* m)
{
SPOINT r;
{
SRECT g;
SPOINT p1,p2,p3,p4,pp1,pp2,pp3,pp4;
+ if(!m)
+ return r;
p1.x = r.xmin;p1.y = r.ymin;
p2.x = r.xmax;p2.y = r.ymin;
p3.x = r.xmin;p3.y = r.ymax;
nbits = swf_CountBits(m->sx,0);
nbits = swf_CountBits(m->sy,nbits);
if(nbits>=32) {
+ /* TODO: happens on AMD64 systems for normal values? */
fprintf(stderr,"rfxswf: Error: matrix values too large\n");
nbits = 31;
}
return 0;
}
-int swf_GetCXForm(TAG * t,CXFORM * cx,U8 alpha) //FIXME: alpha should be type bool
+int swf_GetCXForm(TAG * t,CXFORM * cx,U8 alpha)
{ CXFORM cxf;
int hasadd;
int hasmul;
fprintf(stderr, "rfxswf: Warning- no usable random generator found\n");
fprintf(stderr, "Your password will be vulnerable to dictionary attacks\n");
#endif
+ salt[2] = 0;
md5string = crypt_md5(password, salt);
return 0;
}
n = x-(md5string1+3);
- salt = (char*)malloc(n+1);
+ salt = (char*)rfx_alloc(n+1);
memcpy(salt, md5string1+3, n);
salt[n] = 0;
md5string2 = crypt_md5(password, salt);
- free(salt);
+ rfx_free(salt);
if(strcmp(md5string1, md5string2) != 0)
return 0;
return 1;
TAG * swf_InsertTag(TAG * after,U16 id)
{ TAG * t;
- t = (TAG *)malloc(sizeof(TAG));
- if (t)
- { memset(t,0x00,sizeof(TAG));
- t->id = id;
-
- if (after)
- {
- t->prev = after;
- t->next = after->next;
- after->next = t;
- if (t->next) t->next->prev = t;
- }
+ t = (TAG *)rfx_calloc(sizeof(TAG));
+ t->id = id;
+
+ if (after)
+ {
+ t->prev = after;
+ t->next = after->next;
+ after->next = t;
+ if (t->next) t->next->prev = t;
}
return t;
}
TAG * swf_InsertTagBefore(SWF* swf, TAG * before,U16 id)
{ TAG * t;
- t = (TAG *)malloc(sizeof(TAG));
- if (t)
- { memset(t,0x00,sizeof(TAG));
- t->id = id;
-
- if (before)
- {
- t->next = before;
- t->prev = before->prev;
- before->prev = t;
- if (t->prev) t->prev->next = t;
- }
+ t = (TAG *)rfx_calloc(sizeof(TAG));
+ t->id = id;
+
+ if (before)
+ {
+ t->next = before;
+ t->prev = before->prev;
+ before->prev = t;
+ if (t->prev) t->prev->next = t;
}
if(swf && swf->firstTag == before) {
swf->firstTag = t;
void swf_ClearTag(TAG * t)
{
- if (t->data) free(t->data);
+ if (t->data) rfx_free(t->data);
t->data = 0;
t->pos = 0;
t->len = 0;
tag->id = id;
}
+TAG* swf_CopyTag(TAG*tag, TAG*to_copy)
+{
+ tag = swf_InsertTag(tag, to_copy->id);
+ swf_SetBlock(tag, to_copy->data, to_copy->len);
+ return tag;
+}
+
int swf_DeleteTag(TAG * t)
{ if (!t) return -1;
if (t->prev) t->prev->next = t->next;
if (t->next) t->next->prev = t->prev;
- if (t->data) free(t->data);
- free(t);
+ if (t->data) rfx_free(t->data);
+ rfx_free(t);
return 0;
}
-TAG * swf_ReadTag(struct reader_t*reader, TAG * prev)
+TAG * swf_ReadTag(reader_t*reader, TAG * prev)
{ TAG * t;
U16 raw;
U32 len;
if (id==ST_DEFINESPRITE) len = 2*sizeof(U16);
// Sprite handling fix: Flatten sprite tree
- t = (TAG *)malloc(sizeof(TAG));
-
- if (!t)
- {
- #ifdef DEBUG_RFXSWF
- fprintf(stderr,"Fatal Error: malloc()/realloc() failed (2). (%d bytes)\n", sizeof(TAG));
- #endif
- return NULL;
- }
-
- memset(t,0x00,sizeof(TAG));
+ t = (TAG *)rfx_calloc(sizeof(TAG));
t->len = len;
t->id = id;
if (t->len)
- { t->data = (U8*)malloc(t->len);
- if (!t->data)
- {
- #ifdef DEBUG_RFXSWF
- fprintf(stderr,"Fatal Error: malloc()/realloc() failed (3). (%d bytes)\n", t->len);
- #endif
+ { t->data = (U8*)rfx_alloc(t->len);
+ t->memsize = t->len;
+ if (reader->read(reader, t->data, t->len) != t->len) {
+ fprintf(stderr, "rfxswf: Warning: Short read (tagid %d). File truncated?\n", t->id);
+ free(t->data);t->data=0;
+ free(t);
return NULL;
}
- t->memsize = t->len;
- if (reader->read(reader, t->data, t->len) != t->len) return NULL;
}
if (prev)
int swf_DefineSprite_GetRealSize(TAG * t);
-int swf_WriteTag2(struct writer_t*writer, TAG * t)
+int swf_WriteTag2(writer_t*writer, TAG * t)
// returns tag length in bytes (incl. Header), -1 = Error
// writer = 0 -> no output
{ U16 raw[3];
len = (t->id==ST_DEFINESPRITE)?swf_DefineSprite_GetRealSize(t):t->len;
- short_tag = len<0x3f;
+ short_tag = len<0x3f&&
+ (t->id!=ST_DEFINEBITSLOSSLESS&&t->id!=ST_DEFINEBITSLOSSLESS2&&t->id!=ST_SOUNDSTREAMBLOCK&&
+ t->id!=ST_DEFINEBITSJPEG&&t->id!=ST_DEFINEBITSJPEG2&&t->id!=ST_DEFINEBITSJPEG3);
if (writer)
{ if (short_tag)
int swf_WriteTag(int handle, TAG * t)
{
- struct writer_t writer;
+ writer_t writer;
+ int len = 0;
if(handle<0)
return swf_WriteTag2(0, t);
writer_init_filewriter(&writer, handle);
- return swf_WriteTag2(&writer, t);
+ len = swf_WriteTag2(&writer, t);
+ writer.finish(&writer);
+ return len;
}
int swf_DefineSprite_GetRealSize(TAG * t)
it->len = len;
it->id = id;
if (it->len)
- { it->data = (U8*)malloc(it->len);
+ { it->data = (U8*)rfx_alloc(it->len);
it->memsize = it->len;
swf_GetBlock(t, it->data, it->len);
}
break;
}
- free(t->data); t->data = 0;
+ rfx_free(t->data); t->data = 0;
t->memsize = t->len = t->pos = 0;
swf_SetU16(t, spriteid);
t->pos = 0;
id = swf_GetU16(t);
- free(t->data);
+ rfx_free(t->data);
t->len = t->pos = t->memsize = 0;
t->data = 0;
do
{
- if(t->len<0x3f) {
+ if(t->len<0x3f&&
+ (t->id!=ST_DEFINEBITSLOSSLESS&&t->id!=ST_DEFINEBITSLOSSLESS2&&t->id!=ST_SOUNDSTREAMBLOCK&&
+ t->id!=ST_DEFINEBITSJPEG&&t->id!=ST_DEFINEBITSJPEG2&&t->id!=ST_DEFINEBITSJPEG3)
+ ) {
swf_SetU16(sprtag,t->len|(t->id<<6));
} else {
swf_SetU16(sprtag,0x3f|(t->id<<6));
}
}
-void swf_FoldAllTags(TAG*tag)
-{
- SWF swf;
- memset(&swf, 0, sizeof(swf));
- swf.firstTag = tag;
- swf_FoldAll(&swf);
-}
-
void swf_UnFoldAll(SWF*swf)
{
TAG*tag = swf->firstTag;
tag->next = level0;
tag->prev = level0->prev;
level0->prev = tag;
- tag->prev->next = tag;
+ if(tag->prev)
+ tag->prev->next = tag;
+ else
+ swf->firstTag = tag;
changes = 1;
}
}
// Movie Functions
-int swf_ReadSWF2(struct reader_t*reader, SWF * swf) // Reads SWF to memory (malloc'ed), returns length or <0 if fails
+int swf_ReadSWF2(reader_t*reader, SWF * swf) // Reads SWF to memory (malloc'ed), returns length or <0 if fails
{
if (!swf) return -1;
memset(swf,0x00,sizeof(SWF));
int len;
TAG * t;
TAG t1;
- struct reader_t zreader;
+ reader_t zreader;
if ((len = reader->read(reader ,b,8))<8) return -1;
int swf_ReadSWF(int handle, SWF * swf)
{
- struct reader_t reader;
+ reader_t reader;
reader_init_filereader(&reader, handle);
return swf_ReadSWF2(&reader, swf);
}
-int swf_WriteSWF2(struct writer_t*writer, SWF * swf) // Writes SWF to file, returns length or <0 if fails
+int swf_WriteSWF2(writer_t*writer, SWF * swf) // Writes SWF to file, returns length or <0 if fails
{ U32 len;
TAG * t;
int frameCount=0;
- struct writer_t zwriter;
+ writer_t zwriter;
int fileSize = 0;
int inSprite = 0;
+ int writer_lastpos = 0;
+ int ret;
if (!swf) return -1;
+ if (!writer) return -1; // the caller should provide a nullwriter, not 0, for querying SWF size
+
+ 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
- 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);
+ 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);
+ }
#endif // INSERT_RFX_TAG
while(t) {
len += swf_WriteTag(-1,t);
- if(t->id == ST_DEFINESPRITE) inSprite++;
+ if(t->id == ST_DEFINESPRITE && !swf_IsFolded(t)) inSprite++;
else if(t->id == ST_END && inSprite) inSprite--;
+ else if(t->id == ST_END && !inSprite) {
+ if(t->prev && t->prev->id!=ST_SHOWFRAME)
+ frameCount++;
+ }
else if(t->id == ST_SHOWFRAME && !inSprite) frameCount++;
t = swf_NextTag(t);
}
if(swf->compressed != 8) {
/* compressed flag set to 8 means "skip first 8
header bytes". This is necessary if the caller wants to
- create compressed SWFs himself */
+ create compressed SWFs himself .
+ It also means that we don't initialize our own zlib
+ writer, but assume the caller provided one.
+ */
if(swf->compressed) {
char*id = "CWS";
writer->write(writer, id, 3);
swf_SetU16(&t1,swf->frameRate);
swf_SetU16(&t1,swf->frameCount);
- if (writer)
- {
- int ret = writer->write(writer,b,swf_GetTagLen(&t1));
- if (ret!=swf_GetTagLen(&t1))
- {
- #ifdef DEBUG_RFXSWF
- fprintf(stderr, "ret:%d\n",ret);
- perror("write:");
- fprintf(stderr,"WriteSWF() failed: Header.\n");
- #endif
- return -1;
- }
+ ret = writer->write(writer,b,swf_GetTagLen(&t1));
+ if (ret!=swf_GetTagLen(&t1))
+ {
+ #ifdef DEBUG_RFXSWF
+ fprintf(stderr, "ret:%d\n",ret);
+ perror("write:");
+ fprintf(stderr,"WriteSWF() failed: Header.\n");
+ #endif
+ return -1;
+ }
- t = swf->firstTag;
- while (t)
- { if (swf_WriteTag2(writer, t)<0) return -1;
- t = swf_NextTag(t);
+ t = swf->firstTag;
+ while (t)
+ { if (swf_WriteTag2(writer, t)<0) return -1;
+ t = swf_NextTag(t);
+ }
+ if(swf->compressed) {
+ if(swf->compressed != 8) {
+ zwriter.finish(&zwriter);
+ return writer->pos - writer_lastpos;
}
- if(swf->compressed != 8)
- writer->finish(writer); // flush zlib buffers - only if _we_ initialized that writer.
+ return (int)fileSize;
+ } else {
+ return (int)fileSize;
}
}
- return (int)fileSize;
}
int swf_WriteSWF(int handle, SWF * swf) // Writes SWF to file, returns length or <0 if fails
{
- struct writer_t writer;
+ writer_t writer;
+ int len = 0;
swf->compressed = 0;
+
if(handle<0) {
writer_init_nullwriter(&writer);
- return swf_WriteSWF2(&writer, swf);
+ len = swf_WriteSWF2(&writer, swf);
+ return len;
}
writer_init_filewriter(&writer, handle);
- return swf_WriteSWF2(&writer, swf);
+ len = swf_WriteSWF2(&writer, swf);
+ writer.finish(&writer);
+ return len;
}
int swf_WriteSWC(int handle, SWF * swf) // Writes SWF to file, returns length or <0 if fails
{
- struct writer_t writer;
+ writer_t writer;
+ int len = 0;
swf->compressed = 1;
+
if(handle<0) {
writer_init_nullwriter(&writer);
- return swf_WriteSWF2(&writer, swf);
+ len = swf_WriteSWF2(&writer, swf);
}
writer_init_filewriter(&writer, handle);
- return swf_WriteSWF2(&writer, swf);
+ len = swf_WriteSWF2(&writer, swf);
+ writer.finish(&writer);
+ return len;
}
-int swf_WriteHeader2(struct writer_t*writer,SWF * swf)
+int swf_WriteHeader2(writer_t*writer,SWF * swf)
{
SWF myswf;
memcpy(&myswf,swf,sizeof(SWF));
return swf_WriteSWF(fileno(stdout),swf);
}
+SWF* swf_CopySWF(SWF*swf)
+{
+ SWF*nswf = rfx_alloc(sizeof(SWF));
+ TAG*tag, *ntag;
+ memcpy(nswf, swf, sizeof(SWF));
+ nswf->firstTag = 0;
+ tag = swf->firstTag;
+ ntag = 0;
+ while(tag) {
+ ntag = swf_CopyTag(ntag, tag);
+ if(!nswf->firstTag)
+ nswf->firstTag = ntag;
+ tag = tag->next;
+ }
+ return nswf;
+}
+
void swf_FreeTags(SWF * swf) // Frees all malloc'ed memory for tags
{ TAG * t = swf->firstTag;
while (t)
{ TAG * tnew = t->next;
- if (t->data) free(t->data);
- free(t);
+ if (t->data) rfx_free(t->data);
+ rfx_free(t);
t = tnew;
}
+ swf->firstTag = 0;
}
// include advanced functions
#include "modules/swfaction.c"
#include "modules/swfsound.c"
#include "modules/swfdraw.c"
+#include "modules/swfrender.c"
git.asbjorn.biz / swftools.git / blobdiff