diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-10 20:19:57 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-10 20:19:57 (GMT) |
| commit | e8ddca677db9b0d3ac8ff1b2079c3b000d59d6ec (patch) | |
| tree | 8d95a3f2bb9284daf749651b1ef1f8825ba0182d /src/gui/text/qfontengine_p.h | |
| parent | 1528f9a84837e98ea8a4e66a31f27464ccd4b554 (diff) | |
| parent | d40088433a96746c1904b9a2fc2999b784fe8850 (diff) | |
| download | Qt-e8ddca677db9b0d3ac8ff1b2079c3b000d59d6ec.zip Qt-e8ddca677db9b0d3ac8ff1b2079c3b000d59d6ec.tar.gz Qt-e8ddca677db9b0d3ac8ff1b2079c3b000d59d6ec.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Amend commit 27fe0f93f961e78b71cd0b729a0e324b847ec023
Fix warnings
QtCore autotests: make them paralelized.
Fix crash in tst_QByteArray::qUncompress
Support glyph subpixel positioning without subpixel rendering
Diffstat (limited to 'src/gui/text/qfontengine_p.h')
| -rw-r--r-- | src/gui/text/qfontengine_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h index 6d6daaa..061bcfd 100644 --- a/src/gui/text/qfontengine_p.h +++ b/src/gui/text/qfontengine_p.h @@ -197,6 +197,7 @@ public: */ virtual QImage alphaMapForGlyph(glyph_t); 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*/) @@ -473,7 +474,7 @@ public: virtual FaceId faceId() const; virtual bool getSfntTableData(uint /*tag*/, uchar * /*buffer*/, uint * /*length*/) const; virtual void getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_metrics_t *metrics); - virtual QImage alphaMapForGlyph(glyph_t); + virtual QImage alphaMapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t); virtual QImage alphaRGBMapForGlyph(glyph_t, QFixed subPixelPosition, int margin, const QTransform &t); virtual qreal minRightBearing() const; virtual qreal minLeftBearing() const; |