From 121c5143f1002734ff7aa62785ff14e0e6612aae Mon Sep 17 00:00:00 2001
From: John Brooks <special@dereferenced.net>
Date: Thu, 29 Jul 2010 11:06:03 +0200
Subject: Fix the byte order in QImage::fill for 24bpp formats

QImage::fill() was using BGR ordering for 24-bit formats, which is
always incorrect as QImage does not support BGR. qrgb888 is the
correct 24-bit helper class that does use the proper order.

Merge-request: 2440
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
---
 src/gui/image/qimage.cpp         |  2 +-
 tests/auto/qimage/tst_qimage.cpp | 64 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 30cf758..52ba2b9 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -2010,7 +2010,7 @@ void QImage::fill(uint pixel)
                              0, 0, d->width, d->height, d->bytes_per_line);
         return;
     } else if (d->depth == 24) {
-        qt_rectfill<quint24>(reinterpret_cast<quint24*>(d->data), pixel,
+        qt_rectfill<qrgb888>(reinterpret_cast<qrgb888*>(d->data), pixel,
                              0, 0, d->width, d->height, d->bytes_per_line);
         return;
     }
diff --git a/tests/auto/qimage/tst_qimage.cpp b/tests/auto/qimage/tst_qimage.cpp
index 1330d96..62deb5ae 100644
--- a/tests/auto/qimage/tst_qimage.cpp
+++ b/tests/auto/qimage/tst_qimage.cpp
@@ -103,6 +103,9 @@ private slots:
 
     void copy();
 
+    void fill_data();
+    void fill();
+
     void setPixel_data();
     void setPixel();
 
@@ -1015,6 +1018,67 @@ void tst_QImage::copy()
     }
 }
 
+void tst_QImage::fill_data()
+{
+    QTest::addColumn<int>("format");
+    QTest::addColumn<uint>("input");
+    QTest::addColumn<uint>("expectedResult");
+
+    QTest::newRow("ARGB32") << int(QImage::Format_ARGB32) << 0x33557799u << 0x33557799u;
+    QTest::newRow("RGB888") << int(QImage::Format_RGB888) << 0x335577u << 0x335577u;
+    QTest::newRow("RGB16") << int(QImage::Format_RGB16) << 0x3355u << 0x3355u;
+    QTest::newRow("Indexed8") << int(QImage::Format_Indexed8) << 0x55u << 0x55u;
+    QTest::newRow("Mono") << int(QImage::Format_Mono) << 1u << 1u;
+    QTest::newRow("Mono_LSB") << int(QImage::Format_MonoLSB) << 0u << 0u;
+}
+
+void tst_QImage::fill()
+{
+    QFETCH(int, format);
+    QFETCH(uint, input);
+    QFETCH(uint, expectedResult);
+
+    QImage img(13, 15, (QImage::Format)format);
+    img.fill(input);
+
+    const int bpp = img.depth();
+    for (int y = 0; y < img.height(); ++y) {
+        uchar *line = img.scanLine(y);
+        for (int x = 0; x < img.width(); ++x) {
+            uint value;
+            switch (bpp) {
+            case 32:
+                value = *((uint*)line);
+                line += 4;
+                break;
+            case 24:
+                value = ((uint)line[0] << 16) | ((uint)line[1] << 8) | line[2];
+                line += 3;
+                break;
+            case 16:
+                value = *((quint16*)line);
+                line += 2;
+                break;
+            case 8:
+                value = *line;
+                line++;
+                break;
+            case 1:
+                if (format == QImage::Format_Mono)
+                    value = (*line >> (7- (x & 7))) & 1;
+                else if (format == QImage::Format_MonoLSB)
+                    value = (*line >> (x & 7)) & 1;
+
+                if (x && !(x & 7))
+                    ++line;
+                break;
+            }
+
+            QCOMPARE(value, expectedResult);
+        }
+    }
+}
+
 void tst_QImage::setPixel_data()
 {
     QTest::addColumn<int>("format");
-- 
cgit v0.12