Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kimgio: workaround for some ImageMagick coders failing to load from blob

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-02-17 21:25:36 +02:00
parent 02eedf36ed
commit 07dac570ac
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
kimgio/magick.cpp
View file

@ -72,10 +72,17 @@ bool MagickHandler::read(QImage *image)
try {
// QMovie will continuously call read() to get each frame
if (m_magickimages.size() == 0) {
const QByteArray data = device()->readAll();
Magick::Blob magickinblob(data.constData(), data.size());
Magick::readImages(&m_magickimages, magickinblob);
const QFile *file = qobject_cast<QFile*>(device());
if (file) {
// some ImageMagick coders fail to load from blob (e.g. icon), this workaround does
// not work for resource files tho
const std::string filename = file->fileName().toStdString();
Magick::readImages(&m_magickimages, filename);
} else {
const QByteArray data = device()->readAll();
Magick::Blob magickinblob(data.constData(), data.size());
Magick::readImages(&m_magickimages, magickinblob);
}
}
if (Q_UNLIKELY(m_magickimages.size() == 0)) {