diff options
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp | 11 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp b/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp index 80f91ea5fd..e90c6b6048 100644 --- a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp +++ b/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp @@ -614,11 +614,14 @@ QImage QWindowsFontEngineDirectWrite::imageForGlyph(glyph_t t, } QImage QWindowsFontEngineDirectWrite::alphaRGBMapForGlyph(glyph_t t, - QFixed subPixelPosition, - int margin, - const QTransform &xform) + QFixed subPixelPosition, + const QTransform &xform) { - QImage mask = imageForGlyph(t, subPixelPosition, margin, xform); + QImage mask = imageForGlyph(t, + subPixelPosition, + glyphMargin(QFontEngineGlyphCache::Raster_RGBMask), + xform); + return mask.depth() == 32 ? mask : mask.convertToFormat(QImage::Format_RGB32); diff --git a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h b/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h index 0af52a2384..54594f2949 100644 --- a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h +++ b/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h @@ -44,11 +44,7 @@ #ifndef QT_NO_DIRECTWRITE -// Enable access to HB_Face in harfbuzz includes included by qfontengine_p.h. -#define QT_BUILD_GUI_LIB #include <QtGui/private/qfontengine_p.h> -#undef QT_BUILD_GUI_LIB - #include <QtCore/QSharedPointer> class QWindowsFontEngineData; |