LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-07-18 09:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: #1677 DefineFont2/3 - missing codeTableOffset if numGlyphs is zero

Browse Source
This commit is contained in:
Jindra Petřík
2021-04-03 15:20:13 +02:00
parent 1a52709bd5
commit f616fe43a6
3 changed files with 40 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFont2Tag.java
View File

@@ -152,12 +152,11 @@ public class DefineFont2Tag extends FontTag {
offsetTable[i] = sis.readUI16("offset");
}
}
if (numGlyphs > 0) { //codeTableOffset
if (fontFlagsWideOffsets) {
sis.readUI32("codeTableOffset");
} else {
sis.readUI16("codeTableOffset");
}
if (fontFlagsWideOffsets) {
sis.readUI32("codeTableOffset");
} else {
sis.readUI16("codeTableOffset");
}
glyphShapeTable = new ArrayList<>();
@@ -280,23 +279,24 @@ public class DefineFont2Tag extends FontTag {
sos.writeUI16((int) (long) offset);
}
}
if (numGlyphs > 0) {
long offset = (glyphShapeTable.size() + 1/*CodeTableOffset*/) * (fontFlagsWideOffsets ? 4 : 2) + baGlyphShapes.length;
if (fontFlagsWideOffsets) {
sos.writeUI32(offset);
} else {
sos.writeUI16((int) offset);
}
sos.write(baGlyphShapes);
for (int i = 0; i < numGlyphs; i++) {
if (fontFlagsWideCodes) {
sos.writeUI16(codeTable.get(i));
} else {
sos.writeUI8(codeTable.get(i));
}
long offset = (glyphShapeTable.size() + 1/*CodeTableOffset*/) * (fontFlagsWideOffsets ? 4 : 2) + baGlyphShapes.length;
if (fontFlagsWideOffsets) {
sos.writeUI32(offset);
} else {
sos.writeUI16((int) offset);
}
if (numGlyphs > 0) {
sos.write(baGlyphShapes);
}
for (int i = 0; i < numGlyphs; i++) {
if (fontFlagsWideCodes) {
sos.writeUI16(codeTable.get(i));
} else {
sos.writeUI8(codeTable.get(i));
}
}
if (fontFlagsHasLayout) {
sos.writeUI16(fontAscent);
sos.writeUI16(fontDescent);

35
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineFont3Tag.java
View File

@@ -145,12 +145,10 @@ public class DefineFont3Tag extends FontTag {
offsetTable[i] = sis.readUI16("offset");
}
}
if (numGlyphs > 0) {
if (fontFlagsWideOffsets) {
sis.readUI32("codeTableOffset"); //codeTableOffset
} else {
sis.readUI16("codeTableOffset"); //codeTableOffset
}
if (fontFlagsWideOffsets) {
sis.readUI32("codeTableOffset");
} else {
sis.readUI16("codeTableOffset");
}
glyphShapeTable = new ArrayList<>();
for (int i = 0; i < numGlyphs; i++) {
@@ -271,23 +269,24 @@ public class DefineFont3Tag extends FontTag {
sos.writeUI16((int) offset2);
}
}
long offset = (glyphShapeTable.size() + 1/*CodeTableOffset*/) * (fontFlagsWideOffsets ? 4 : 2) + baGlyphShapes.length;
if (fontFlagsWideOffsets) {
sos.writeUI32(offset);
} else {
sos.writeUI16((int) offset);
}
if (numGlyphs > 0) {
long offset = (glyphShapeTable.size() + 1/*CodeTableOffset*/) * (fontFlagsWideOffsets ? 4 : 2) + baGlyphShapes.length;
if (fontFlagsWideOffsets) {
sos.writeUI32(offset);
} else {
sos.writeUI16((int) offset);
}
sos.write(baGlyphShapes);
}
for (int i = 0; i < numGlyphs; i++) {
if (fontFlagsWideCodes) {
sos.writeUI16(codeTable.get(i));
} else {
sos.writeUI8(codeTable.get(i));
}
for (int i = 0; i < numGlyphs; i++) {
if (fontFlagsWideCodes) {
sos.writeUI16(codeTable.get(i));
} else {
sos.writeUI8(codeTable.get(i));
}
}
if (fontFlagsHasLayout) {
sos.writeUI16(fontAscent);
sos.writeUI16(fontDescent);