diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2024-12-02 10:17:47 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2024-12-02 11:36:10 +0100 |
| commit | 3f1a644ee3e38a92bd7ebc31de2b77079ee4ac89 (patch) | |
| tree | e3549d3daf4bf9af27ff6735897572ca6d2b9077 /src | |
| parent | 31d99d270a13a07e3b86e08e18a9a97ed775fdab (diff) | |
Replace deprecated QImage::mirror(ed) with flip(ped)
Follow up on change in qtbase:577946c1f05aaaa2a3f9682001aeb4144386b26b.
Task-number: QTBUG-129575
Change-Id: I5f25e98d8991fae6ddd9cc2d875bba91cdfbdd88
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/scenegraph/openvg/qopenvgcontext.cpp | 2 | ||||
| -rw-r--r-- | src/quick/designer/qquickdesignersupport.cpp | 2 | ||||
| -rw-r--r-- | src/quick/scenegraph/adaptations/software/qsgsoftwarepublicnodes.cpp | 5 | ||||
| -rw-r--r-- | src/quick/scenegraph/qsgrhilayer.cpp | 2 | ||||
| -rw-r--r-- | src/quick/scenegraph/qsgrhisupport.cpp | 2 | ||||
| -rw-r--r-- | src/quicknativestyle/qstyle/qquickcommonstyle.cpp | 2 | ||||
| -rw-r--r-- | src/quicknativestyle/qstyle/windows/qquickwindowsxpstyle.cpp | 11 | ||||
| -rw-r--r-- | src/quickwidgets/qquickwidget.cpp | 2 |
8 files changed, 16 insertions, 12 deletions
diff --git a/src/plugins/scenegraph/openvg/qopenvgcontext.cpp b/src/plugins/scenegraph/openvg/qopenvgcontext.cpp index 353edc1e4d..25ca83e52f 100644 --- a/src/plugins/scenegraph/openvg/qopenvgcontext.cpp +++ b/src/plugins/scenegraph/openvg/qopenvgcontext.cpp @@ -81,7 +81,7 @@ QImage QOpenVGContext::readFramebuffer(const QSize &size) { QImage framebufferImage(size, QImage::Format_RGB32); vgReadPixels(framebufferImage.bits(), framebufferImage.bytesPerLine(), VG_sXRGB_8888, 0, 0, size.width(), size.height()); - return framebufferImage.mirrored(false, true); + return std::move(framebufferImage).flipped(Qt::Vertical); } void QOpenVGContext::getConfigs() diff --git a/src/quick/designer/qquickdesignersupport.cpp b/src/quick/designer/qquickdesignersupport.cpp index 6f937e38d6..f59c366a20 100644 --- a/src/quick/designer/qquickdesignersupport.cpp +++ b/src/quick/designer/qquickdesignersupport.cpp @@ -91,7 +91,7 @@ QImage QQuickDesignerSupport::renderImageForItem(QQuickItem *referencedItem, con renderTexture->updateTexture(); QImage renderImage = renderTexture->toImage(); - renderImage = renderImage.mirrored(false, true); + renderImage.flip(); if (renderImage.size().isEmpty()) qDebug() << __FILE__ << __LINE__ << "Warning: Image is empty."; diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwarepublicnodes.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarepublicnodes.cpp index b62474e02b..e323174177 100644 --- a/src/quick/scenegraph/adaptations/software/qsgsoftwarepublicnodes.cpp +++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarepublicnodes.cpp @@ -101,7 +101,10 @@ void QSGSoftwareImageNode::updateCachedMirroredPixmap() mirrorTransform = mirrorTransform.scale(-1, 1); m_cachedPixmap = pt->pixmap().transformed(mirrorTransform); } else if (QSGPlainTexture *pt = qobject_cast<QSGPlainTexture *>(m_texture)) { - m_cachedPixmap = QPixmap::fromImage(pt->image().mirrored(m_transformMode.testFlag(MirrorHorizontally), m_transformMode.testFlag(MirrorVertically))); + static constexpr Qt::Orientation none = Qt::Orientation(0); + const auto orientation = (m_transformMode.testFlag(MirrorHorizontally) ? Qt::Horizontal : none) + | (m_transformMode.testFlag(MirrorVertically) ? Qt::Vertical : none); + m_cachedPixmap = QPixmap::fromImage(pt->image().flipped(orientation)); } else { m_cachedPixmap = QPixmap(); } diff --git a/src/quick/scenegraph/qsgrhilayer.cpp b/src/quick/scenegraph/qsgrhilayer.cpp index 5299cb54ce..b669cf7169 100644 --- a/src/quick/scenegraph/qsgrhilayer.cpp +++ b/src/quick/scenegraph/qsgrhilayer.cpp @@ -452,7 +452,7 @@ QImage QSGRhiLayer::toImage() const imageFormat = QImage::Format_RGBA32FPx4_Premultiplied; const uchar *p = reinterpret_cast<const uchar *>(result.data.constData()); - return QImage(p, result.pixelSize.width(), result.pixelSize.height(), imageFormat).mirrored(); + return QImage(p, result.pixelSize.width(), result.pixelSize.height(), imageFormat).flipped(); } QRectF QSGRhiLayer::normalizedTextureSubRect() const diff --git a/src/quick/scenegraph/qsgrhisupport.cpp b/src/quick/scenegraph/qsgrhisupport.cpp index e0e0fd9f54..f9169e48f0 100644 --- a/src/quick/scenegraph/qsgrhisupport.cpp +++ b/src/quick/scenegraph/qsgrhisupport.cpp @@ -1332,7 +1332,7 @@ QImage QSGRhiSupport::grabAndBlockInCurrentFrame(QRhi *rhi, QRhiCommandBuffer *c const QImage img(p, result.pixelSize.width(), result.pixelSize.height(), imageFormat); if (rhi->isYUpInFramebuffer()) - return img.mirrored(); + return img.flipped(); return img.copy(); } diff --git a/src/quicknativestyle/qstyle/qquickcommonstyle.cpp b/src/quicknativestyle/qstyle/qquickcommonstyle.cpp index b11f1bdf6d..01d0746be1 100644 --- a/src/quicknativestyle/qstyle/qquickcommonstyle.cpp +++ b/src/quicknativestyle/qstyle/qquickcommonstyle.cpp @@ -5242,7 +5242,7 @@ QPixmap QCommonStyle::standardPixmap(StandardPixmap sp, const QStyleOption *opti case SP_ToolBarHorizontalExtensionButton: if (rtl) { QImage im(tb_extension_arrow_h_xpm); - im = std::move(im).convertToFormat(QImage::Format_ARGB32).mirrored(true, false); + im = std::move(im).convertToFormat(QImage::Format_ARGB32).flipped(Qt::Horizontal); return QPixmap::fromImage(std::move(im)); } return cachedPixmapFromXPM(tb_extension_arrow_h_xpm); diff --git a/src/quicknativestyle/qstyle/windows/qquickwindowsxpstyle.cpp b/src/quicknativestyle/qstyle/windows/qquickwindowsxpstyle.cpp index a6b8807ed0..d0262d4c47 100644 --- a/src/quicknativestyle/qstyle/windows/qquickwindowsxpstyle.cpp +++ b/src/quicknativestyle/qstyle/windows/qquickwindowsxpstyle.cpp @@ -948,11 +948,12 @@ bool QWindowsXPStylePrivate::drawBackgroundThruNativeBuffer(XPThemeData &themeDa rotMatrix.rotate(themeData.rotate); imgCopy = imgCopy.transformed(rotMatrix); } - if (themeData.mirrorHorizontally || themeData.mirrorVertically) { - imgCopy = imgCopy.mirrored(themeData.mirrorHorizontally, themeData.mirrorVertically); - } - painter->drawImage(themeData.rect, - imgCopy); + static constexpr Qt::Orientation none = Qt::Orientation(0); + const auto orientation = (themeData.mirrorHorizontally ? Qt::Horizontal : none) + | (themeData.mirrorVertically ? Qt::Vertical : none); + if (orientation) + imgCopy.flip(orientation); + painter->drawImage(themeData.rect, imgCopy); } if (useRegion || addBorderContentClipping) { diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp index d1b3474c78..61e6428484 100644 --- a/src/quickwidgets/qquickwidget.cpp +++ b/src/quickwidgets/qquickwidget.cpp @@ -460,7 +460,7 @@ QImage QQuickWidgetPrivate::grabFramebuffer() readResult.pixelSize.width(), readResult.pixelSize.height(), QImage::Format_RGBA8888_Premultiplied); if (rhi->isYUpInFramebuffer()) - return wrapperImage.mirrored(); + return wrapperImage.flipped(); else return wrapperImage.copy(); } |