gitea/legado
gitea/legado
1
1
Fork 0
mirror of https://github.com/gedoor/legado.git synced 2024-07-02 23:17:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化轮廓索引为0的Unicode排除方式

Browse Source
This commit is contained in:
Antecer 2024-06-20 17:11:53 +08:00
parent d7ae1d4f0a
commit 85b1e7b548
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/io/legado/app/model/analyzeRule/QueryTTF.java
View File

@ -685,6 +685,7 @@ public class QueryTTF {
int unicodeInclusive = 0; int unicodeInclusive = 0;
int unicodeExclusive = f.glyphIdArray.length; int unicodeExclusive = f.glyphIdArray.length;
for (; unicodeInclusive < unicodeExclusive; unicodeInclusive++) { for (; unicodeInclusive < unicodeExclusive; unicodeInclusive++) {
if (f.glyphIdArray[unicodeInclusive] == 0) continue; // 排除轮廓索引为0的Unicode
unicodeToGlyphId.put(unicodeInclusive, f.glyphIdArray[unicodeInclusive]); unicodeToGlyphId.put(unicodeInclusive, f.glyphIdArray[unicodeInclusive]);
} }
break; break;
@ -711,12 +712,15 @@ public class QueryTTF {
int idDelta = f.idDelta[segmentIndex]; int idDelta = f.idDelta[segmentIndex];
int idRangeOffset = f.idRangeOffsets[segmentIndex]; int idRangeOffset = f.idRangeOffsets[segmentIndex];
for (int unicode = unicodeInclusive; unicode <= unicodeExclusive; unicode++) { for (int unicode = unicodeInclusive; unicode <= unicodeExclusive; unicode++) {
int glyphId = 0;
if (idRangeOffset == 0) { if (idRangeOffset == 0) {
unicodeToGlyphId.put(unicode, (unicode + idDelta) & 0xFFFF); glyphId = (unicode + idDelta) & 0xFFFF;
} else { } else {
int gIndex = (idRangeOffset / 2) + unicode - unicodeInclusive + segmentIndex - segCount; int gIndex = (idRangeOffset / 2) + unicode - unicodeInclusive + segmentIndex - segCount;
unicodeToGlyphId.put(unicode, gIndex < glyphIdArrayLength ? f.glyphIdArray[gIndex] + idDelta : 0); if (gIndex < glyphIdArrayLength) glyphId = f.glyphIdArray[gIndex] + idDelta;
} }
if (glyphId == 0) continue; // 排除轮廓索引为0的Unicode
unicodeToGlyphId.put(unicode, glyphId);
} }
} }
break; break;
@ -975,7 +979,6 @@ public class QueryTTF {
int key = item.getKey(); int key = item.getKey();
int val = item.getValue(); int val = item.getValue();
if (val >= glyfArrayLength) continue; if (val >= glyfArrayLength) continue;
if (val == 0) continue; // 排除轮廓索引为0的Unicode
String glyfString = getGlyfById(val); String glyfString = getGlyfById(val);
unicodeToGlyph.put(key, glyfString); unicodeToGlyph.put(key, glyfString);
if (glyfString == null) continue; // null 不能用作hashmap的key if (glyfString == null) continue; // null 不能用作hashmap的key