LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-03 04:15:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed calculating needed fill/line bits for SHAPE, SHAPEWITHSTYLE

Browse Source
This commit is contained in:
Jindra Petřík
2023-10-14 10:16:30 +02:00
parent ae63d3c527
commit 0005f73ae9
6 changed files with 44 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWFOutputStream.java
View File

@@ -1353,20 +1353,47 @@ public class SWFOutputStream extends OutputStream {
/**
* Writes SHAPE value to the stream
*
* @param fillStyleCount
* @param lineStyleCount
* @param value SHAPE value
* @param shapeNum 1 in DefineShape, 2 in DefineShape2,...
* @throws IOException
*/
public void writeSHAPE(int fillStyleCount, int lineStyleCount, SHAPE value, int shapeNum) throws IOException {
value.numFillBits = getNeededBitsU(fillStyleCount);
value.numLineBits = getNeededBitsU(lineStyleCount);
public void writeSHAPE(SHAPE value, int shapeNum) throws IOException {
calculateSHAPEFillLineBits(value);
writeUB(4, value.numFillBits);
writeUB(4, value.numLineBits);
writeSHAPERECORDS(value.shapeRecords, value.numFillBits, value.numLineBits, shapeNum);
}
private void calculateSHAPEFillLineBits(SHAPE value) {
int numFillBits = 0;
int numLineBits = 0;
for (SHAPERECORD r : value.shapeRecords) {
if (r instanceof StyleChangeRecord) {
StyleChangeRecord scr = (StyleChangeRecord) r;
if (scr.stateNewStyles) {
break;
}
if (scr.stateFillStyle0) {
numFillBits = Math.max(numFillBits, getNeededBitsU(scr.fillStyle0));
}
if (scr.stateFillStyle1) {
numFillBits = Math.max(numFillBits, getNeededBitsU(scr.fillStyle1));
}
if (scr.stateLineStyle) {
numLineBits = Math.max(numLineBits, getNeededBitsU(scr.lineStyle));
}
}
}
if (Configuration._debugCopy.get()) {
numFillBits = Math.max(numFillBits, value.numFillBits);
numLineBits = Math.max(numLineBits, value.numLineBits);
}
value.numFillBits = numFillBits;
value.numLineBits = numLineBits;
}
/**
* Writes SHAPEWITHSTYLE value to the stream
*
@@ -1377,8 +1404,7 @@ public class SWFOutputStream extends OutputStream {
public void writeSHAPEWITHSTYLE(SHAPEWITHSTYLE value, int shapeNum) throws IOException {
writeFILLSTYLEARRAY(value.fillStyles, shapeNum);
writeLINESTYLEARRAY(value.lineStyles, shapeNum);
value.numFillBits = getNeededBitsU(value.fillStyles.fillStyles.length);
value.numLineBits = getNeededBitsU(shapeNum <= 3 ? value.lineStyles.lineStyles.length : value.lineStyles.lineStyles2.length);
calculateSHAPEFillLineBits(value);
writeUB(4, value.numFillBits);
writeUB(4, value.numLineBits);
writeSHAPERECORDS(value.shapeRecords, value.numFillBits, value.numLineBits, shapeNum);