diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-11-19 15:24:08 +0100 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-11-19 15:24:08 +0100 |
| commit | e50e811461b54e07184af547f62aa44b3c5bb681 (patch) | |
| tree | 45541bc05471d6c49305afeafa13f69031ccdecd /src/gui/text/qfontengine_p.h | |
| parent | 05b65c2f9df1c2c56c72f313401a6adb422d381b (diff) | |
| parent | b115770cc3bba68740a6848c7ccaed932399aca9 (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/gui/text/qfontengine_mac.mm
src/gui/text/qfontengine_p.h
Diffstat (limited to 'src/gui/text/qfontengine_p.h')
| -rw-r--r-- | src/gui/text/qfontengine_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h index c584ba1526..d528c69568 100644 --- a/src/gui/text/qfontengine_p.h +++ b/src/gui/text/qfontengine_p.h @@ -196,7 +196,9 @@ public: * Returns an image indexed_8 with index values ranging from 0=fully transparant to 255=opaque */ virtual QImage alphaMapForGlyph(glyph_t); + virtual QImage alphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition); virtual QImage alphaMapForGlyph(glyph_t, const QTransform &t); + virtual QImage alphaMapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t); virtual QImage alphaRGBMapForGlyph(glyph_t, QFixed subPixelPosition, int margin, const QTransform &t); virtual glyph_metrics_t alphaMapBoundingBox(glyph_t glyph, const QTransform &matrix, GlyphFormat /*format*/) |