Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

always select unicode character map

Browse source 
fixes loading of some symbol font glyphs, any other character map is
considered legacy

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-12-26 15:43:12 +02:00
parent de6dfdceb1
commit 4a2e0537e3
2 changed files with 9 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/gui/text/qfontengine_ft.cpp
View file

@ -57,8 +57,6 @@ QFreetypeFace::QFreetypeFace(const QFontEngine::FaceId &face_id)
: face(nullptr),
xsize(0),
ysize(0),
unicode_map(nullptr),
symbol_map(nullptr),
library(nullptr)
{
FT_Init_FreeType(&library);
@ -93,32 +91,7 @@ QFreetypeFace::QFreetypeFace(const QFontEngine::FaceId &face_id)
return;
}
for (int i = 0; i < face->num_charmaps; ++i) {
FT_CharMap cm = face->charmaps[i];
switch(cm->encoding) {
case FT_ENCODING_UNICODE: {
unicode_map = cm;
break;
}
case FT_ENCODING_APPLE_ROMAN:
case FT_ENCODING_ADOBE_LATIN_1: {
if (!unicode_map || unicode_map->encoding != FT_ENCODING_UNICODE)
unicode_map = cm;
break;
}
case FT_ENCODING_ADOBE_CUSTOM:
case FT_ENCODING_MS_SYMBOL: {
if (!symbol_map)
symbol_map = cm;
break;
}
default: {
break;
}
}
}
FT_Set_Charmap(face, unicode_map);
FT_Select_Charmap(face, FT_ENCODING_UNICODE);
}
QFreetypeFace::~QFreetypeFace()
@ -653,27 +626,15 @@ bool QFontEngineFT::stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs
}
int glyph_pos = 0;
if (freetype->symbol_map) {
FT_Face face = freetype->face;
for (int i = 0; i < len; ++i ) {
unsigned int uc = getChar(str, i, len);
FT_Set_Charmap(face, freetype->symbol_map);
glyph_t glyph = FT_Get_Char_Index(face, uc);
FT_Set_Charmap(face, freetype->unicode_map);
glyphs->glyphs[glyph_pos] = glyph;
++glyph_pos;
}
} else {
const bool mirrored = (flags & QTextEngine::RightToLeft);
for (int i = 0; i < len; ++i) {
unsigned int uc = getChar(str, i, len);
if (mirrored) {
uc = QChar::mirroredChar(uc);
}
glyph_t glyph = FT_Get_Char_Index(freetype->face, uc);
glyphs->glyphs[glyph_pos] = glyph;
++glyph_pos;
const bool mirrored = (flags & QTextEngine::RightToLeft);
for (int i = 0; i < len; ++i) {
unsigned int uc = getChar(str, i, len);
if (mirrored) {
uc = QChar::mirroredChar(uc);
}
glyph_t glyph = FT_Get_Char_Index(freetype->face, uc);
glyphs->glyphs[glyph_pos] = glyph;
++glyph_pos;
}
*nglyphs = glyph_pos;

2
src/gui/text/qfontengine_ft_p.h
View file

@ -66,8 +66,6 @@ public:
FT_Face face;
int xsize; // 26.6
int ysize; // 26.6
FT_CharMap unicode_map;
FT_CharMap symbol_map;
int fsType() const;