diff options
| -rw-r--r-- | src/svg/qsvgfont_p.h | 5 | ||||
| -rw-r--r-- | src/svg/qsvghandler.cpp | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/svg/qsvgfont_p.h b/src/svg/qsvgfont_p.h index a7cc98b..9cf3dfe 100644 --- a/src/svg/qsvgfont_p.h +++ b/src/svg/qsvgfont_p.h @@ -38,6 +38,7 @@ public: class Q_SVG_PRIVATE_EXPORT QSvgFont : public QSvgRefCounted { public: + static constexpr qreal DEFAULT_UNITS_PER_EM = 1000; QSvgFont(qreal horizAdvX); void setFamilyName(const QString &name); @@ -50,9 +51,7 @@ public: void draw(QPainter *p, const QPointF &point, const QString &str, qreal pixelSize, Qt::Alignment alignment) const; public: QString m_familyName; - qreal m_unitsPerEm; - qreal m_ascent; - qreal m_descent; + qreal m_unitsPerEm = DEFAULT_UNITS_PER_EM; qreal m_horizAdvX; QHash<QChar, QSvgGlyph> m_glyphs; }; diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp index 29ca733..a891848 100644 --- a/src/svg/qsvghandler.cpp +++ b/src/svg/qsvghandler.cpp @@ -2622,7 +2622,7 @@ static bool parseFontFaceNode(QSvgStyleProperty *parent, qreal unitsPerEm = toDouble(unitsPerEmStr); if (!unitsPerEm) - unitsPerEm = 1000; + unitsPerEm = QSvgFont::DEFAULT_UNITS_PER_EM; if (!name.isEmpty()) font->setFamilyName(name); |