summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontengine_win.cpp
diff options
context:
space:
mode:
authorGeir Vattekar <geir.vattekar@trolltech.com>2009-05-15 13:23:00 (GMT)
committerGeir Vattekar <geir.vattekar@trolltech.com>2009-05-15 13:23:00 (GMT)
commitfe7040348d82c5e5d302e7ec674fc0e3f68f06e1 (patch)
tree6b40b8c1e69a044aebd23f7b137d9abb4720b5e8 /src/gui/text/qfontengine_win.cpp
parenta830e5f22a42d00b0b92544cfcb56c79b2c3b6cd (diff)
parent3875cd2b0a81c190939ea2803a2efbe890ae38ec (diff)
downloadQt-fe7040348d82c5e5d302e7ec674fc0e3f68f06e1.zip
Qt-fe7040348d82c5e5d302e7ec674fc0e3f68f06e1.tar.gz
Qt-fe7040348d82c5e5d302e7ec674fc0e3f68f06e1.tar.bz2
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src/gui/text/qfontengine_win.cpp')
-rw-r--r--src/gui/text/qfontengine_win.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/text/qfontengine_win.cpp b/src/gui/text/qfontengine_win.cpp
index 1996d44..bf3a176 100644
--- a/src/gui/text/qfontengine_win.cpp
+++ b/src/gui/text/qfontengine_win.cpp
@@ -1406,8 +1406,8 @@ QNativeImage *QFontEngineWin::drawGDIGlyph(HFONT font, glyph_t glyph, int margin
#endif
#endif
- QNativeImage *ni = new QNativeImage(iw + 2 * margin,
- ih + 2 * margin,
+ QNativeImage *ni = new QNativeImage(iw + 2 * margin + 2,
+ ih + 2 * margin + 2,
QNativeImage::systemFormat(), true);
ni->image.fill(0xffffffff);
@@ -1449,7 +1449,7 @@ QImage QFontEngineWin::alphaMapForGlyph(glyph_t glyph, const QTransform &xform)
font = CreateFontIndirectW(&lf);
}
- QNativeImage *mask = drawGDIGlyph(font, glyph, 0, xform);
+ QNativeImage *mask = drawGDIGlyph(font, glyph, 2, xform);
if (mask == 0)
return QImage();