diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-01-29 10:54:50 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-29 19:41:57 +0100 |
| commit | ff70c39ebcc63cf77a457b2af662e6f7de09e6c5 (patch) | |
| tree | 59da180ec30f25761f572639911955e023400278 | |
| parent | 0226795cf33363a872c777034e0d8934ffaa3819 (diff) | |
Ensure QImage::pixel() on RGB32 images returns valid QRgb values
Currently QImage::pixel() returns the raw underlying pixel values for
RGB32. For all other pixel formats the returned value is either valid
ARGB32 or ARGB32PM.
This patch masks the undefined alpha field in RGB32 so that the return
value is well defined QRgb. It also fixes one test that relied on the
previous behavior.
Change-Id: If37463528268b7419733499d1f7bfd0d1097d21e
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
| -rw-r--r-- | src/gui/image/qimage.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/gui/image/qimage/tst_qimage.cpp | 29 |
2 files changed, 13 insertions, 17 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 9fa6273e1c..f549a04dfb 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -2122,6 +2122,7 @@ QRgb QImage::pixel(int x, int y) const case Format_Indexed8: return d->colortable.at((int)s[x]); case Format_RGB32: + return 0xff000000 | reinterpret_cast<const QRgb *>(s)[x]; case Format_ARGB32: // Keep old behaviour. case Format_ARGB32_Premultiplied: return reinterpret_cast<const QRgb *>(s)[x]; diff --git a/tests/auto/gui/image/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp index 9ddf571dbd..01a56883bf 100644 --- a/tests/auto/gui/image/qimage/tst_qimage.cpp +++ b/tests/auto/gui/image/qimage/tst_qimage.cpp @@ -220,15 +220,10 @@ void tst_QImage::createInvalidXPM() void tst_QImage::createFromUChar() { - uchar data[] = { -#if Q_BYTE_ORDER == Q_BIG_ENDIAN - 0xFF, -#endif - 1,1,1, 0xFF, 2,2,2, 0xFF, 3,3,3, 0xFF, 4,4,4, -#if Q_BYTE_ORDER != Q_BIG_ENDIAN - 0xFF, -#endif - }; + uint data[] = { 0xff010101U, + 0xff020202U, + 0xff030303U, + 0xff040404U }; // When the data is const, nothing you do to the image will change the source data. QImage i1((const uchar*)data, 2, 2, 8, QImage::Format_RGB32); @@ -242,8 +237,8 @@ void tst_QImage::createFromUChar() } QCOMPARE(i1.pixel(0,0), 0xFF010101U); QCOMPARE(*(QRgb*)data, 0xFF010101U); - *((QRgb*)i1.bits()) = 7U; - QCOMPARE(i1.pixel(0,0), 7U); + *((QRgb*)i1.bits()) = 0xFF070707U; + QCOMPARE(i1.pixel(0,0), 0xFF070707U); QCOMPARE(*(QRgb*)data, 0xFF010101U); // Changing copies should not change the original image or data. @@ -270,16 +265,16 @@ void tst_QImage::createFromUChar() } QCOMPARE(i2.pixel(0,0), 0xFF010101U); QCOMPARE(*(QRgb*)data, 0xFF010101U); - *((QRgb*)i2.bits()) = 7U; - QCOMPARE(i2.pixel(0,0), 7U); - QCOMPARE(*(QRgb*)data, 7U); + *((QRgb*)i2.bits()) = 0xFF070707U; + QCOMPARE(i2.pixel(0,0), 0xFF070707U); + QCOMPARE(*(QRgb*)data, 0xFF070707U); // Changing the data will change the image in either case. QImage i3((uchar*)data, 2, 2, 8, QImage::Format_RGB32); QImage i4((const uchar*)data, 2, 2, 8, QImage::Format_RGB32); - *(QRgb*)data = 6U; - QCOMPARE(i3.pixel(0,0), 6U); - QCOMPARE(i4.pixel(0,0), 6U); + *(QRgb*)data = 0xFF060606U; + QCOMPARE(i3.pixel(0,0), 0xFF060606U); + QCOMPARE(i4.pixel(0,0), 0xFF060606U); } void tst_QImage::formatHandlersInput_data() |