diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2013-04-10 02:51:27 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-24 14:12:41 +0200 |
| commit | affdd9d00cd708d3cd337b5841e96af20dcb75c6 (patch) | |
| tree | df5bd0d276dae297dbb5ce6ebb4f40ca33cddb08 /src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h | |
| parent | 3f58fc00c91d5ff42f86b3f05c88119769bed910 (diff) | |
Improvements for DirectWrite font engine
- don't check if m_directWriteFontFace is not null, it MUST be initialized
just in the constructor;
- fix support for surrogate pairs in stringToCMap();
- reorder some affected code for better readability.
Change-Id: Ibdcf7b50f06910e95cefe074f33932b8fbcdcfe1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h b/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h index 106087f757..ab14cb49eb 100644 --- a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h +++ b/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h @@ -107,8 +107,6 @@ public: static QString fontNameSubstitute(const QString &familyName); private: - friend class QRawFontPrivate; - QImage imageForGlyph(glyph_t t, QFixed subPixelPosition, int margin, const QTransform &xform); void collectMetrics(); |