|
 |
b30490e |
From 1b561c83b5076154f0e22ef57709fcb25c263931 Mon Sep 17 00:00:00 2001
|
|
|
b30490e |
From: David Faure <faure@kde.org>
|
|
|
b30490e |
Date: Sun, 9 Aug 2020 14:27:32 +0200
|
|
|
b30490e |
Subject: [PATCH 20/54] Fix inserting a (large) JPEG image into a presentation
|
|
|
b30490e |
|
|
|
b30490e |
The format was hardcoded to "png" but the JPEG data was written "as is"
|
|
|
b30490e |
into the temp file (because > 90kB), so loading as PNG failed.
|
|
|
b30490e |
---
|
|
|
b30490e |
libs/flake/KoImageData.cpp | 2 ++
|
|
|
b30490e |
1 file changed, 2 insertions(+)
|
|
|
b30490e |
|
|
|
b30490e |
diff --git a/libs/flake/KoImageData.cpp b/libs/flake/KoImageData.cpp
|
|
|
b30490e |
index 5882360d8cd..c2238b4f42d 100644
|
|
|
b30490e |
--- a/libs/flake/KoImageData.cpp
|
|
|
b30490e |
+++ b/libs/flake/KoImageData.cpp
|
|
|
b30490e |
@@ -148,6 +148,7 @@ QImage KoImageData::image() const
|
|
|
b30490e |
d->errorCode = OpenFailed;
|
|
|
b30490e |
}
|
|
|
b30490e |
else if (d->errorCode == Success && !d->image.load(d->temporaryFile->fileName(), d->suffix.toLatin1())) {
|
|
|
b30490e |
+ qWarning() << "Failed to open image" << d->temporaryFile->fileName() << "with format" << d->suffix;
|
|
|
b30490e |
d->errorCode = OpenFailed;
|
|
|
b30490e |
}
|
|
|
b30490e |
d->temporaryFile->close();
|
|
|
b30490e |
@@ -316,6 +317,7 @@ void KoImageData::setImage(const QByteArray &imageData, KoImageCollection *colle
|
|
|
b30490e |
buffer.setData(imageData);
|
|
|
b30490e |
buffer.open(QIODevice::ReadOnly);
|
|
|
b30490e |
d->copyToTemporary(buffer);
|
|
|
b30490e |
+ d->suffix.clear(); // let QImage find out what the data contains
|
|
|
b30490e |
}
|
|
|
b30490e |
|
|
|
b30490e |
QCryptographicHash md5(QCryptographicHash::Md5);
|
|
|
b30490e |
--
|
|
|
b30490e |
2.31.1
|
|
|
b30490e |
|