mirror/kimageformats
1
0
Fork 0
mirror of https://invent.kde.org/frameworks/kimageformats.git synced 2026-05-25 13:08:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

HDR: fix incorrect use of s.atEnd()

Browse Source
This commit is contained in:
Mirco Miranda
2026-04-20 11:03:48 +02:00
committed by Albert Astals Cid
parent 1b3f32a332
commit d5e5012cfb
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/imageformats/hdr.cpp
View File

@@ -54,10 +54,10 @@ public:
{ {
return width() > 0 && height() > 0 && width() <= HDR_MAX_IMAGE_WIDTH && height() <= HDR_MAX_IMAGE_HEIGHT; return width() > 0 && height() > 0 && width() <= HDR_MAX_IMAGE_WIDTH && height() <= HDR_MAX_IMAGE_HEIGHT;
} }
qint32 width() const { return(m_size.width()); } qint32 width() const { return m_size.width(); }
qint32 height() const { return(m_size.height()); } qint32 height() const { return m_size.height(); }
QString software() const { return(m_software); } QString software() const { return m_software; }
QImageIOHandler::Transformations transformation() const { return(m_transformation); } QImageIOHandler::Transformations transformation() const { return m_transformation; }
/*! /*!
* \brief colorSpace * \brief colorSpace
@@ -73,7 +73,7 @@ public:
* 0.600 0.150 0.060 0.333 0.333" for red, green, blue * 0.600 0.150 0.060 0.333 0.333" for red, green, blue
* and white, respectively. * and white, respectively.
*/ */
QColorSpace colorSpace() const { return(m_colorSpace); } QColorSpace colorSpace() const { return m_colorSpace; }
/*! /*!
* \brief exposure * \brief exposure
@@ -247,7 +247,7 @@ static bool Read_Old_Line(uchar *image, int width, QDataStream &s)
s >> image[2]; s >> image[2];
s >> image[3]; s >> image[3];
if (s.atEnd()) { if (s.status() != QDataStream::Ok) {
return false; return false;
} }
@@ -340,20 +340,24 @@ static bool LoadHDR(QDataStream &s, const Header& h, QImage &img)
// determine scanline type // determine scanline type
if ((width < MINELEN) || (MAXELEN < width)) { if ((width < MINELEN) || (MAXELEN < width)) {
Read_Old_Line(image, width, s); if (!Read_Old_Line(image, width, s)) {
return false;
}
RGBE_To_QRgbLine(image, scanline, h); RGBE_To_QRgbLine(image, scanline, h);
continue; continue;
} }
s >> val; s >> val;
if (s.atEnd()) { if (s.status() != QDataStream::Ok) {
return true; return false;
} }
if (val != 2) { if (val != 2) {
s.device()->ungetChar(val); s.device()->ungetChar(val);
Read_Old_Line(image, width, s); if (!Read_Old_Line(image, width, s)) {
return false;
}
RGBE_To_QRgbLine(image, scanline, h); RGBE_To_QRgbLine(image, scanline, h);
continue; continue;
} }
@@ -362,13 +366,15 @@ static bool LoadHDR(QDataStream &s, const Header& h, QImage &img)
s >> image[2]; s >> image[2];
s >> image[3]; s >> image[3];
if (s.atEnd()) { if (s.status() != QDataStream::Ok) {
return true; return false;
} }
if ((image[1] != 2) || (image[2] & 128)) { if ((image[1] != 2) || (image[2] & 128)) {
image[0] = 2; image[0] = 2;
Read_Old_Line(image + 4, width - 1, s); if (!Read_Old_Line(image + 4, width - 1, s)) {
return false;
}
RGBE_To_QRgbLine(image, scanline, h); RGBE_To_QRgbLine(image, scanline, h);
continue; continue;
} }
@@ -382,7 +388,7 @@ static bool LoadHDR(QDataStream &s, const Header& h, QImage &img)
for (int i = 0, len = int(lineArray.size()); i < 4; i++) { for (int i = 0, len = int(lineArray.size()); i < 4; i++) {
for (int j = 0; j < width;) { for (int j = 0; j < width;) {
s >> code; s >> code;
if (s.atEnd()) { if (s.status() != QDataStream::Ok) {
qCDebug(HDRPLUGIN) << "Truncated HDR file"; qCDebug(HDRPLUGIN) << "Truncated HDR file";
return false; return false;
} }
@@ -510,7 +516,7 @@ bool HDRHandler::canRead(QIODevice *device)
} }
// the .pic taken from official test cases does not start with this string but can be loaded. // the .pic taken from official test cases does not start with this string but can be loaded.
if(device->peek(11) == "#?RADIANCE\n" || device->peek(7) == "#?RGBE\n") { if (device->peek(11) == "#?RADIANCE\n" || device->peek(7) == "#?RGBE\n") {
return true; return true;
} }