Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 18:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

do not init freetype library in QFreetypeFace if the font filename is empty

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-04-08 12:32:55 +03:00
parent 526329c655
commit 0fa26a55ca
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -58,11 +58,10 @@ QFreetypeFace::QFreetypeFace(const QFontEngine::FaceId &face_id)
: face(nullptr),
library(nullptr)
{
FT_Init_FreeType(&library);
if (face_id.filename.isEmpty()) {
return;
}
FT_Init_FreeType(&library);
if (FT_New_Face(library, face_id.filename, face_id.index, &face) != 0) {
return;
@ -73,8 +72,12 @@ QFreetypeFace::QFreetypeFace(const QFontEngine::FaceId &face_id)
QFreetypeFace::~QFreetypeFace()
{
FT_Done_Face(face);
FT_Done_FreeType(library);
if (face) {
FT_Done_Face(face);
}
if (library) {
FT_Done_FreeType(library);
}
}
void QFreetypeFace::addGlyphToPath(const FT_Outline &outline, const QFixedPoint &point, QPainterPath *path)
@ -174,7 +177,6 @@ QFontEngineFT::QFontEngineFT(const QFontDef &fd, FcPattern *pattern)
// FcPatternPrint(pattern);
FcChar8 *fileName;
FcPatternGetString(pattern, FC_FILE, 0, &fileName);
face_id.filename = (const char *)fileName;
@ -243,24 +245,22 @@ void QFontEngineFT::init()
QFontEngineFT::~QFontEngineFT()
{
if (freetype) {
GlyphCache::const_iterator iter = glyphcache.begin();
GlyphCache::const_iterator iterend = glyphcache.end();
while (iter != iterend) {
QFontGlyph* gcache = iter->second;
GlyphCache::const_iterator iter = glyphcache.begin();
GlyphCache::const_iterator iterend = glyphcache.end();
while (iter != iterend) {
QFontGlyph* gcache = iter->second;
#ifdef QT_MEMCPY_FT_OUTLINE
::free(gcache->outline.contours);
::free(gcache->outline.points);
::free(gcache->outline.tags);
::free(gcache->outline.contours);
::free(gcache->outline.points);
::free(gcache->outline.tags);
#else
FT_Outline_Done(freetype->library, &(gcache->outline));
FT_Outline_Done(freetype->library, &(gcache->outline));
#endif
delete gcache;
iter++;
}
delete freetype;
delete gcache;
iter++;
}
delete freetype;
}
bool QFontEngineFT::loadGlyph(glyph_t glyph) const