summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontengine_ft.cpp
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2014-12-29 16:37:38 +0100
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2014-12-29 16:37:38 +0100
commitaaff94c2df665035addb90714bab4722003894da (patch)
tree3af76e8aa4dbf86a86b1e4d2ad2f6dda06374ee0 /src/gui/text/qfontengine_ft.cpp
parent2302d386c7a1aa1a96658f79c236d6b8a59db7ac (diff)
parent1196f691120d77ab3be55f21824aba645210fb8c (diff)
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts: src/corelib/tools/qbytearray.cpp src/gui/kernel/qplatformsystemtrayicon.cpp src/gui/kernel/qplatformsystemtrayicon.h src/plugins/platforms/xcb/xcb-plugin.pro Change-Id: I00355d3908b678af8a61c38f9e814a63df808c79
Diffstat (limited to 'src/gui/text/qfontengine_ft.cpp')
-rw-r--r--src/gui/text/qfontengine_ft.cpp30
1 files changed, 0 insertions, 30 deletions
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp
index 4d6c04a262..5c1af8bb40 100644
--- a/src/gui/text/qfontengine_ft.cpp
+++ b/src/gui/text/qfontengine_ft.cpp
@@ -1410,36 +1410,6 @@ QFontEngineFT::QGlyphSet *QFontEngineFT::loadTransformedGlyphSet(const QTransfor
return gs;
}
-bool QFontEngineFT::loadGlyphs(QGlyphSet *gs, const glyph_t *glyphs, int num_glyphs,
- const QFixedPoint *positions,
- GlyphFormat format)
-{
- FT_Face face = 0;
-
- for (int i = 0; i < num_glyphs; ++i) {
- QFixed spp = subPixelPositionForX(positions[i].x);
- Glyph *glyph = gs ? gs->getGlyph(glyphs[i], spp) : 0;
- if (glyph == 0 || glyph->format != format) {
- if (!face) {
- face = lockFace();
- FT_Matrix m = matrix;
- FT_Matrix_Multiply(&gs->transformationMatrix, &m);
- FT_Set_Transform(face, &m, 0);
- freetype->matrix = m;
- }
- if (!loadGlyph(gs, glyphs[i], spp, format)) {
- unlockFace();
- return false;
- }
- }
- }
-
- if (face)
- unlockFace();
-
- return true;
-}
-
void QFontEngineFT::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_metrics_t *metrics)
{
FT_Face face = lockFace(Unscaled);