From 007ee38b042bb6d9e424428b031818ce51f3e242 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Sun, 4 Apr 2021 00:15:08 +0200
Subject: Fix exif rotation in unencrypted rooms

---
 src/MxcImageProvider.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/MxcImageProvider.cpp')

diff --git a/src/MxcImageProvider.cpp b/src/MxcImageProvider.cpp
index a20657c8..ab6540a4 100644
--- a/src/MxcImageProvider.cpp
+++ b/src/MxcImageProvider.cpp
@@ -69,7 +69,7 @@ MxcImageProvider::download(const QString &id,
                 QDir().mkpath(fileInfo.absolutePath());
 
                 if (fileInfo.exists()) {
-                        QImage image(fileInfo.absoluteFilePath());
+                        QImage image = utils::readImageFromFile(fileInfo.absoluteFilePath());
                         if (!image.isNull()) {
                                 image = image.scaled(
                                   requestedSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
@@ -143,7 +143,8 @@ MxcImageProvider::download(const QString &id,
                                                 return;
                                         }
                                 } else {
-                                        QImage image(fileInfo.absoluteFilePath());
+                                        QImage image =
+                                          utils::readImageFromFile(fileInfo.absoluteFilePath());
                                         if (!image.isNull()) {
                                                 then(id,
                                                      requestedSize,
@@ -190,7 +191,8 @@ MxcImageProvider::download(const QString &id,
                                           return;
                                   }
 
-                                  QImage image(fileInfo.absoluteFilePath());
+                                  QImage image =
+                                    utils::readImageFromFile(fileInfo.absoluteFilePath());
                                   image.setText("original filename",
                                                 QString::fromStdString(originalFilename));
                                   image.setText("mxc url", "mxc://" + id);
-- 
cgit 1.5.1