Port QImage::Format_CMYK32 to CMYK8888

Follow the established convention that byte-oriented image formats
have the "8888" suffix, not "32". The old enum name is temporarily
left to help port other submodules.

This work has been kindly sponsored by the QGIS project
(https://qgis.org/).

Change-Id: I4b6f10cb22312b614cb9cf4b0ac439907276c538
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

4 files changed, 17 insertions, 15 deletions

diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index ccc54fae59..67109a7083 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -304,7 +304,7 @@ bool QImageData::checkForAlphaPixels() const
     case QImage::Format_RGBX64:
     case QImage::Format_RGBX16FPx4:
     case QImage::Format_RGBX32FPx4:
-    case QImage::Format_CMYK32:
+    case QImage::Format_CMYK8888:
         break;
     case QImage::Format_Invalid:
     case QImage::NImageFormats:
@@ -361,7 +361,7 @@ bool QImageData::checkForAlphaPixels() const
     refer to the \l{How to Create Qt Plugins}{Plugin HowTo}.
 
     \warning Painting on a QImage with the format
-    QImage::Format_Indexed8 or QImage::Format_CMYK32 is not supported.
+    QImage::Format_Indexed8 or QImage::Format_CMYK8888 is not supported.
 
     \tableofcontents
 
@@ -743,9 +743,10 @@ bool QImageData::checkForAlphaPixels() const
     \value Format_RGBA32FPx4 The image is stored using a 4 32-bit floating point RGBA format (32FP-32FP-32FP-32FP). (added in Qt 6.2)
     \value Format_RGBA32FPx4_Premultiplied    The image is stored using a premultiplied 4 32-bit floating point
                              RGBA format (32FP-32FP-32FP-32FP). (added in Qt 6.2)
-    \value Format_CMYK32     The image is stored using a 32 bit CMYK format (0xCCMMYYKK). (added in Qt 6.8)
+    \value Format_CMYK8888   The image is stored using a 32-bit byte-ordered CMYK format. (added in Qt 6.8)
+    \omitvalue Format_CMYK32
 
-    \note Drawing into a QImage with format QImage::Format_Indexed8 or QImage::Format_CMYK32 is not
+    \note Drawing into a QImage with format QImage::Format_Indexed8 or QImage::Format_CMYK8888 is not
     supported.
 
     \note Avoid most rendering directly to most of these formats using QPainter. Rendering
@@ -5729,7 +5730,7 @@ static constexpr QPixelFormat pixelformats[] = {
                      /*PREMULTIPLIED*/     QPixelFormat::Premultiplied,
                      /*INTERPRETATION*/    QPixelFormat::FloatingPoint,
                      /*BYTE ORDER*/        QPixelFormat::CurrentSystemEndian),
-        //QImage::Format_CMYK32:
+        //QImage::Format_CMYK8888:
         QPixelFormat(QPixelFormat::CMYK,
                      /*RED*/                8,
                      /*GREEN*/              8,
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h
index 605a1084ed..a60dacb701 100644
--- a/src/gui/image/qimage.h
+++ b/src/gui/image/qimage.h
@@ -75,7 +75,8 @@ public:
         Format_RGBX32FPx4,
         Format_RGBA32FPx4,
         Format_RGBA32FPx4_Premultiplied,
-        Format_CMYK32,
+        Format_CMYK8888,
+        Format_CMYK32 = Format_CMYK8888,
 #ifndef Q_QDOC
         NImageFormats
 #endif
diff --git a/src/gui/image/qimage_conversions.cpp b/src/gui/image/qimage_conversions.cpp
index a35f4097e6..a806954df2 100644
--- a/src/gui/image/qimage_conversions.cpp
+++ b/src/gui/image/qimage_conversions.cpp
@@ -2456,12 +2456,12 @@ static bool convert_Grayscale8_to_Indexed8_inplace(QImageData *data, Qt::ImageCo
 }
 
 template <bool SourceIsPremultiplied>
-static void convert_ARGB32_to_CMYK32(QImageData *dest, const QImageData *src, Qt::ImageConversionFlags)
+static void convert_ARGB32_to_CMYK8888(QImageData *dest, const QImageData *src, Qt::ImageConversionFlags)
 {
     Q_ASSERT(src->format == QImage::Format_RGB32 ||
              src->format == QImage::Format_ARGB32 ||
              src->format == QImage::Format_ARGB32_Premultiplied);
-    Q_ASSERT(dest->format == QImage::Format_CMYK32);
+    Q_ASSERT(dest->format == QImage::Format_CMYK8888);
     Q_ASSERT(src->width == dest->width);
     Q_ASSERT(src->height == dest->height);
 
@@ -2619,10 +2619,10 @@ static void qInitImageConversions()
     qimage_converter_map[QImage::Format_RGBX32FPx4][QImage::Format_RGBA32FPx4] = convert_passthrough;
     qimage_converter_map[QImage::Format_RGBX32FPx4][QImage::Format_RGBA32FPx4_Premultiplied] = convert_passthrough;
 
-    qimage_converter_map[QImage::Format_CMYK32][QImage::Format_CMYK32] = convert_passthrough;
-    qimage_converter_map[QImage::Format_RGB32][QImage::Format_CMYK32] = convert_ARGB32_to_CMYK32<false>;
-    qimage_converter_map[QImage::Format_ARGB32][QImage::Format_CMYK32] = convert_ARGB32_to_CMYK32<false>;
-    qimage_converter_map[QImage::Format_ARGB32_Premultiplied][QImage::Format_CMYK32] = convert_ARGB32_to_CMYK32<true>;
+    qimage_converter_map[QImage::Format_CMYK8888][QImage::Format_CMYK8888] = convert_passthrough;
+    qimage_converter_map[QImage::Format_RGB32][QImage::Format_CMYK8888] = convert_ARGB32_to_CMYK8888<false>;
+    qimage_converter_map[QImage::Format_ARGB32][QImage::Format_CMYK8888] = convert_ARGB32_to_CMYK8888<false>;
+    qimage_converter_map[QImage::Format_ARGB32_Premultiplied][QImage::Format_CMYK8888] = convert_ARGB32_to_CMYK8888<true>;
 
     // Inline converters:
     qimage_inplace_converter_map[QImage::Format_Indexed8][QImage::Format_Grayscale8] =
diff --git a/src/gui/image/qimage_p.h b/src/gui/image/qimage_p.h
index 89fb66aedc..ca7a4de4d8 100644
--- a/src/gui/image/qimage_p.h
+++ b/src/gui/image/qimage_p.h
@@ -195,7 +195,7 @@ inline int qt_depthForFormat(QImage::Format format)
     case QImage::Format_RGBA32FPx4_Premultiplied:
         depth = 128;
         break;
-    case QImage::Format_CMYK32:
+    case QImage::Format_CMYK8888:
         depth = 32;
         break;
     }
@@ -251,7 +251,7 @@ inline QImage::Format qt_opaqueVersion(QImage::Format format)
     case QImage::Format_RGBX32FPx4:
     case QImage::Format_Grayscale8:
     case QImage::Format_Grayscale16:
-    case QImage::Format_CMYK32:
+    case QImage::Format_CMYK8888:
         return format;
     case QImage::Format_Mono:
     case QImage::Format_MonoLSB:
@@ -315,7 +315,7 @@ inline QImage::Format qt_alphaVersion(QImage::Format format)
     case QImage::Format_Alpha8:
     case QImage::Format_Grayscale8:
     case QImage::Format_Invalid:
-    case QImage::Format_CMYK32:
+    case QImage::Format_CMYK8888:
     case QImage::NImageFormats:
         break;
     }