X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfcombine.c;h=f6257fe646744f9a315d54876d9eff253273fce6;hb=d9872c4e9c1c252d74d380d114eeb769c043e013;hp=e595d26affc43d2df6830179032305bb1e383f73;hpb=6f3e9add89a0157ef6552bc154475b43b371e615;p=swftools.git diff --git a/src/swfcombine.c b/src/swfcombine.c index e595d26..f6257fe 100644 --- 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) { - if(movex || movey || scalex != 1 || scaley != 1) + if(movex || movey || scalex != 1.0 || scaley != 1.0) { 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); - //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; } @@ -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); - //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; }