1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Shortcut QImage::convertTo when no conversion is necessary

Browse Source 
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>
This commit is contained in:
Allan Sandfeld Jensen 2020-12-07 14:30:25 +01:00 committed by Qt Cherry-pick Bot
parent ff60a9a2a9
commit f60f62f091
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/image/qimage.cpp
View File

@ -2239,7 +2239,7 @@ bool QImage::reinterpretAsFormat(Format format)
/*! /*!
\since 5.13 \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 The specified image conversion \a flags control how the image data
is handled during the conversion process. is handled during the conversion process.
@ -2249,7 +2249,7 @@ bool QImage::reinterpretAsFormat(Format format)
void QImage::convertTo(Format format, Qt::ImageConversionFlags flags) void QImage::convertTo(Format format, Qt::ImageConversionFlags flags)
{ {
if (!d || format == QImage::Format_Invalid) if (!d || format == QImage::Format_Invalid || d->format == format)
return; return;
detach(); detach();