diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-12-07 14:30:25 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-12-08 16:32:17 +0000 |
| commit | f60f62f091e65f3d4cbb0a4c1d7e98bc0cab7be5 (patch) | |
| tree | 26a66af74c9348102d2e82c636f282cc89525458 /src/gui | |
| parent | ff60a9a2a96e26de96a5ae91c5c59eb06d26b417 (diff) | |
Shortcut QImage::convertTo when no conversion is necessary
Avoids a detach when converting to existing format.
Change-Id: I9a4801878ddec295a02f2c88f4a40ec13d513a94
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
(cherry picked from commit cc81aae4b312da40945ddfecb806f4abe6b74048)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/image/qimage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 70b958c177..7ca5b13373 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -2239,7 +2239,7 @@ bool QImage::reinterpretAsFormat(Format format) /*! \since 5.13 - Detach and convert the image to the given \a format in place. + Converts the image to the given \a format in place, detaching if necessary. The specified image conversion \a flags control how the image data is handled during the conversion process. @@ -2249,7 +2249,7 @@ bool QImage::reinterpretAsFormat(Format format) void QImage::convertTo(Format format, Qt::ImageConversionFlags flags) { - if (!d || format == QImage::Format_Invalid) + if (!d || format == QImage::Format_Invalid || d->format == format) return; detach(); |