thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Respect exif rotation of images

Browse source 
Sometimes thumbnails still have the wrong dimensions, as they are scaled
to fit inside a rectange of the reported size in the image. Not sure,
who is wrong there, the media repo or we.
This commit is contained in:
Nicolas Werner 2020-04-26 11:26:51 +02:00
parent d94ac86816
commit 28adc9dc9b
4 changed files with 38 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/MxcImageProvider.cpp
View file

@ -3,6 +3,7 @@
#include "Cache.h"
#include "Logging.h"
#include "MatrixClient.h"
#include "Utils.h"
void
MxcImageResponse::run()
@ -14,11 +15,15 @@ MxcImageResponse::run()
.arg(m_requestedSize.height());
auto data = cache::image(fileName);
if (!data.isNull() && m_image.loadFromData(data)) {
if (!data.isNull()) {
m_image = utils::readImage(&data);
m_image = m_image.scaled(m_requestedSize, Qt::KeepAspectRatio);
m_image.setText("mxc url", "mxc://" + m_id);
emit finished();
return;
if (!m_image.isNull()) {
emit finished();
return;
}
}
mtx::http::ThumbOpts opts;
@ -39,17 +44,22 @@ MxcImageResponse::run()
auto data = QByteArray(res.data(), res.size());
cache::saveImage(fileName, data);
m_image.loadFromData(data);
m_image = utils::readImage(&data);
m_image.setText("mxc url", "mxc://" + m_id);
emit finished();
});
} else {
auto data = cache::image(m_id);
if (!data.isNull() && m_image.loadFromData(data)) {
if (!data.isNull()) {
m_image = utils::readImage(&data);
m_image.setText("mxc url", "mxc://" + m_id);
emit finished();
return;
if (!m_image.isNull()) {
emit finished();
return;
}
}
http::client()->download(
@ -73,11 +83,11 @@ MxcImageResponse::run()
mtx::crypto::decrypt_file(temp, m_encryptionInfo.value()));
auto data = QByteArray(temp.data(), temp.size());
m_image.loadFromData(data);
cache::saveImage(m_id, data);
m_image = utils::readImage(&data);
m_image.setText("original filename",
QString::fromStdString(originalFilename));
m_image.setText("mxc url", "mxc://" + m_id);
cache::saveImage(m_id, data);
emit finished();
});