git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed button syntax.
[swftools.git]
/
lib
/
rfxswf.c
diff --git
a/lib/rfxswf.c
b/lib/rfxswf.c
index
c91f339
..
441e19d
100644
(file)
--- a/
lib/rfxswf.c
+++ b/
lib/rfxswf.c
@@
-78,9
+78,11
@@
U32 swf_GetTagPos(TAG * t) { return t->pos; }
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
+ }
}
char* swf_GetString(TAG*t)
}
char* swf_GetString(TAG*t)
@@
-288,7
+290,7
@@
int swf_SetRGBA(TAG * t,RGBA * col)
void swf_GetRGBA(TAG * t, RGBA * col)
{
RGBA dummy;
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);
col = &dummy;
col->r = swf_GetU8(t);
col->g = swf_GetU8(t);
@@
-433,6
+435,8
@@
void swf_ExpandRect2(SRECT*src, SRECT*add)
{
if((add->xmin | add->ymin | add->xmax | add->ymax)==0)
return;
{
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->xmin < src->xmin)
src->xmin = add->xmin;
if(add->ymin < src->ymin)
@@
-1203,6
+1207,7
@@
int swf_WriteSWF2(struct writer_t*writer, SWF * swf) // Writes SWF to file,
int fileSize = 0;
int inSprite = 0;
int writer_lastpos = 0;
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 (!swf) return -1;
if (!writer) return -1; // the caller should provide a nullwriter, not 0, for querying SWF size
@@
-1292,7
+1297,7
@@
int swf_WriteSWF2(struct writer_t*writer, SWF * swf) // Writes SWF to file,
swf_SetU16(&t1,swf->frameRate);
swf_SetU16(&t1,swf->frameCount);
swf_SetU16(&t1,swf->frameRate);
swf_SetU16(&t1,swf->frameCount);
- int ret = writer->write(writer,b,swf_GetTagLen(&t1));
+ ret = writer->write(writer,b,swf_GetTagLen(&t1));
if (ret!=swf_GetTagLen(&t1))
{
#ifdef DEBUG_RFXSWF
if (ret!=swf_GetTagLen(&t1))
{
#ifdef DEBUG_RFXSWF