diff options
author | Samuel Rødal <samuel.rodal@nokia.com> | 2012-07-24 15:23:49 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-29 16:53:00 +0200 |
commit | c1e5f600abaee393e66fb04e2038bc97d82851ef (patch) | |
tree | 402474ef017437e1dfe0b2e89da0c85627a17c6e /tests/auto/gui/painting | |
parent | f3b45ffa6159bc8b7ecfb0578bbb5cb826de1338 (diff) |
Made QImage::fill(uint pixel) for RGB888 accept QRgb values.
Previously QImage::fill() for Format_RGB888 expected a BGR value
instead of the RGB order defined by QRgb, making it counter intuitive to
use related to the 32-bit formats.
Fixed the QPixelLayout data for RGB888 and changed the byte order of
quint24 based on what the optimized image conversion routines expect.
Change-Id: I72926debbc6f5b5cb10b8aa0b2a2a916a04db946
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Diffstat (limited to 'tests/auto/gui/painting')
-rw-r--r-- | tests/auto/gui/painting/qpainter/tst_qpainter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp index bd075eb2fe..3d0ec9f425 100644 --- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp +++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp @@ -3172,7 +3172,7 @@ void tst_QPainter::drawImage_task258776() QImage src(16, 16, QImage::Format_RGB888); QImage dest(33, 33, QImage::Format_RGB888); src.fill(0x00ff00); - dest.fill(0x0000ff); + dest.fill(0xff0000); QPainter painter(&dest); painter.drawImage(QRectF(0.499, 0.499, 32, 32), src, QRectF(0, 0, 16, 16)); |