diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2024-03-01 19:48:10 +0100 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2024-04-05 14:41:31 +0200 |
| commit | eca0512b0862630cb1be9a66e280a52f59413221 (patch) | |
| tree | 78584e6608e1ffedb4dbe1415e1e29657ed56b93 /src/gui/image | |
| parent | 157c9eef48916c3e11f43ffb0fe8e8030bed8d06 (diff) | |
QImage: remove the last mentions of Format_CMYK32
Change-Id: I8ef63d7f3f14f16111a7e45e07734c10e448984c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qimage.cpp | 1 | ||||
| -rw-r--r-- | src/gui/image/qimage.h | 1 | ||||
| -rw-r--r-- | src/gui/image/qimage_p.h | 4 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 67109a7083..08798c4664 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -744,7 +744,6 @@ bool QImageData::checkForAlphaPixels() const \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_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_CMYK8888 is not supported. diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h index a60dacb701..1208e9ae67 100644 --- a/src/gui/image/qimage.h +++ b/src/gui/image/qimage.h @@ -76,7 +76,6 @@ public: Format_RGBA32FPx4, Format_RGBA32FPx4_Premultiplied, Format_CMYK8888, - Format_CMYK32 = Format_CMYK8888, #ifndef Q_QDOC NImageFormats #endif diff --git a/src/gui/image/qimage_p.h b/src/gui/image/qimage_p.h index 7dbddbc67d..2edf03a4f2 100644 --- a/src/gui/image/qimage_p.h +++ b/src/gui/image/qimage_p.h @@ -364,7 +364,7 @@ inline QImage::Format qt_maybeDataCompatibleOpaqueVersion(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; // Already opaque case QImage::Format_Mono: case QImage::Format_MonoLSB: @@ -485,7 +485,7 @@ inline QImage::Format qt_maybeDataCompatibleAlphaVersion(QImage::Format format) case QImage::Format_BGR888: case QImage::Format_Grayscale8: case QImage::Format_Grayscale16: - case QImage::Format_CMYK32: + case QImage::Format_CMYK8888: case QImage::Format_Invalid: case QImage::NImageFormats: break; |