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

#1677 DefineFont2/3 font must have layout or numGlyphs>0 for codeTableOffset to be present

Browse Source
This commit is contained in:
Jindra Petřík
2021-04-03 17:42:50 +02:00
parent edeec29fb7
commit 698fbc6f1c
3 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,10 +153,12 @@ public class DefineFont2Tag extends FontTag {
}
}
if (fontFlagsWideOffsets) {
sis.readUI32("codeTableOffset");
} else {
sis.readUI16("codeTableOffset");
if (numGlyphs > 0 || fontFlagsHasLayout) {
if (fontFlagsWideOffsets) {
sis.readUI32("codeTableOffset");
} else {
sis.readUI16("codeTableOffset");
}
}
glyphShapeTable = new ArrayList<>();
@@ -280,11 +282,13 @@ public class DefineFont2Tag extends FontTag {
}
}
long offset = (glyphShapeTable.size() + 1/*CodeTableOffset*/) * (fontFlagsWideOffsets ? 4 : 2) + baGlyphShapes.length;
if (fontFlagsWideOffsets) {
sos.writeUI32(offset);
} else {
sos.writeUI16((int) offset);
if (numGlyphs > 0 || fontFlagsHasLayout) {
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);

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

@@ -145,10 +145,12 @@ public class DefineFont3Tag extends FontTag {
offsetTable[i] = sis.readUI16("offset");
}
}
if (fontFlagsWideOffsets) {
sis.readUI32("codeTableOffset");
} else {
sis.readUI16("codeTableOffset");
if (numGlyphs > 0 || fontFlagsHasLayout) {
if (fontFlagsWideOffsets) {
sis.readUI32("codeTableOffset");
} else {
sis.readUI16("codeTableOffset");
}
}
glyphShapeTable = new ArrayList<>();
for (int i = 0; i < numGlyphs; i++) {
@@ -269,11 +271,13 @@ 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 || fontFlagsHasLayout) {
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);