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

pcx: multiple fixes

Browse Source 
- Fix wrong RGB channel order if image format is other than (A)RGB32
- Write right resolution
- Set right resolution on image load
- Return false on write error
- Save images with depth greater than 24-bits

(cherry picked from commit e60dfd4968)
This commit is contained in:
Mirco Miranda 2023-05-10 11:43:04 +00:00 committed by Albert Astals Cid
parent bb66367bc8
commit 91d3bd5227
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
autotests/write/bw.pcx
View File

Binary file not shown.

BIN
autotests/write/rgb.pcx
View File

Binary file not shown.

21
src/imageformats/pcx.cpp
View File

@ -547,6 +547,9 @@ static void writeImage8(QImage &img, QDataStream &s, PCXHEADER &header)
static void writeImage24(QImage &img, QDataStream &s, PCXHEADER &header)
{
if(img.format() != QImage::Format_ARGB32 && img.format() != QImage::Format_RGB32)
img = img.convertToFormat(QImage::Format_RGB32);
header.Bpp = 8;
header.NPlanes = 3;
header.BytesPerLine = header.width();
@ -558,7 +561,7 @@ static void writeImage24(QImage &img, QDataStream &s, PCXHEADER &header)
QByteArray b_buf(header.width(), 0);
for (int y = 0; y < header.height(); ++y) {
uint *p = (uint *)img.scanLine(y);
auto p = (QRgb*)img.scanLine(y);
for (int x = 0; x < header.width(); ++x) {
QRgb rgb = *p++;
@ -634,6 +637,8 @@ bool PCXHandler::read(QImage *outImage)
// qDebug() << "Image Depth: " << img.depth();
if (!img.isNull()) {
img.setDotsPerMeterX(qRound(header.HDpi / 25.4 * 1000));
img.setDotsPerMeterY(qRound(header.YDpi / 25.4 * 1000));
*outImage = img;
return true;
} else {
@ -655,12 +660,6 @@ bool PCXHandler::write(const QImage &image)
return false;
}
// qDebug() << "Width: " << w;
// qDebug() << "Height: " << h;
// qDebug() << "Depth: " << img.depth();
// qDebug() << "BytesPerLine: " << img.bytesPerLine();
// qDebug() << "Color Count: " << img.colorCount();
PCXHEADER header;
header.Manufacturer = 10;
@ -670,8 +669,8 @@ bool PCXHandler::write(const QImage &image)
header.YMin = 0;
header.XMax = w - 1;
header.YMax = h - 1;
header.HDpi = 300;
header.YDpi = 300;
header.HDpi = qRound(image.dotsPerMeterX() * 25.4 / 1000);
header.YDpi = qRound(image.dotsPerMeterY() * 25.4 / 1000);
header.Reserved = 0;
header.PaletteInfo = 1;
@ -681,8 +680,10 @@ bool PCXHandler::write(const QImage &image)
writeImage4(img, s, header);
} else if (img.depth() == 8) {
writeImage8(img, s, header);
} else if (img.depth() == 32) {
} else if (img.depth() >= 24) {
writeImage24(img, s, header);
} else {
return false;
}
return true;