LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-27 15:20:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: #2612 SVG export - handle incorrect surrogate pairs in text

Browse Source
This commit is contained in:
Jindra Petřík
2026-01-17 18:30:17 +01:00
parent d7c5599237
commit 6949793130
2 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/TextTag.java
+29 -4
View File
@@ -982,6 +982,30 @@ public abstract class TextTag extends DrawableTag {
return family;
}
private static String sanitizeUtf16(String s) {
if (s == null) {
return null;
}
StringBuilder out = new StringBuilder(s.length());
for (int i = 0; i < s.length(); i++) {
char c = s.charAt(i);
if (Character.isHighSurrogate(c)) {
if (i + 1 < s.length() && Character.isLowSurrogate(s.charAt(i + 1))) {
out.append(c).append(s.charAt(i + 1));
i++; // validní pár
} else {
out.append('\uFFFD'); // broken high surrogate
}
} else if (Character.isLowSurrogate(c)) {
out.append('\uFFFD'); // alone low surrogate
} else {
out.append(c);
}
}
return out.toString();
}
/**
* Converts static text to SVG.
* @param swf SWF
@@ -1039,16 +1063,17 @@ public abstract class TextTag extends DrawableTag {
exporter.createSubGroup(new Matrix(textMatrix), null);
if (exporter.useTextTag) {
StringBuilder text = new StringBuilder();
StringBuilder textBuilder = new StringBuilder();
int totalAdvance = 0;
for (GLYPHENTRY entry : rec.glyphEntries) {
if (entry.glyphIndex != -1) {
char ch = font.glyphToChar(entry.glyphIndex);
text.append(ch);
textBuilder.append(ch);
totalAdvance += entry.glyphAdvance;
}
}
String text = sanitizeUtf16(textBuilder.toString());
boolean hasOffset = x != 0 || y != 0;
if (hasOffset) {
exporter.createSubGroup(Matrix.getTranslateInstance(x, y), null);
@@ -1062,7 +1087,7 @@ public abstract class TextTag extends DrawableTag {
textElement.setAttribute("textLength", Double.toString(totalAdvance / SWF.unitDivisor));
textElement.setAttribute("lengthAdjust", "spacing");
textElement.setAttribute("style", "white-space: pre");
textElement.setTextContent(text.toString());
textElement.setTextContent(text);
RGBA colorA = new RGBA(textColor);
textElement.setAttribute("fill", colorA.toHexRGB());