diff options
| author | aavit <qt-info@nokia.com> | 2011-09-22 09:02:18 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2011-09-22 09:02:18 (GMT) |
| commit | 1b215938323d42276efcf8c293c5da66dca7c76a (patch) | |
| tree | 059b57324eb56bc8f403dbb05bbbb447f2212f52 /src/gui/text | |
| parent | 128c4166ba445112ab73dd98b3e403da0489656e (diff) | |
| parent | 085bd7cf2d76f9acd548120f859201b014970a72 (diff) | |
| download | Qt-1b215938323d42276efcf8c293c5da66dca7c76a.zip Qt-1b215938323d42276efcf8c293c5da66dca7c76a.tar.gz Qt-1b215938323d42276efcf8c293c5da66dca7c76a.tar.bz2 | |
Merge remote-tracking branch 'qt-mainline/4.8'
Conflicts:
dist/changes-4.8.0
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qfontengine_ft_p.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/gui/text/qfontengine_ft_p.h b/src/gui/text/qfontengine_ft_p.h index 57811fa..95e5b82 100644 --- a/src/gui/text/qfontengine_ft_p.h +++ b/src/gui/text/qfontengine_ft_p.h @@ -196,12 +196,7 @@ public: inline bool useFastGlyphData(glyph_t index, QFixed subPixelPosition) const { return (index < 256 && subPixelPosition == 0); } - inline Glyph *getGlyph(glyph_t index, QFixed subPixelPosition = 0) const - { - if (useFastGlyphData(index, subPixelPosition)) - return fast_glyph_data[index]; - return glyph_data.value(GlyphAndSubPixelPosition(index, subPixelPosition)); - } + inline Glyph *getGlyph(glyph_t index, QFixed subPixelPosition = 0) const; void setGlyph(glyph_t index, QFixed spp, Glyph *glyph); private: @@ -376,6 +371,14 @@ inline uint qHash(const QFontEngineFT::GlyphAndSubPixelPosition &g) return (g.glyph << 8) | (g.subPixelPosition * 10).round().toInt(); } +inline QFontEngineFT::Glyph *QFontEngineFT::QGlyphSet::getGlyph(glyph_t index, QFixed subPixelPosition) const +{ + if (useFastGlyphData(index, subPixelPosition)) + return fast_glyph_data[index]; + return glyph_data.value(GlyphAndSubPixelPosition(index, subPixelPosition)); +} + + QT_END_NAMESPACE #endif // QT_NO_FREETYPE |