From 05c3a1afe6d4637e70602a3374b39c4c83b45cfb Mon Sep 17 00:00:00 2001
From: Jiaqi Wu <nkid0000@gmail.com>
Date: Sat, 20 Sep 2025 13:37:52 +0800
Subject: [PATCH] Fix compilation failure with Qt 6.7

---
 src/imageformats/pcx.cpp | 4 ++--
 src/imageformats/pic.cpp | 4 ++--
 src/imageformats/rgb.cpp | 4 ++--
 src/imageformats/tga.cpp | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/imageformats/pcx.cpp b/src/imageformats/pcx.cpp
index 089bdc8..5ec7518 100644
--- a/src/imageformats/pcx.cpp
+++ b/src/imageformats/pcx.cpp
@@ -779,10 +779,10 @@ static bool writeImage24(const QImage &image, QDataStream &s, PCXHEADER &header)
         return false;
     }
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
-    auto cs = image.colorSpace();
     auto tcs = QColorSpace();
     auto tfmt = image.format();
+#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+    auto cs = image.colorSpace();
     if (cs.isValid() && cs.colorModel() == QColorSpace::ColorModel::Cmyk && tfmt == QImage::Format_CMYK8888) {
         tcs = QColorSpace(QColorSpace::SRgb);
         tfmt = QImage::Format_RGB32;
diff --git a/src/imageformats/pic.cpp b/src/imageformats/pic.cpp
index eadf45e..cc60c86 100644
--- a/src/imageformats/pic.cpp
+++ b/src/imageformats/pic.cpp
@@ -273,10 +273,10 @@ bool SoftimagePICHandler::read(QImage *image)
 bool SoftimagePICHandler::write(const QImage &image)
 {
     bool alpha = image.hasAlphaChannel();
+    auto tcs = QColorSpace();
+    auto tfmt = image.format();
 #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
     auto cs = image.colorSpace();
-    auto tfmt = image.format();
-    auto tcs = QColorSpace();
     if (cs.isValid() && cs.colorModel() == QColorSpace::ColorModel::Cmyk && tfmt == QImage::Format_CMYK8888) {
         tcs = QColorSpace(QColorSpace::SRgb);
         tfmt = QImage::Format_RGB32;
diff --git a/src/imageformats/rgb.cpp b/src/imageformats/rgb.cpp
index 1f1c6d8..4fad236 100644
--- a/src/imageformats/rgb.cpp
+++ b/src/imageformats/rgb.cpp
@@ -764,10 +764,10 @@ bool SGIImagePrivate::writeImage(const QImage &image)
         _dim = 3, _zsize++;
     }
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
-    auto cs = image.colorSpace();
     auto tcs = QColorSpace();
     auto tfmt = image.format();
+#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+    auto cs = image.colorSpace();
     if (cs.isValid() && cs.colorModel() == QColorSpace::ColorModel::Cmyk && tfmt == QImage::Format_CMYK8888) {
         tcs = QColorSpace(QColorSpace::SRgb);
         tfmt = QImage::Format_RGB32;
diff --git a/src/imageformats/tga.cpp b/src/imageformats/tga.cpp
index e386ab3..f74e537 100644
--- a/src/imageformats/tga.cpp
+++ b/src/imageformats/tga.cpp
@@ -988,9 +988,9 @@ bool TGAHandler::writeRGBA(const QImage &image)
 {
     auto format = image.format();
     const bool hasAlpha = image.hasAlphaChannel();
+    auto tcs = QColorSpace();
 #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
     auto cs = image.colorSpace();
-    auto tcs = QColorSpace();
     if (cs.isValid() && cs.colorModel() == QColorSpace::ColorModel::Cmyk && image.format() == QImage::Format_CMYK8888) {
         format = QImage::Format_RGB32;
         tcs = QColorSpace(QColorSpace::SRgb);