1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QImage: remove the last mentions of Format_CMYK32

Browse Source 
Change-Id: I8ef63d7f3f14f16111a7e45e07734c10e448984c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
This commit is contained in:
Giuseppe D'Angelo 2024-03-01 19:48:10 +01:00
parent 157c9eef48
commit eca0512b08
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/image/qimage.cpp
View File

@ -744,7 +744,6 @@ bool QImageData::checkForAlphaPixels() const
\value Format_RGBA32FPx4_Premultiplied The image is stored using a premultiplied 4 32-bit floating point \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) 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) \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 \note Drawing into a QImage with format QImage::Format_Indexed8 or QImage::Format_CMYK8888 is not
supported. supported.

1
src/gui/image/qimage.h
View File

@ -76,7 +76,6 @@ public:
Format_RGBA32FPx4, Format_RGBA32FPx4,
Format_RGBA32FPx4_Premultiplied, Format_RGBA32FPx4_Premultiplied,
Format_CMYK8888, Format_CMYK8888,
Format_CMYK32 = Format_CMYK8888,
#ifndef Q_QDOC #ifndef Q_QDOC
NImageFormats NImageFormats
#endif #endif

4
src/gui/image/qimage_p.h
View File

@ -364,7 +364,7 @@ inline QImage::Format qt_maybeDataCompatibleOpaqueVersion(QImage::Format format)
case QImage::Format_RGBX32FPx4: case QImage::Format_RGBX32FPx4:
case QImage::Format_Grayscale8: case QImage::Format_Grayscale8:
case QImage::Format_Grayscale16: case QImage::Format_Grayscale16:
case QImage::Format_CMYK32: case QImage::Format_CMYK8888:
return format; // Already opaque return format; // Already opaque
case QImage::Format_Mono: case QImage::Format_Mono:
case QImage::Format_MonoLSB: case QImage::Format_MonoLSB:
@ -485,7 +485,7 @@ inline QImage::Format qt_maybeDataCompatibleAlphaVersion(QImage::Format format)
case QImage::Format_BGR888: case QImage::Format_BGR888:
case QImage::Format_Grayscale8: case QImage::Format_Grayscale8:
case QImage::Format_Grayscale16: case QImage::Format_Grayscale16:
case QImage::Format_CMYK32: case QImage::Format_CMYK8888:
case QImage::Format_Invalid: case QImage::Format_Invalid:
case QImage::NImageFormats: case QImage::NImageFormats:
break; break;