diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-09 03:02:49 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-09 03:02:49 +0100 |
| commit | 0c023adada49bab1098e7df274ad7889828ef439 (patch) | |
| tree | 225ada9b3f3fe127cb767b217223926f9c4f88df /src/svg/qsvggraphics.cpp | |
| parent | fbad8e7701708c07bfbae73e6c3158fd9e560ee7 (diff) | |
| parent | a91a65632c4d830070e1ca9bbda7e355f1459414 (diff) | |
| download | qtsvg-0c023adada49bab1098e7df274ad7889828ef439.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ieb656507bd67b147559c922ec0c7076e4b8b835a
Diffstat (limited to 'src/svg/qsvggraphics.cpp')
| -rw-r--r-- | src/svg/qsvggraphics.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/svg/qsvggraphics.cpp b/src/svg/qsvggraphics.cpp index 5b273af..12f2349 100644 --- a/src/svg/qsvggraphics.cpp +++ b/src/svg/qsvggraphics.cpp @@ -121,14 +121,14 @@ void QSvgArc::draw(QPainter *p, QSvgExtraStates &states) } QSvgImage::QSvgImage(QSvgNode *parent, const QImage &image, - const QRect &bounds) + const QRectF &bounds) : QSvgNode(parent), m_image(image), m_bounds(bounds) { - if (m_bounds.width() == 0) - m_bounds.setWidth(m_image.width()); - if (m_bounds.height() == 0) - m_bounds.setHeight(m_image.height()); + if (m_bounds.width() == 0.0) + m_bounds.setWidth(static_cast<qreal>(m_image.width())); + if (m_bounds.height() == 0.0) + m_bounds.setHeight(static_cast<qreal>(m_image.height())); } void QSvgImage::draw(QPainter *p, QSvgExtraStates &states) |