diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2010-11-10 13:18:08 (GMT) |
|---|---|---|
| committer | Jiang Jiang <jiang.jiang@nokia.com> | 2010-11-10 14:27:27 (GMT) |
| commit | 46d2d05e3a95eefae1c72f55d57cbea4ce27d14e (patch) | |
| tree | e03ec2b7d593dda532db338bcade35949d841b0f /src/gui/text/qfontengine_mac.mm | |
| parent | 60a30394e3df9f7674d9c7c5b70f4963c2b1f293 (diff) | |
| download | Qt-46d2d05e3a95eefae1c72f55d57cbea4ce27d14e.zip Qt-46d2d05e3a95eefae1c72f55d57cbea4ce27d14e.tar.gz Qt-46d2d05e3a95eefae1c72f55d57cbea4ce27d14e.tar.bz2 | |
Support glyph subpixel positioning without subpixel rendering
Previously subpixel positioning was only used when subpixel rendering
is enabled (glyphType == Raster_RGBMask), however, it does not
necessarily require that and for Mac OS X it will keep using
subpixel positioning even when LCD font smoothing (subpixel rendering)
is turned off. To maintain consistency when switching to raster,
we should support subpixel positioning in this case.
Task-number: QTBUG-5053
Reviewed-by: Jørgen Lind
Diffstat (limited to 'src/gui/text/qfontengine_mac.mm')
| -rw-r--r-- | src/gui/text/qfontengine_mac.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qfontengine_mac.mm b/src/gui/text/qfontengine_mac.mm index ebc1f6d..cebd1f5 100644 --- a/src/gui/text/qfontengine_mac.mm +++ b/src/gui/text/qfontengine_mac.mm @@ -713,9 +713,9 @@ QImage QCoreTextFontEngine::imageForGlyph(glyph_t glyph, QFixed subPixelPosition return im; } -QImage QCoreTextFontEngine::alphaMapForGlyph(glyph_t glyph) +QImage QCoreTextFontEngine::alphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition, const QTransform &t) { - QImage im = imageForGlyph(glyph, QFixed(), 0, false); + QImage im = imageForGlyph(glyph, subPixelPosition, 0, false); QImage indexed(im.width(), im.height(), QImage::Format_Indexed8); QVector<QRgb> colors(256); |