void swf_SetTagPos(TAG * t,U32 pos)
{ swf_ResetReadBits(t);
if (pos<=t->len) t->pos = pos;
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
+ }
if(handle<0)
return swf_WriteTag2(0, t);
writer_init_filewriter(&writer, handle);
if(handle<0)
return swf_WriteTag2(0, t);
writer_init_filewriter(&writer, handle);
if (swf->firstTag && swf_NextTag(swf->firstTag))
if (swf_GetTagID(swf_NextTag(swf->firstTag))!=ST_REFLEX)
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);
+ swf_SetBlock(swf_InsertTagBefore(swf, swf->firstTag,ST_REFLEX),"rfx",3);
- while(t)
- { len += swf_WriteTag(-1, t);
- if (t->id==ST_SHOWFRAME) frameCount++;
- t = swf_NextTag(t);
+ while(t) {
+ len += swf_WriteTag(-1,t);
+ if(t->id == ST_DEFINESPRITE) inSprite++;
+ else if(t->id == ST_END && inSprite) inSprite--;
+ 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
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.
+ */
swf_SetU16(&t1,swf->frameRate);
swf_SetU16(&t1,swf->frameCount);
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;
- }
+ 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;
+ }
- 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;