diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2009-05-12 12:45:32 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2009-05-12 12:45:32 (GMT) |
| commit | 1898c46452beae9e28cf9be7851099b4b4d2779e (patch) | |
| tree | 00477e689bf1bd867fb3428476029b47817a9db8 /src/gui/text/qfontengine_win.cpp | |
| parent | f15b8a83e2e51955776a3f07cb85ebfc342dd8ef (diff) | |
| parent | 4d5a5149b716c67f031a3a40e23370f90542c92f (diff) | |
| download | Qt-1898c46452beae9e28cf9be7851099b4b4d2779e.zip Qt-1898c46452beae9e28cf9be7851099b4b4d2779e.tar.gz Qt-1898c46452beae9e28cf9be7851099b4b4d2779e.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-statemachine
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
Diffstat (limited to 'src/gui/text/qfontengine_win.cpp')
| -rw-r--r-- | src/gui/text/qfontengine_win.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/text/qfontengine_win.cpp b/src/gui/text/qfontengine_win.cpp index e9f1c99..1996d44 100644 --- a/src/gui/text/qfontengine_win.cpp +++ b/src/gui/text/qfontengine_win.cpp @@ -1438,6 +1438,7 @@ QNativeImage *QFontEngineWin::drawGDIGlyph(HFONT font, glyph_t glyph, int margin extern bool qt_cleartype_enabled; +extern uint qt_pow_gamma[256]; QImage QFontEngineWin::alphaMapForGlyph(glyph_t glyph, const QTransform &xform) { @@ -1461,8 +1462,6 @@ QImage QFontEngineWin::alphaMapForGlyph(glyph_t glyph, const QTransform &xform) colors[i] = qRgba(0, 0, 0, i); indexed.setColorTable(colors); - extern uint qt_pow_gamma[256]; - // Copy data... Cannot use QPainter here as GDI has messed up the // Alpha channel of the ni.image pixels... for (int y=0; y<mask->height(); ++y) { |