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

ScanlineConverter: fix indexed conversion and support for source depth less than 24 bits

Browse Source
This commit is contained in:
Mirco Miranda 2024-01-06 09:04:06 +01:00
parent f065104b72
commit 9f7b1b8dee
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
autotests/read/exr/gray.exr Normal file
View File

Binary file not shown.

BIN
autotests/read/exr/gray.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

14
src/imageformats/scanlineconverter.cpp
View File

@ -60,20 +60,25 @@ const uchar *ScanLineConverter::convertedScanLine(const QImage &image, qint32 y)
} }
if (image.width() != _tmpBuffer.width() || image.format() != _tmpBuffer.format()) { if (image.width() != _tmpBuffer.width() || image.format() != _tmpBuffer.format()) {
_tmpBuffer = QImage(image.width(), 1, image.format()); _tmpBuffer = QImage(image.width(), 1, image.format());
_tmpBuffer.setColorTable(image.colorTable());
} }
if (_tmpBuffer.isNull()) { if (_tmpBuffer.isNull()) {
return nullptr; return nullptr;
} }
std::memcpy(_tmpBuffer.bits(), image.constScanLine(y), std::min(_tmpBuffer.bytesPerLine(), image.bytesPerLine())); std::memcpy(_tmpBuffer.bits(), image.constScanLine(y), std::min(_tmpBuffer.bytesPerLine(), image.bytesPerLine()));
auto tmp = _tmpBuffer;
if (colorSpaceConversion) { if (colorSpaceConversion) {
auto cs = image.colorSpace(); auto cs = image.colorSpace();
if (!cs.isValid()) { if (!cs.isValid()) {
cs = _defaultColorSpace; cs = _defaultColorSpace;
} }
_tmpBuffer.setColorSpace(cs); if (tmp.depth() < 24) {
_tmpBuffer.convertToColorSpace(_colorSpace); tmp = tmp.convertToFormat(tmp.hasAlphaChannel() ? QImage::Format_ARGB32 : QImage::Format_RGB32);
} }
_convBuffer = _tmpBuffer.convertToFormat(_targetFormat); tmp.setColorSpace(cs);
tmp.convertToColorSpace(_colorSpace);
}
_convBuffer = tmp.convertToFormat(_targetFormat);
if (_convBuffer.isNull()) { if (_convBuffer.isNull()) {
return nullptr; return nullptr;
} }
@ -90,9 +95,6 @@ qsizetype ScanLineConverter::bytesPerLine() const
bool ScanLineConverter::isColorSpaceConversionNeeded(const QImage &image, const QColorSpace &targetColorSpace, const QColorSpace &defaultColorSpace) bool ScanLineConverter::isColorSpaceConversionNeeded(const QImage &image, const QColorSpace &targetColorSpace, const QColorSpace &defaultColorSpace)
{ {
if (image.depth() < 24) { // RGB 8 bit or grater only
return false;
}
auto sourceColorSpace = image.colorSpace(); auto sourceColorSpace = image.colorSpace();
if (!sourceColorSpace.isValid()) { if (!sourceColorSpace.isValid()) {
sourceColorSpace = defaultColorSpace; sourceColorSpace = defaultColorSpace;