From e60dfd496847991ca8c93a8f2504685631613d98 Mon Sep 17 00:00:00 2001
From: Mirco Miranda <mirco.miranda@systemceramics.com>
Date: Wed, 10 May 2023 11:43:04 +0000
Subject: [PATCH] pcx: multiple fixes

- 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
---
 autotests/write/bw.pcx   | Bin 1649 -> 1649 bytes
 autotests/write/rgb.pcx  | Bin 1825 -> 1825 bytes
 src/imageformats/pcx.cpp |  21 +++++++++++----------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/autotests/write/bw.pcx b/autotests/write/bw.pcx
index 095d70e3ae869e988d161acd70c64d53045f214d..3a7ccc27c36b5b28473cea65fc808a9ead649270 100644
GIT binary patch
delta 27
fcmey!^O1+2i<Oas0SM%Q(1XEaqM*S>dm}agNFN01

delta 28
gcmey!^N~k@i<Oas0SM%QP=`^6aiXBXMh8PS07(i2wEzGB

diff --git a/autotests/write/rgb.pcx b/autotests/write/rgb.pcx
index 90282b4a517e59177bfa47e0cf33280f1c16940d..fdce66c9697cd303afeb9924c7c7bc5fbad1c300 100644
GIT binary patch
delta 27
fcmZ3;w~&vYi<Oas0SM%Q(1XEaqM*S>`$ud5Iim#r

delta 28
gcmZ3;w~$YOi<Oas0SM%QP=`^6aiXBXMu&%N06Fpm$p8QV

diff --git a/src/imageformats/pcx.cpp b/src/imageformats/pcx.cpp
index 8448556..68599e4 100644
--- a/src/imageformats/pcx.cpp
+++ b/src/imageformats/pcx.cpp
@@ -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;