diff --git a/src/AvatarProvider.cpp b/src/AvatarProvider.cpp index 1834e040..f64f6859 100644 --- a/src/AvatarProvider.cpp +++ b/src/AvatarProvider.cpp @@ -35,7 +35,7 @@ resolve(const QString &avatarUrl, int size, QObject *receiver, AvatarCallback ca auto data = cache::image(cacheKey); if (!data.isNull()) { - pixmap = QPixmap::fromImage(utils::readImage(&data)); + pixmap = QPixmap::fromImage(utils::readImage(data)); avatar_cache.insert(cacheKey, pixmap); callback(pixmap); return; @@ -46,7 +46,7 @@ resolve(const QString &avatarUrl, int size, QObject *receiver, AvatarCallback ca &AvatarProxy::avatarDownloaded, receiver, [callback, cacheKey](QByteArray data) { - QPixmap pm = QPixmap::fromImage(utils::readImage(&data)); + QPixmap pm = QPixmap::fromImage(utils::readImage(data)); avatar_cache.insert(cacheKey, pm); callback(pm); }); diff --git a/src/MxcImageProvider.cpp b/src/MxcImageProvider.cpp index e4f629a5..35cd0c45 100644 --- a/src/MxcImageProvider.cpp +++ b/src/MxcImageProvider.cpp @@ -22,7 +22,7 @@ MxcImageResponse::run() auto data = cache::image(fileName); if (!data.isNull()) { - m_image = utils::readImage(&data); + m_image = utils::readImage(data); if (!m_image.isNull()) { m_image = m_image.scaled( @@ -54,7 +54,7 @@ MxcImageResponse::run() auto data = QByteArray(res.data(), (int)res.size()); cache::saveImage(fileName, data); - m_image = utils::readImage(&data); + m_image = utils::readImage(data); if (!m_image.isNull()) { m_image = m_image.scaled( m_requestedSize, Qt::KeepAspectRatio, Qt::SmoothTransformation); @@ -67,7 +67,7 @@ MxcImageResponse::run() auto data = cache::image(m_id); if (!data.isNull()) { - m_image = utils::readImage(&data); + m_image = utils::readImage(data); m_image.setText("mxc url", "mxc://" + m_id); if (!m_image.isNull()) { @@ -98,7 +98,7 @@ MxcImageResponse::run() auto data = QByteArray(temp.data(), (int)temp.size()); cache::saveImage(m_id, data); - m_image = utils::readImage(&data); + m_image = utils::readImage(data); m_image.setText("original filename", QString::fromStdString(originalFilename)); m_image.setText("mxc url", "mxc://" + m_id); diff --git a/src/Utils.cpp b/src/Utils.cpp index 40c16fd3..4d24c786 100644 --- a/src/Utils.cpp +++ b/src/Utils.cpp @@ -689,10 +689,10 @@ utils::restoreCombobox(QComboBox *combo, const QString &value) } QImage -utils::readImage(const QByteArray *data) +utils::readImage(const QByteArray &data) { QBuffer buf; - buf.setData(*data); + buf.setData(data); QImageReader reader(&buf); reader.setAutoTransform(true); return reader.read(); diff --git a/src/Utils.h b/src/Utils.h index 1dc5ffd6..eb09172e 100644 --- a/src/Utils.h +++ b/src/Utils.h @@ -309,7 +309,7 @@ restoreCombobox(QComboBox *combo, const QString &value); //! Read image respecting exif orientation QImage -readImage(const QByteArray *data); +readImage(const QByteArray &data); bool isReply(const mtx::events::collections::TimelineEvents &e); diff --git a/src/timeline/InputBar.cpp b/src/timeline/InputBar.cpp index 3827c91a..8a5e4346 100644 --- a/src/timeline/InputBar.cpp +++ b/src/timeline/InputBar.cpp @@ -574,7 +574,7 @@ InputBar::showPreview(const QMimeData &source, QString path, const QStringList & auto mimeClass = mime.split("/")[0]; nhlog::ui()->debug("Mime: {}", mime.toStdString()); if (mimeClass == "image") { - QImage img = utils::readImage(&data); + QImage img = utils::readImage(data); dimensions = img.size(); if (img.height() > 200 && img.width() > 360)