diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-03 11:31:42 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-03 10:42:38 +0000 |
| commit | 65cd6f2e8271d070cd89da49d0993863e8836558 (patch) | |
| tree | a38133aea6dddd35e9ef8822cfd99ce5a6fa3852 /tests | |
| parent | cdf154e65a3137597f62880361c407e368aae0d6 (diff) | |
Fix conversion from transparent indexed8 to RGB32
A typo meant the color-table was not fixed. For safety fallback colors
are also made opaque.
Change-Id: I3e609882177604910c4343c86f00221a89af9078
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/gui/image/qimage/tst_qimage.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/tests/auto/gui/image/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp index 7ad4a9e9bb..34b20a5cca 100644 --- a/tests/auto/gui/image/qimage/tst_qimage.cpp +++ b/tests/auto/gui/image/qimage/tst_qimage.cpp @@ -222,6 +222,8 @@ private slots: void hugeQImage(); + void convertColorTable(); + private: const QString m_prefix; }; @@ -3458,5 +3460,18 @@ void tst_QImage::hugeQImage() #endif } +void tst_QImage::convertColorTable() +{ + QImage image(10, 10, QImage::Format_Indexed8); + image.setColor(0, 0x80ffffff); + image.fill(0); + QImage argb32 = image.convertToFormat(QImage::Format_ARGB32); + QCOMPARE(argb32.pixel(0,0), 0x80ffffff); + QImage argb32pm = image.convertToFormat(QImage::Format_ARGB32_Premultiplied); + QCOMPARE(argb32pm.pixel(0,0), 0x80808080); + QImage rgb32 = image.convertToFormat(QImage::Format_RGB32); + QCOMPARE(rgb32.pixel(0,0), 0xffffffff); +} + QTEST_GUILESS_MAIN(tst_QImage) #include "tst_qimage.moc" |