diff --git a/src/imageformats/avif.cpp b/src/imageformats/avif.cpp index 9775dcb..0c1d680 100644 --- a/src/imageformats/avif.cpp +++ b/src/imageformats/avif.cpp @@ -714,9 +714,9 @@ bool QAVIFHandler::write(const QImage &image) if (save_depth == 8) { save_depth = 10; if (tmpcolorimage.hasAlphaChannel()) { - tmpcolorimage = tmpcolorimage.convertToFormat(QImage::Format_RGBA64); + tmpcolorimage.convertTo(QImage::Format_RGBA64); } else { - tmpcolorimage = tmpcolorimage.convertToFormat(QImage::Format_RGBX64); + tmpcolorimage.convertTo(QImage::Format_RGBX64); } } diff --git a/src/imageformats/exr.cpp b/src/imageformats/exr.cpp index c3c57a3..da17017 100644 --- a/src/imageformats/exr.cpp +++ b/src/imageformats/exr.cpp @@ -249,7 +249,7 @@ bool EXRHandler::read(QImage *outImage) #endif // !EXR_ALLOW_LINEAR_COLORSPACE #endif // !EXR_USE_LEGACY_CONVERSIONS - *outImage = image; + *outImage = std::move(image); return true; } catch (const std::exception &exc) { diff --git a/src/imageformats/hdr.cpp b/src/imageformats/hdr.cpp index 3d4e384..2932766 100644 --- a/src/imageformats/hdr.cpp +++ b/src/imageformats/hdr.cpp @@ -283,7 +283,7 @@ bool HDRHandler::read(QImage *outImage) // By setting the linear color space, programs that support profiles display HDR files as in GIMP and Photoshop. img.setColorSpace(QColorSpace(QColorSpace::SRgbLinear)); - *outImage = img; + *outImage = std::move(img); return true; } diff --git a/src/imageformats/pcx.cpp b/src/imageformats/pcx.cpp index 44a64b0..961c5d3 100644 --- a/src/imageformats/pcx.cpp +++ b/src/imageformats/pcx.cpp @@ -383,8 +383,7 @@ static bool readImage8(QImage &img, QDataStream &s, const PCXHEADER &header) while (flag != 12 && s.status() == QDataStream::Ok) { s >> flag; } - } - else { + } else { device->seek(device->size() - 769); s >> flag; } @@ -613,7 +612,7 @@ static bool writeImage24(QImage &img, QDataStream &s, PCXHEADER &header) QByteArray b_buf(header.width(), 0); for (int y = 0; y < header.height(); ++y) { - auto p = (QRgb*)img.scanLine(y); + auto p = (QRgb *)img.scanLine(y); for (int x = 0; x < header.width(); ++x) { QRgb rgb = *p++; @@ -684,7 +683,7 @@ bool PCXHandler::read(QImage *outImage) img.setDotsPerMeterX(qRound(header.HDpi / 25.4 * 1000)); img.setDotsPerMeterY(qRound(header.YDpi / 25.4 * 1000)); - *outImage = img; + *outImage = std::move(img); return true; } diff --git a/src/imageformats/pic.cpp b/src/imageformats/pic.cpp index 1196bc0..8be3bb5 100644 --- a/src/imageformats/pic.cpp +++ b/src/imageformats/pic.cpp @@ -255,7 +255,7 @@ bool SoftimagePICHandler::read(QImage *image) } } - *image = img; + *image = std::move(img); m_state = Ready; return true; diff --git a/src/imageformats/psd.cpp b/src/imageformats/psd.cpp index 710d1a6..7597a84 100644 --- a/src/imageformats/psd.cpp +++ b/src/imageformats/psd.cpp @@ -1326,7 +1326,7 @@ bool PSDHandler::read(QImage *image) return false; } - *image = img; + *image = std::move(img); return true; } diff --git a/src/imageformats/ras.cpp b/src/imageformats/ras.cpp index b149909..28d86a2 100644 --- a/src/imageformats/ras.cpp +++ b/src/imageformats/ras.cpp @@ -402,7 +402,7 @@ bool RASHandler::read(QImage *outImage) return false; } - *outImage = img; + *outImage = std::move(img); return true; } diff --git a/src/imageformats/raw.cpp b/src/imageformats/raw.cpp index b220a36..8c115d9 100644 --- a/src/imageformats/raw.cpp +++ b/src/imageformats/raw.cpp @@ -748,7 +748,7 @@ bool RAWHandler::read(QImage *image) return false; } - *image = img; + *image = std::move(img); return true; } diff --git a/src/imageformats/rgb.cpp b/src/imageformats/rgb.cpp index 99e3081..d3ed642 100644 --- a/src/imageformats/rgb.cpp +++ b/src/imageformats/rgb.cpp @@ -678,9 +678,9 @@ bool SGIImage::writeImage(const QImage &image) } if (hasAlpha && img.format() != QImage::Format_ARGB32) { - img = img.convertToFormat(QImage::Format_ARGB32); + img.convertTo(QImage::Format_ARGB32); } else if (!hasAlpha && img.format() != QImage::Format_RGB32) { - img = img.convertToFormat(QImage::Format_RGB32); + img.convertTo(QImage::Format_RGB32); } if (img.isNull()) { // qDebug() << "can't convert image to depth 32"; diff --git a/src/imageformats/tga.cpp b/src/imageformats/tga.cpp index 59f6efd..ccac530 100644 --- a/src/imageformats/tga.cpp +++ b/src/imageformats/tga.cpp @@ -419,7 +419,7 @@ bool TGAHandler::read(QImage *outImage) return false; } - *outImage = img; + *outImage = std::move(img); return true; } diff --git a/tests/imagedump.cpp b/tests/imagedump.cpp index f39b5d2..45ea070 100644 --- a/tests/imagedump.cpp +++ b/tests/imagedump.cpp @@ -103,7 +103,7 @@ int main(int argc, char **argv) QTextStream(stderr) << "Unknown QImage data format " << parser.value(qimgformat) << '\n'; return 4; } - img = img.convertToFormat(qformat); + img.convertTo(qformat); } qint64 written = output.write(reinterpret_cast(img.bits()), img.sizeInBytes()); if (written != img.sizeInBytes()) {