From f127fadc833f7b64977877879787d96586d0a501 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <olivier.goffart@nokia.com>
Date: Mon, 2 Aug 2010 11:11:52 +0200
Subject: Revert "Fix the byte order in QImage::fill for 24bpp formats"

This change the behavior. (as it break tests like drawImage_task258776
and tst_QPainter::drawhelper_blend_color)

The bug it fixes is not considered importent enough

This reverts commit 121c5143f1002734ff7aa62785ff14e0e6612aae and
d8c6ae24f94133828f4f1b536538e69c5e438202
---
 src/gui/image/qimage.cpp             |  2 +-
 tests/auto/qimage/tst_qimage.cpp     | 64 ------------------------------------
 tests/auto/qpainter/tst_qpainter.cpp |  2 +-
 3 files changed, 2 insertions(+), 66 deletions(-)

diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 52ba2b9..30cf758 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<qrgb888>(reinterpret_cast<qrgb888*>(d->data), pixel,
+        qt_rectfill<quint24>(reinterpret_cast<quint24*>(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 62deb5ae..1330d96 100644
--- a/tests/auto/qimage/tst_qimage.cpp
+++ b/tests/auto/qimage/tst_qimage.cpp
@@ -103,9 +103,6 @@ private slots:
 
     void copy();
 
-    void fill_data();
-    void fill();
-
     void setPixel_data();
     void setPixel();
 
@@ -1018,67 +1015,6 @@ 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");
diff --git a/tests/auto/qpainter/tst_qpainter.cpp b/tests/auto/qpainter/tst_qpainter.cpp
index 7679545..2cbb9b2 100644
--- a/tests/auto/qpainter/tst_qpainter.cpp
+++ b/tests/auto/qpainter/tst_qpainter.cpp
@@ -3642,7 +3642,7 @@ void tst_QPainter::drawImage_task258776()
     painter.end();
 
     QImage expected(33, 33, QImage::Format_RGB32);
-    expected.fill(0x0000ff);
+    expected.fill(0xff0000);
 
     painter.begin(&expected);
     painter.drawImage(QRectF(0, 0, 32, 32), src);
-- 
cgit v0.12