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

Add support for RLE-compressed, 16 bits per channel PSD files.

Browse Source
This commit is contained in:
Chris Xiong
2020-11-06 15:02:29 +08:00
parent b742cb7cc7
commit 5825c83235
2 changed files with 58 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/imageformats/rle_p.h
View File

@ -24,6 +24,11 @@ enum class RLEVariant {
* of size 2, 130 of size 3, up to 255 of size 128.
*/
PackBits,
/**
* Same as PackBits, but treat unpacked data as
* 16-bit integers.
*/
PackBits16,
/**
* PIC-style RLE
*
@ -67,6 +72,8 @@ static inline bool decodeRLEData(RLEVariant variant,
Func2 updateItem)
{
unsigned offset = 0; // in dest
bool is_msb = true; // only used for 16-bit PackBits, data is big-endian
quint16 temp_data = 0;
while (offset < length) {
unsigned remaining = length - offset;
quint8 count1;
@ -85,7 +92,7 @@ static inline bool decodeRLEData(RLEVariant variant,
// 2 to 128 repetitions
length = count1 - 127u;
}
} else if (variant == RLEVariant::PackBits) {
} else if (variant == RLEVariant::PackBits || variant == RLEVariant::PackBits16) {
if (count1 == 128u) {
// Ignore value 128
continue;
@ -102,7 +109,18 @@ static inline bool decodeRLEData(RLEVariant variant,
}
auto datum = readData(stream);
for (unsigned i = offset; i < offset + length; ++i) {
dest[i] = updateItem(dest[i], datum);
if (variant == RLEVariant::PackBits16) {
if (is_msb) {
temp_data = datum << 8;
is_msb = false;
} else {
temp_data |= datum;
dest[i >> 1] = updateItem(dest[i >> 1], temp_data);
is_msb = true;
}
} else {
dest[i] = updateItem(dest[i], datum);
}
}
offset += length;
} else {
@ -114,7 +132,18 @@ static inline bool decodeRLEData(RLEVariant variant,
}
for (unsigned i = offset; i < offset + length; ++i) {
auto datum = readData(stream);
dest[i] = updateItem(dest[i], datum);
if (variant == RLEVariant::PackBits16) {
if (is_msb) {
temp_data = datum << 8;
is_msb = false;
} else {
temp_data |= datum;
dest[i >> 1] = updateItem(dest[i >> 1], temp_data);
is_msb = true;
}
} else {
dest[i] = updateItem(dest[i], datum);
}
}
offset += length;
}