git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added some error checks.
[swftools.git]
/
src
/
swfcombine.c
diff --git
a/src/swfcombine.c
b/src/swfcombine.c
index
e595d26
..
5f86221
100644
(file)
--- a/
src/swfcombine.c
+++ b/
src/swfcombine.c
@@
-524,7
+524,7
@@
void matrix_adjust(MATRIX*m, int movex, int movey, float scalex, float scaley, i
void write_changepos(TAG*output, TAG*tag, int movex, int movey, float scalex, float scaley, int scalepos)
{
void write_changepos(TAG*output, TAG*tag, int movex, int movey, float scalex, float scaley, int scalepos)
{
- if(movex || movey || scalex != 1 || scaley != 1)
+ if(movex || movey || scalex != 1.0 || scaley != 1.0)
{
switch(tag->id)
{
{
switch(tag->id)
{
@@
-551,7
+551,8
@@
void write_changepos(TAG*output, TAG*tag, int movex, int movey, float scalex, fl
matrix_adjust(&m, movex, movey, scalex, scaley, scalepos);
swf_SetMatrix(output, &m);
matrix_adjust(&m, movex, movey, scalex, scaley, scalepos);
swf_SetMatrix(output, &m);
- //swf_ResetReadBits(tag);
+ if (tag->readBit) { tag->pos++; tag->readBit = 0; } //swf_ResetReadBits(tag);
+
swf_SetBlock(output, &tag->data[tag->pos], tag->len - tag->pos);
break;
}
swf_SetBlock(output, &tag->data[tag->pos], tag->len - tag->pos);
break;
}
@@
-564,7
+565,8
@@
void write_changepos(TAG*output, TAG*tag, int movex, int movey, float scalex, fl
matrix_adjust(&m, movex, movey, scalex, scaley, scalepos);
swf_SetMatrix(output, &m);
matrix_adjust(&m, movex, movey, scalex, scaley, scalepos);
swf_SetMatrix(output, &m);
- //swf_ResetReadBits(tag);
+ if (tag->readBit) { tag->pos++; tag->readBit = 0; } //swf_ResetReadBits(tag);
+
swf_SetBlock(output, &tag->data[tag->pos], tag->len - tag->pos);
break;
}
swf_SetBlock(output, &tag->data[tag->pos], tag->len - tag->pos);
break;
}
@@
-955,7
+957,8
@@
void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
}
swf_Relocate (slave, masterbitmap);
}
swf_Relocate (slave, masterbitmap);
- swf_RelocateDepth (slave, depthbitmap);
+ if(config.merge)
+ swf_RelocateDepth (slave, depthbitmap);
jpeg_assert(slave, master);
if (config.overlay)
jpeg_assert(slave, master);
if (config.overlay)