diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-01-05 09:14:51 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-01-07 10:53:36 (GMT) |
| commit | ba0a8a491d6fbedb7ab7d7c4fd41e9eed1ac8670 (patch) | |
| tree | 8de87214d9f2223cbbd88acad9f8340b59d92f7a /src/gui | |
| parent | 1be03198a12ff7aff183b87bf2964020a72aa86f (diff) | |
| download | Qt-ba0a8a491d6fbedb7ab7d7c4fd41e9eed1ac8670.zip Qt-ba0a8a491d6fbedb7ab7d7c4fd41e9eed1ac8670.tar.gz Qt-ba0a8a491d6fbedb7ab7d7c4fd41e9eed1ac8670.tar.bz2 | |
doc: Clarified which values were added in Qt 4.4.
Task-number: QTBUG-7118
(cherry picked from commit c08789f4540ac934ac4a20feaac205837fb0cf6f)
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/image/qimage.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index f25c568..ef719da 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -696,7 +696,9 @@ bool QImageData::checkForAlphaPixels() const /*! \enum QImage::Format - The following image formats are available in all versions of Qt: + The following image formats are available in Qt. Values greater + than QImage::Format_RGB16 were added in Qt 4.4. See the notes + after the table. \value Format_Invalid The image is invalid. \value Format_Mono The image is stored using 1-bit per pixel. Bytes are @@ -705,17 +707,12 @@ bool QImageData::checkForAlphaPixels() const packed with the less significant bit (LSB) first. \value Format_Indexed8 The image is stored using 8-bit indexes - into a colormap. \warning Drawing into a - QImage with Indexed8 format is not - supported. + into a colormap. \value Format_RGB32 The image is stored using a 32-bit RGB format (0xffRRGGBB). \value Format_ARGB32 The image is stored using a 32-bit ARGB - format (0xAARRGGBB). \warning Do not - render into ARGB32 images using - QPainter. Format_ARGB32_Premultiplied is - significantly faster. + format (0xAARRGGBB). \value Format_ARGB32_Premultiplied The image is stored using a premultiplied 32-bit ARGB format (0xAARRGGBB), i.e. the red, @@ -744,6 +741,12 @@ bool QImageData::checkForAlphaPixels() const \value Format_ARGB4444_Premultiplied The image is stored using a premultiplied 16-bit ARGB format (4-4-4-4). + \note Drawing into a QImage with QImage::Format_Indexed8 is not + supported. + + \note Do not render into ARGB32 images using QPainter. Using + QImage::Format_ARGB32_Premultiplied is significantly faster. + \sa format(), convertToFormat() */ |