mirror/kimageformats
1
0
Fork 0
mirror of https://invent.kde.org/frameworks/kimageformats.git synced 2025-07-20 20:34:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Read / Write test: added NULL device test

Browse Source 
DDS plugin crashes if I request supportedSubTypes()

- Fixed DDS plugin crash
- Added NULL device test on both read and write tests

Closes #14
This commit is contained in:
Mirco Miranda
2024-12-16 13:52:06 +00:00
committed by Albert Astals Cid
parent d91c7dd912
commit a6f7482957
3 changed files with 130 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/imageformats/dds.cpp
View File

@ -1802,18 +1802,26 @@ bool QDDSHandler::write(const QImage &outImage)
QVariant QDDSHandler::option(QImageIOHandler::ImageOption option) const
{
if (!supportsOption(option) || !ensureScanned())
if (!supportsOption(option)) {
return QVariant();
}
switch (option) {
case QImageIOHandler::Size:
return isCubeMap(m_header) ? QSize(m_header.width * 4, m_header.height * 3) : QSize(m_header.width, m_header.height);
case QImageIOHandler::SubType:
return formatName(m_format);
case QImageIOHandler::SupportedSubTypes:
// *** options that do not require a valid stream ***
if (option == QImageIOHandler::SupportedSubTypes) {
return QVariant::fromValue(QList<QByteArray>() << formatName(FormatA8R8G8B8));
default:
break;
}
// *** options that require a valid stream ***
if (!ensureScanned()) {
return QVariant();
}
if (option == QImageIOHandler::Size) {
return isCubeMap(m_header) ? QSize(m_header.width * 4, m_header.height * 3) : QSize(m_header.width, m_header.height);
}
if (option == QImageIOHandler::SubType) {
return formatName(m_format);
}
return QVariant();
@ -1868,6 +1876,10 @@ bool QDDSHandler::canRead(QIODevice *device)
bool QDDSHandler::ensureScanned() const
{
if (device() == nullptr) {
return false;
}
if (m_scanState != ScanNotScanned)
return m_scanState == ScanSuccess;