diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-09-27 09:41:38 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-09-27 09:41:38 (GMT) |
| commit | 2271315eb46665b0a9e61ff0525340713163c1b6 (patch) | |
| tree | d0068e34924eca85eb6af4089b3f443a89c929f6 /src/gui/text/qfontengine.cpp | |
| parent | 33e7ee9d1866f12a9b92fe4b5549c31e30974d8e (diff) | |
| parent | 53d010a989aed878c21522cbaf0d75c7cf821b42 (diff) | |
| download | Qt-2271315eb46665b0a9e61ff0525340713163c1b6.zip Qt-2271315eb46665b0a9e61ff0525340713163c1b6.tar.gz Qt-2271315eb46665b0a9e61ff0525340713163c1b6.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
configure
src/corelib/global/qglobal.h
Diffstat (limited to 'src/gui/text/qfontengine.cpp')
| -rw-r--r-- | src/gui/text/qfontengine.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp index b37a190..3652c69 100644 --- a/src/gui/text/qfontengine.cpp +++ b/src/gui/text/qfontengine.cpp @@ -616,7 +616,7 @@ QImage QFontEngine::alphaMapForGlyph(glyph_t glyph, const QTransform &t) return i; } -QImage QFontEngine::alphaRGBMapForGlyph(glyph_t glyph, int /* margin */, const QTransform &t) +QImage QFontEngine::alphaRGBMapForGlyph(glyph_t glyph, QFixed /*subPixelPosition*/, int /* margin */, const QTransform &t) { QImage alphaMask = alphaMapForGlyph(glyph, t); QImage rgbMask(alphaMask.width(), alphaMask.height(), QImage::Format_RGB32); @@ -645,10 +645,10 @@ QImage QFontEngine::alphaMapForGlyph(glyph_t glyph) if (glyph_width <= 0 || glyph_height <= 0) return QImage(); QFixedPoint pt; - pt.x = 0; + pt.x = -glyph_x; pt.y = -glyph_y; // the baseline QPainterPath path; - QImage im(glyph_width + qAbs(glyph_x) + 4, glyph_height, QImage::Format_ARGB32_Premultiplied); + QImage im(glyph_width + 4, glyph_height, QImage::Format_ARGB32_Premultiplied); im.fill(Qt::transparent); QPainter p(&im); p.setRenderHint(QPainter::Antialiasing); @@ -737,7 +737,7 @@ void QFontEngine::setGlyphCache(void *key, QFontEngineGlyphCache *data) return; // Limit the glyph caches to 4. This covers all 90 degree rotations and limits - // memory use when there is continous or random rotation + // memory use when there is continuous or random rotation if (m_glyphCaches.size() == 4) m_glyphCaches.removeLast(); |