mirror/kimageformats
1
0
Fork 0
mirror of https://invent.kde.org/frameworks/kimageformats.git synced 2026-11-03 00:18:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

DDS: simply use 0 for blue channel for readATI2()

Browse Source 
Originally we uses getNormalZ() for the image, which treat the
image as a normal map. Visual Studio simply fill the blue channel
with 0 instead. Since DDS is for DirectX which is a MS stuff, align
to Visual Studio might be a good idea.

Also, red and green channel should be swapped.
This commit is contained in:
Wang Zichong
2026-10-27 07:23:35 +01:00
committed by Mirco Miranda
parent 67ee4cb720
commit e07c5386ff
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
autotests/read/dds/bc5.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

src/imageformats/dds.cpp
+4 -6
View File
@@ -973,8 +973,9 @@ static QImage readATI2(QDataStream &s, quint32 width, quint32 height)
if (s.readRawData(reinterpret_cast<char *>(block), sizeof(block)) != int(sizeof(block)))
return QImage();
// BC5 (ATI2) stores two BC4 blocks: the first one is the second
// normal component, the second one is the first normal component.
// BC5 (ATI2) stores two BC4 blocks: the first one is the red
// channel and the second one is the green channel. The format has
// no blue channel, so it is set to zero.
bcdec_bc5(block, texel, 4 * 2);
const quint32 kMax = qMin<quint32>(4, height - i);
@@ -983,10 +984,7 @@ static QImage readATI2(QDataStream &s, quint32 width, quint32 height)
QRgb *line = reinterpret_cast<QRgb *>(image.scanLine(i + k));
for (quint32 l = 0; l < lMax; l++) {
const quint8 *pixel = texel + (k * 4 + l) * 2;
const quint8 nx = pixel[1];
const quint8 ny = pixel[0];
const quint8 nz = getNormalZ(nx, ny);
line[j + l] = qRgb(nx, ny, nz);
line[j + l] = qRgb(pixel[0], pixel[1], 0);
}
}
}