UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-18 21:30:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[kandinsky/font] Factor indexForCodePoint default return value

Browse Source
This commit is contained in:
Ruben Dashyan
2020-01-29 14:43:35 +01:00
committed by Léa Saviot
parent ed035ec3f7
commit 009faa1e37
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kandinsky/src/font.cpp
View File

@@ -136,16 +136,16 @@ KDFont::GlyphIndex KDFont::indexForCodePoint(CodePoint c) const {
}
#else
const CodePointIndexPair * currentPair = m_table;
if (c < currentPair->codePoint()) {
return defaultIndex;
}
const CodePointIndexPair * endPair = m_table + m_tableLength - 1;
if (c < currentPair->codePoint()) {
goto NoMatchingGlyph;
}
while (currentPair < endPair) {
const CodePointIndexPair * nextPair = currentPair + 1;
if (c < nextPair->codePoint()) {
CodePoint lastCodePointOfCurrentPair = currentPair->codePoint() + (nextPair->glyphIndex() - currentPair->glyphIndex() - 1);
if (c > lastCodePointOfCurrentPair) {
return defaultIndex;
goto NoMatchingGlyph;
}
return currentPair->glyphIndex() + (c - currentPair->codePoint());
}
@@ -154,6 +154,7 @@ KDFont::GlyphIndex KDFont::indexForCodePoint(CodePoint c) const {
if (endPair->codePoint() == c) {
return endPair->glyphIndex();
}
NoMatchingGlyph:
return defaultIndex;
#endif
}