mirror/kimageformats
1
0
Fork 0
mirror of https://invent.kde.org/frameworks/kimageformats.git synced 2025-11-22 10:02:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

IFF: Fix possible undefined-shift

Browse Source
This commit is contained in:
Mirco Miranda
2025-08-09 11:46:05 +02:00
parent e912a4ac9b
commit 68cc915132
2 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/imageformats/chunks.cpp
View File

@ -10,7 +10,6 @@
#include <QBuffer> #include <QBuffer>
#include <QColor> #include <QColor>
#include <QDebug>
#ifdef QT_DEBUG #ifdef QT_DEBUG
Q_LOGGING_CATEGORY(LOG_IFFPLUGIN, "kf.imageformats.plugins.iff", QtDebugMsg) Q_LOGGING_CATEGORY(LOG_IFFPLUGIN, "kf.imageformats.plugins.iff", QtDebugMsg)
@ -20,6 +19,11 @@ Q_LOGGING_CATEGORY(LOG_IFFPLUGIN, "kf.imageformats.plugins.iff", QtWarningMsg)
#define RECURSION_PROTECTION 10 #define RECURSION_PROTECTION 10
#define BITPLANES_HAM_MAX 8
#define BITPLANES_HAM_MIN 5
#define BITPLANES_HALFBRIDE_MAX 8
#define BITPLANES_HALFBRIDE_MIN 1
static QString dataToString(const IFFChunk *chunk) static QString dataToString(const IFFChunk *chunk)
{ {
if (chunk == nullptr || !chunk->isValid()) { if (chunk == nullptr || !chunk->isValid()) {
@ -843,13 +847,15 @@ CAMGChunk::ModeIds BODYChunk::safeModeId(const BMHDChunk *header, const CAMGChun
if (header == nullptr) { if (header == nullptr) {
return CAMGChunk::ModeIds(); return CAMGChunk::ModeIds();
} }
if (cmap && cmap->count() == (1 << (header->bitplanes() - 1))) { auto cmapCount = cmap ? cmap->count() : 0;
return CAMGChunk::ModeIds(CAMGChunk::ModeId::HalfBrite); auto bitplanes = header->bitplanes();
if (bitplanes >= BITPLANES_HALFBRIDE_MIN && bitplanes <= BITPLANES_HALFBRIDE_MAX) {
if (cmapCount == (1 << (header->bitplanes() - 1)))
return CAMGChunk::ModeIds(CAMGChunk::ModeId::HalfBrite);
} }
if (header->bitplanes() == 6) { if (bitplanes >= BITPLANES_HAM_MIN && bitplanes <= BITPLANES_HAM_MAX) {
// If no CAMG chunk is present, and image is 6 planes deep, if (cmapCount == (1 << (header->bitplanes() - 2)))
// assume HAM and you'll probably be right. return CAMGChunk::ModeIds(CAMGChunk::ModeId::Ham);
return CAMGChunk::ModeIds(CAMGChunk::ModeId::Ham);
} }
return CAMGChunk::ModeIds(); return CAMGChunk::ModeIds();
} }
@ -921,7 +927,8 @@ QByteArray BODYChunk::deinterleave(const QByteArray &planes, const BMHDChunk *he
case 6: case 6:
case 7: case 7:
case 8: case 8:
if ((modeId & CAMGChunk::ModeId::Ham) && (cmap) && (bitplanes >= 5 && bitplanes <= 8)) { if ((modeId & CAMGChunk::ModeId::Ham) && (cmap) &&
(bitplanes >= BITPLANES_HAM_MIN && bitplanes <= BITPLANES_HAM_MAX)) {
// From A Quick Introduction to IFF.txt: // From A Quick Introduction to IFF.txt:
// //
// Amiga HAM (Hold and Modify) mode lets the Amiga display all 4096 RGB values. // Amiga HAM (Hold and Modify) mode lets the Amiga display all 4096 RGB values.
@ -982,7 +989,8 @@ QByteArray BODYChunk::deinterleave(const QByteArray &planes, const BMHDChunk *he
ba[cnt3 + 2] = char(prev[2]); ba[cnt3 + 2] = char(prev[2]);
} }
} }
} else if ((modeId & CAMGChunk::ModeId::HalfBrite) && (cmap)) { } else if ((modeId & CAMGChunk::ModeId::HalfBrite) && (cmap) &&
(bitplanes >= BITPLANES_HALFBRIDE_MIN && bitplanes <= BITPLANES_HALFBRIDE_MAX)) {
// From A Quick Introduction to IFF.txt: // From A Quick Introduction to IFF.txt:
// //
// In HALFBRITE mode, the Amiga interprets the bit in the // In HALFBRITE mode, the Amiga interprets the bit in the
@ -1319,15 +1327,19 @@ QImage::Format FORMChunk::format() const
return QImage::Format_RGBA64; return QImage::Format_RGBA64;
} }
if (h->bitplanes() >= 1 && h->bitplanes() <= 8) { if (h->bitplanes() >= 1 && h->bitplanes() <= 8) {
if (!IFFChunk::search(SHAM_CHUNK, chunks()).isEmpty() || !IFFChunk::search(CTBL_CHUNK, chunks()).isEmpty()) { if (!IFFChunk::search(SHAM_CHUNK, chunks()).isEmpty()
// Images with the SHAM or CTBL chunk do not load correctly: it seems they contains || !IFFChunk::search(RAST_CHUNK, chunks()).isEmpty()
// a color table but I didn't find any specs. || !IFFChunk::search(CTBL_CHUNK, chunks()).isEmpty()
qCDebug(LOG_IFFPLUGIN) << "FORMChunk::format(): SHAM/CTBL chunk is not supported"; || !IFFChunk::search(BEAM_CHUNK, chunks()).isEmpty()) {
// Images with the SHAM, RAST or BEAM/CTBL chunk do not load correctly:
// it seems they contains a color table but I didn't find any specs.
qCDebug(LOG_IFFPLUGIN) << "FORMChunk::format(): BEAM/CTBL/RAST/SHAM chunk is not supported";
return QImage::Format_Invalid; return QImage::Format_Invalid;
} }
if (modeId & CAMGChunk::ModeId::Ham) { if (h->bitplanes() >= BITPLANES_HAM_MIN && h->bitplanes() <= BITPLANES_HAM_MAX) {
return QImage::Format_RGB888; if (modeId & CAMGChunk::ModeId::Ham)
return QImage::Format_RGB888;
} }
if (!cmaps.isEmpty()) { if (!cmaps.isEmpty()) {

2
src/imageformats/chunks_p.h
View File

@ -55,7 +55,9 @@ Q_DECLARE_LOGGING_CATEGORY(LOG_IFFPLUGIN)
#define CMYK_CHUNK QByteArray("CMYK") // https://wiki.amigaos.net/wiki/ILBM_IFF_Interleaved_Bitmap#ILBM.CMYK #define CMYK_CHUNK QByteArray("CMYK") // https://wiki.amigaos.net/wiki/ILBM_IFF_Interleaved_Bitmap#ILBM.CMYK
#define DPI__CHUNK QByteArray("DPI ") #define DPI__CHUNK QByteArray("DPI ")
#define BEAM_CHUNK QByteArray("BEAM") // undocumented (should be the same as CTBL)
#define CTBL_CHUNK QByteArray("CTBL") // undocumented #define CTBL_CHUNK QByteArray("CTBL") // undocumented
#define RAST_CHUNK QByteArray("RAST") // undocumented (Atari STE)
#define SHAM_CHUNK QByteArray("SHAM") // undocumented #define SHAM_CHUNK QByteArray("SHAM") // undocumented
// FOR4 CIMG IFF (Maya) // FOR4 CIMG IFF (Maya)