From 853461e260eb5b8c964b203e64296feb6284ca9b Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 25 Nov 2021 10:36:41 +0200 Subject: [PATCH] do not deep-copy QImage objects in QRasterPixmapData::copy() and QX11PixmapData::copy() Signed-off-by: Ivailo Monev --- src/gui/image/qpixmap_raster.cpp | 2 +- src/gui/image/qpixmap_x11.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/image/qpixmap_raster.cpp b/src/gui/image/qpixmap_raster.cpp index eeb321402..1a1a92f8a 100644 --- a/src/gui/image/qpixmap_raster.cpp +++ b/src/gui/image/qpixmap_raster.cpp @@ -139,7 +139,7 @@ extern void qt_scrollRectInImage(QImage *img, const QRect &rect, const QPoint &o void QRasterPixmapData::copy(const QPixmapData *data, const QRect &rect) { - fromImage(data->toImage(rect).copy(), Qt::NoOpaqueDetection); + fromImage(data->toImage(rect), Qt::NoOpaqueDetection); } bool QRasterPixmapData::scroll(int dx, int dy, const QRect &rect) diff --git a/src/gui/image/qpixmap_x11.cpp b/src/gui/image/qpixmap_x11.cpp index 65eed2f07..ba8809aa8 100644 --- a/src/gui/image/qpixmap_x11.cpp +++ b/src/gui/image/qpixmap_x11.cpp @@ -1534,7 +1534,7 @@ Qt::HANDLE QX11PixmapData::x11ConvertToDefaultDepth() void QX11PixmapData::copy(const QPixmapData *data, const QRect &rect) { if (data->pixelType() == BitmapType) { - fromImage(data->toImage().copy(rect), Qt::AutoColor); + fromImage(data->toImage(rect), Qt::AutoColor); return; } -- 2.11.0