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

TGA writer: fix alpha detection and performance improvements

Browse Source
This commit is contained in:
Mirco Miranda 2023-05-07 10:38:52 +02:00 committed by Albert Astals Cid
parent e60dfd4968
commit c9fec5e408
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/imageformats/tga.cpp
View File

@ -428,8 +428,16 @@ bool TGAHandler::write(const QImage &image)
QDataStream s(device()); QDataStream s(device());
s.setByteOrder(QDataStream::LittleEndian); s.setByteOrder(QDataStream::LittleEndian);
const QImage &img = image; QImage img(image);
const bool hasAlpha = (img.format() == QImage::Format_ARGB32); const bool hasAlpha = img.hasAlphaChannel();
if (hasAlpha && img.format() != QImage::Format_ARGB32)
img = img.convertToFormat(QImage::Format_ARGB32);
else if (!hasAlpha && img.format() != QImage::Format_RGB32)
img = img.convertToFormat(QImage::Format_RGB32);
if (img.isNull()) {
qDebug() << "TGAHandler::write: image conversion to 32 bits failed!";
return false;
}
static constexpr quint8 originTopLeft = TGA_ORIGIN_UPPER + TGA_ORIGIN_LEFT; // 0x20 static constexpr quint8 originTopLeft = TGA_ORIGIN_UPPER + TGA_ORIGIN_LEFT; // 0x20
static constexpr quint8 alphaChannel8Bits = 0x08; static constexpr quint8 alphaChannel8Bits = 0x08;
@ -444,8 +452,9 @@ bool TGAHandler::write(const QImage &image)
s << quint8(hasAlpha ? originTopLeft + alphaChannel8Bits : originTopLeft); // top left image (0x20) + 8 bit alpha (0x8) s << quint8(hasAlpha ? originTopLeft + alphaChannel8Bits : originTopLeft); // top left image (0x20) + 8 bit alpha (0x8)
for (int y = 0; y < img.height(); y++) { for (int y = 0; y < img.height(); y++) {
auto ptr = reinterpret_cast<QRgb *>(img.scanLine(y));
for (int x = 0; x < img.width(); x++) { for (int x = 0; x < img.width(); x++) {
const QRgb color = img.pixel(x, y); auto color = *(ptr + x);
s << quint8(qBlue(color)); s << quint8(qBlue(color));
s << quint8(qGreen(color)); s << quint8(qGreen(color));
s << quint8(qRed(color)); s << quint8(qRed(color));