From 81a7344e1dea562271865ddf94a7d7138e663ce4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20S=C3=B8rvig?= Date: Mon, 16 Aug 2021 08:41:57 +0200 Subject: Port to QImage and QPixmap deviceIndependentSize() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace the “size() / devicePixelRatio()” pattern with a call to deviceIndependentSize(). Change-Id: I9d9359e80b9e6643e7395028cd43e3261d449ae7 Reviewed-by: Qt CI Bot Reviewed-by: Tor Arne Vestbø --- src/gui/text/qtextimagehandler.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/gui/text/qtextimagehandler.cpp') diff --git a/src/gui/text/qtextimagehandler.cpp b/src/gui/text/qtextimagehandler.cpp index 290aa256cb..2872366208 100644 --- a/src/gui/text/qtextimagehandler.cpp +++ b/src/gui/text/qtextimagehandler.cpp @@ -102,20 +102,19 @@ static QSize getPixmapSize(QTextDocument *doc, const QTextImageFormat &format) QSize size(width, height); if (!hasWidth || !hasHeight) { pm = getPixmap(doc, format); - const int pmWidth = pm.width() / pm.devicePixelRatio(); - const int pmHeight = pm.height() / pm.devicePixelRatio(); + const QSizeF pmSize = pm.deviceIndependentSize(); if (!hasWidth) { if (!hasHeight) - size.setWidth(pmWidth); + size.setWidth(pmSize.width()); else - size.setWidth(qRound(height * (pmWidth / (qreal) pmHeight))); + size.setWidth(qRound(height * (pmSize.width() / (qreal) pmSize.height()))); } if (!hasHeight) { if (!hasWidth) - size.setHeight(pmHeight); + size.setHeight(pmSize.height()); else - size.setHeight(qRound(width * (pmHeight / (qreal) pmWidth))); + size.setHeight(qRound(width * (pmSize.height() / (qreal) pmSize.width()))); } } @@ -171,10 +170,11 @@ static QSize getImageSize(QTextDocument *doc, const QTextImageFormat &format) QSize size(width, height); if (!hasWidth || !hasHeight) { image = getImage(doc, format); + QSizeF imageSize = image.deviceIndependentSize(); if (!hasWidth) - size.setWidth(image.width() / image.devicePixelRatio()); + size.setWidth(imageSize.width()); if (!hasHeight) - size.setHeight(image.height() / image.devicePixelRatio()); + size.setHeight(imageSize.height()); } qreal scale = 1.0; -- cgit v1.2.3