diff options
author | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-19 06:30:48 (GMT) |
---|---|---|
committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-19 11:58:40 (GMT) |
commit | 226d67e9077b908a128521a6bb763cf412fbe87e (patch) | |
tree | 6a0913ec3696c148c75f54177a070dd2fc0c4d8d /src/gui/text/qfontengine_p.h | |
parent | 162dd5b9360a362a78e77387ed92c49934201a32 (diff) | |
download | Qt-226d67e9077b908a128521a6bb763cf412fbe87e.zip Qt-226d67e9077b908a128521a6bb763cf412fbe87e.tar.gz Qt-226d67e9077b908a128521a6bb763cf412fbe87e.tar.bz2 |
Fixed bad glyph rendering under cocoa
The positioning is still wrong, but now it at least the glyphs are ok
Reviewed-by: msorvig
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 50124fa..728c344 100644 --- a/src/gui/text/qfontengine_p.h +++ b/src/gui/text/qfontengine_p.h @@ -448,12 +448,13 @@ public: 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 alphaRGBMapForGlyph(glyph_t, int margin, const QTransform &t); virtual qreal minRightBearing() const; virtual qreal minLeftBearing() const; - private: + QImage imageForGlyph(glyph_t glyph, int margin, bool colorful); CTFontRef ctfont; CGFontRef cgFont; QCoreTextFontEngineMulti *parentEngine; |