GerbilSoft/rom-properties
1
Fork 0
mirror of https://github.com/GerbilSoft/rom-properties.git synced 2025-06-18 11:35:38 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[librptexture] qoi.h: Revert the qoi_decode() change.

Browse Source 
A new test I added failed with the qoi_decode() change. Reverting it
fixes the test, even with the qoi_read_32() optimization still in place.
This commit is contained in:
David Korth 2025-06-16 01:05:40 -04:00
parent 523de9913c
commit b0d5e05cce
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/librptexture/decoder/qoi.h
View File

@ -335,7 +335,6 @@ enough for anybody. */
typedef union {
struct { unsigned char r, g, b, a; } rgba;
unsigned char u8[4];
unsigned int v;
} qoi_rgba_t;
@ -554,12 +553,15 @@ void *qoi_decode(const void *data, int size, qoi_desc *desc, int channels) {
int b1 = bytes[p++];
if (b1 == QOI_OP_RGB) {
memcpy(px.u8, bytes, 3);
p += 3;
px.rgba.r = bytes[p++];
px.rgba.g = bytes[p++];
px.rgba.b = bytes[p++];
}
else if (b1 == QOI_OP_RGBA) {
memcpy(px.u8, bytes, 4);
p += 4;
px.rgba.r = bytes[p++];
px.rgba.g = bytes[p++];
px.rgba.b = bytes[p++];
px.rgba.a = bytes[p++];
}
else if ((b1 & QOI_MASK_2) == QOI_OP_INDEX) {
px = index[b1];
@ -583,8 +585,10 @@ void *qoi_decode(const void *data, int size, qoi_desc *desc, int channels) {
index[QOI_COLOR_HASH(px) & (64 - 1)] = px;
}
memcpy(&pixels[px_pos], px.u8, 3);
pixels[px_pos + 0] = px.rgba.r;
pixels[px_pos + 1] = px.rgba.g;
pixels[px_pos + 2] = px.rgba.b;
if (channels == 4) {
pixels[px_pos + 3] = px.rgba.a;
}