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

No longer descease color depth to 8 for 16 bit uncompressed PSD files

Browse Source
This commit is contained in:
Gary Wang 2020-11-07 18:11:12 +08:00
parent d36c191351
commit 938b8126b5
3 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
autotests/read/psd/argb16-raw-affinityphoto-1.8.5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 628 B

After

Width:  |  Height:  |  Size: 983 B

BIN
autotests/read/psd/rgb16-raw-affinityphoto-1.8.5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 534 B

After

Width:  |  Height:  |  Size: 827 B

49
src/imageformats/psd.cpp
View File

@ -104,14 +104,9 @@ static void skip_section(QDataStream &s)
s.skipRawData(section_length); s.skipRawData(section_length);
} }
static quint8 readPixel_u16(QDataStream &stream) { template <class Trait>
quint16 pixel; static Trait readPixel(QDataStream &stream) {
stream >> pixel; Trait pixel;
return pixel / (1 << 8);
}
static int readPixel_u8(QDataStream &stream) {
quint8 pixel;
stream >> pixel; stream >> pixel;
return pixel; return pixel;
} }
@ -156,23 +151,18 @@ static bool LoadPSD(QDataStream &stream, const PSDHeader &header, QImage &img)
quint32 channel_num = header.channel_count; quint32 channel_num = header.channel_count;
QImage::Format fmt = QImage::Format_RGB32; QImage::Format fmt = header.depth == 8 ? QImage::Format_RGB32
: QImage::Format_RGBX64;
// Clear the image. // Clear the image.
if (channel_num >= 4) { if (channel_num >= 4) {
// Enable alpha. // Enable alpha.
fmt = QImage::Format_ARGB32; fmt = header.depth == 8 ? QImage::Format_ARGB32
: QImage::Format_RGBA64;
// Ignore the other channels. // Ignore the other channels.
channel_num = 4; channel_num = 4;
} }
if (compression == 1 && header.depth == 16) {
fmt = QImage::Format_RGBX64;
if (channel_num >= 4) {
fmt = QImage::Format_RGBA64;
}
}
img = QImage(header.width, header.height, fmt); img = QImage(header.width, header.height, fmt);
if (img.isNull()) { if (img.isNull()) {
qWarning() << "Failed to allocate image, invalid dimensions?" << QSize(header.width, header.height); qWarning() << "Failed to allocate image, invalid dimensions?" << QSize(header.width, header.height);
@ -181,9 +171,10 @@ static bool LoadPSD(QDataStream &stream, const PSDHeader &header, QImage &img)
img.fill(qRgb(0,0,0)); img.fill(qRgb(0,0,0));
const quint32 pixel_count = header.height * header.width; const quint32 pixel_count = header.height * header.width;
const quint32 channel_size = pixel_count * header.depth / 8;
// Verify this, as this is used to write into the memory of the QImage // Verify this, as this is used to write into the memory of the QImage
if (pixel_count > img.sizeInBytes() / sizeof(QRgb)) { if (pixel_count > img.sizeInBytes() / (header.depth == 8 ? sizeof(QRgb) : sizeof(QRgba64))) {
qWarning() << "Invalid pixel count!" << pixel_count << "bytes available:" << img.sizeInBytes(); qWarning() << "Invalid pixel count!" << pixel_count << "bytes available:" << img.sizeInBytes();
return false; return false;
} }
@ -220,13 +211,13 @@ static bool LoadPSD(QDataStream &stream, const PSDHeader &header, QImage &img)
bool success = false; bool success = false;
if (header.depth == 8) { if (header.depth == 8) {
success = decodeRLEData(RLEVariant::PackBits, stream, success = decodeRLEData(RLEVariant::PackBits, stream,
image_data, pixel_count, image_data, channel_size,
&readPixel_u8, updaters[channel]); &readPixel<quint8>, updaters[channel]);
} else if (header.depth == 16) { } else if (header.depth == 16) {
QRgba64 *image_data = reinterpret_cast<QRgba64*>(img.bits()); QRgba64 *image_data = reinterpret_cast<QRgba64*>(img.bits());
success = decodeRLEData(RLEVariant::PackBits16, stream, success = decodeRLEData(RLEVariant::PackBits16, stream,
image_data, pixel_count * 2, image_data, channel_size,
&readPixel_u8, updaters64[channel]); &readPixel<quint8>, updaters64[channel]);
} }
if (!success) { if (!success) {
@ -236,11 +227,15 @@ static bool LoadPSD(QDataStream &stream, const PSDHeader &header, QImage &img)
} }
} else { } else {
for (unsigned short channel = 0; channel < channel_num; channel++) { for (unsigned short channel = 0; channel < channel_num; channel++) {
for (unsigned i = 0; i < pixel_count; ++i) { if (header.depth == 8) {
image_data[i] = updaters[channel]( for (unsigned i = 0; i < pixel_count; ++i) {
image_data[i], image_data[i] = updaters[channel](image_data[i], readPixel<quint8>(stream));
header.depth == 8 ? readPixel_u8(stream) }
: readPixel_u16(stream)); } else if (header.depth == 16) {
QRgba64 *image_data = reinterpret_cast<QRgba64*>(img.bits());
for (unsigned i = 0; i < pixel_count; ++i) {
image_data[i] = updaters64[channel](image_data[i], readPixel<quint16>(stream));
}
} }
// make sure we didn't try to read past the end of the stream // make sure we didn't try to read past the end of the stream
if (stream.status() != QDataStream::Ok) { if (stream.status() != QDataStream::Ok) {