diff options
author | Anton Kudryavtsev <anton.kudryavtsev@corp.mail.ru> | 2018-10-12 12:14:39 +0300 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-11-14 20:14:34 +0000 |
commit | 67c29f15bd825f6246c8e993083ba7b87ad3b33e (patch) | |
tree | 292b87e34fac0a9296c949c5fa83126c8aa0a064 | |
parent | 6bdf1e337d9104081b6e3b335d8439b32fb8b020 (diff) |
QPixmapFilter: use rvalue more
Change-Id: I38b84d0cd1db10078ef663a64e62717fedf7697c
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r-- | src/widgets/effects/qpixmapfilter.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/widgets/effects/qpixmapfilter.cpp b/src/widgets/effects/qpixmapfilter.cpp index 211c09ee71..60edd01d00 100644 --- a/src/widgets/effects/qpixmapfilter.cpp +++ b/src/widgets/effects/qpixmapfilter.cpp @@ -1104,13 +1104,15 @@ void QPixmapColorizeFilter::draw(QPainter *painter, const QPointF &dest, const Q if (srcRect.isNull()) { srcImage = src.toImage(); - srcImage = srcImage.convertToFormat(srcImage.hasAlphaChannel() ? QImage::Format_ARGB32_Premultiplied : QImage::Format_RGB32); + const auto format = srcImage.hasAlphaChannel() ? QImage::Format_ARGB32_Premultiplied : QImage::Format_RGB32; + srcImage = std::move(srcImage).convertToFormat(format); destImage = QImage(srcImage.size(), srcImage.format()); } else { QRect rect = srcRect.toAlignedRect().intersected(src.rect()); srcImage = src.copy(rect).toImage(); - srcImage = srcImage.convertToFormat(srcImage.hasAlphaChannel() ? QImage::Format_ARGB32_Premultiplied : QImage::Format_RGB32); + const auto format = srcImage.hasAlphaChannel() ? QImage::Format_ARGB32_Premultiplied : QImage::Format_RGB32; + srcImage = std::move(srcImage).convertToFormat(format); destImage = QImage(rect.size(), srcImage.format()); } destImage.setDevicePixelRatio(src.devicePixelRatioF()); @@ -1129,7 +1131,7 @@ void QPixmapColorizeFilter::draw(QPainter *painter, const QPointF &dest, const Q bufPainter.setOpacity(d->strength); bufPainter.drawImage(0, 0, destImage); bufPainter.end(); - destImage = buffer; + destImage = std::move(buffer); } if (srcImage.hasAlphaChannel()) @@ -1333,7 +1335,7 @@ void QPixmapDropShadowFilter::draw(QPainter *p, qt_blurImage(&blurPainter, tmp, d->radius, false, true); blurPainter.end(); - tmp = blurred; + tmp = std::move(blurred); // blacken the image... tmpPainter.begin(&tmp); |